Merge pull request #72 from rsbivand/remove_shp

remove ESRI Shapefile
Nowosad · Dec 2, 2024 · 2d080ad · 2d080ad
2 parents 1f5f989 + 34bb5a7
commit 2d080ad
Show file tree

Hide file tree

Showing 38 changed files with 38 additions and 38 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -10,3 +10,4 @@
 ^pkgdown$
 ^\.github$
 ^CRAN-SUBMISSION$
+^pkgdown$
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: spData
 Title: Datasets for Spatial Analysis
-Version: 2.3.3
+Version: 2.3.4
 Authors@R: c(person("Roger", "Bivand", role = "aut", email="[email protected]", comment = c(ORCID = "0000-0003-2392-6140")),
     person("Jakub", "Nowosad", role = c("aut", "cre"), email="[email protected]", comment = c(ORCID = "0000-0002-1057-3721")),
     person("Robin", "Lovelace", role = "aut", comment = c(ORCID = "0000-0001-5679-6536")),
@@ -11,7 +11,7 @@ Authors@R: c(person("Roger", "Bivand", role = "aut", email="[email protected]"
 Description: Diverse spatial datasets for demonstrating, benchmarking and teaching spatial data analysis. 
     It includes R data of class sf (defined by the package 'sf'), Spatial ('sp'), and nb ('spdep').
     Unlike other spatial data packages such as 'rnaturalearth' and 'maps', 
-    it also contains data stored in a range of file formats including GeoJSON, ESRI Shapefile and GeoPackage. 
+    it also contains data stored in a range of file formats including GeoJSON and GeoPackage, but from version 2.3.4, no longer ESRI Shapefile - use GeoPackage instead. 
     Some of the datasets are designed to illustrate specific analysis techniques.
     cycle_hire() and cycle_hire_osm(), for example, is designed to illustrate point pattern analysis techniques.
 Depends:

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+# spData 2.3.4
+
+* Removes ESRI Shapefile versions of all datasets
+
 # spData 2.3.3
 
 * Specifies CRS of the `nz` and `nz_height` objects to `ESPG:2193`
@@ -8,5 +12,5 @@
 
 # spData 2.3.1
 
-* Added a `NEWS.md` file to track changes to the package.
-* We added GeoPackage versions of all the datasets in the package (and we plan to remove the ESRI Shapefile versions in the near future).
+* Adds a `NEWS.md` file to track changes to the package.
+* We added GeoPackage versions of all the datasets in the package (and we plan to remove the ESRI Shapefile versions in the near future).
diff --git a/R/wheat.R b/R/wheat.R
@@ -43,7 +43,7 @@
 #' 
 #' if (requireNamespace("sf", quietly = TRUE)) {
 #'   library(sf)
-#'   wheat <- st_read(system.file("shapes/wheat.shp", package="spData"))
+#'   wheat <- st_read(system.file("shapes/wheat.gpkg", package="spData"))
 #'   plot(wheat)
 #' }
 "wheat"
diff --git a/README.Rmd b/README.Rmd
@@ -20,7 +20,7 @@ knitr::opts_chunk$set(
 [![CRAN RStudio mirror downloads](https://cranlogs.r-pkg.org/badges/spData)](https://cran.r-project.org/package=spData)
 [![CRAN RStudio total mirror downloads](https://cranlogs.r-pkg.org/badges/grand-total/spData)](https://cran.r-project.org/package=spData)
 
-Datasets for spatial analysis
+Datasets for spatial analysis (from version 2.3.4, ESRI Shapefile datasets have been dropped, use the provided GeoPackage files instead)
 
 ### **sf**
 

diff --git a/README.md b/README.md
@@ -1,41 +1,40 @@
-
+---
+output:
+  github_document
+---
 <!-- README.md is generated from README.Rmd. Please edit that file -->
 
+
+
 # spData <img src="man/figures/logo.png" align="right" alt="" width="150" />
 
-[![GitHub action build
-status](https://github.com/Nowosad/spData/workflows/pkgdown/badge.svg)](https://github.com/Nowosad/spData/actions)
-[![CRAN
-version](https://www.r-pkg.org/badges/version/spData)](https://cran.r-project.org/package=spData)
-[![CRAN RStudio mirror
-downloads](https://cranlogs.r-pkg.org/badges/spData)](https://cran.r-project.org/package=spData)
-[![CRAN RStudio total mirror
-downloads](https://cranlogs.r-pkg.org/badges/grand-total/spData)](https://cran.r-project.org/package=spData)
+[![GitHub action build status](https://github.com/Nowosad/spData/workflows/pkgdown/badge.svg)](https://github.com/Nowosad/spData/actions)
+[![CRAN version](https://www.r-pkg.org/badges/version/spData)](https://cran.r-project.org/package=spData)
+[![CRAN RStudio mirror downloads](https://cranlogs.r-pkg.org/badges/spData)](https://cran.r-project.org/package=spData)
+[![CRAN RStudio total mirror downloads](https://cranlogs.r-pkg.org/badges/grand-total/spData)](https://cran.r-project.org/package=spData)
 
-Datasets for spatial analysis
+Datasets for spatial analysis (from version 2.3.4, ESRI Shapefile datasets have been dropped, use the provided GeoPackage files instead)
 
 ### **sf**
 
 - `alaska` - Alaska multipolygon
 - `aggregating_zones` - See `congruent`
-- `congruent` - Sample of UK administrative zones that have shared
-  borders with `aggregating_zones` (`incongruent` does not have shared
-  borders) for teaching the concept of spatial congruence
+- `congruent` - Sample of UK administrative zones that have shared borders with `aggregating_zones` (`incongruent` does not have shared borders) for teaching the concept of spatial congruence
 - `cycle_hire` - Cycle hire points in London
 - `cycle_hire_osm` - Cycle hire points in London from OSM
 - `hawaii` - Hawaii multipolygon
 - `incongruent` - See `congruent`
 - `lnd` - The boroughs of London
 - `nz` - The regions of New Zealand
 - `nz_height` - High points in New Zealand
-- `seine` - Small river network in France
+- `seine` - Small river network in France 
 - `urban_agglomerations` - Major urban areas worldwide
 - `us_states` - US states polygons
 - `world` - World country polygons
 
 ### **sp**
 
-- `auckland` - Marshall’s infant mortality in Auckland dataset
+- `auckland` - Marshall's infant mortality in Auckland dataset
 - `elect80` - 1980 Presidential election results
 - `house` - Lucas county OH housing
 - `SplashDams` - Data for Splash Dams in western Oregon
@@ -59,8 +58,7 @@ Datasets for spatial analysis
 ### misc
 
 - `baltimore` - House sales prices, Baltimore, MD 1978
-- `coffee_data` - World coffee production statistics by country, 2016
-  and 2017
+- `coffee_data` - World coffee production statistics by country, 2016 and 2017
 - `getisord` - Getis-Ord remote sensing example data
 - `hopkins` - Hopkins burnt savanna herb remains
 - `huddersfield` - Prevalence of respiratory symptoms
@@ -74,31 +72,28 @@ Datasets for spatial analysis
 
 Get the released version from CRAN:
 
-``` r
+```R
 install.packages("spData")
 ```
 
 Get the development version from github:
 
-``` r
+```R
 devtools::install_github("nowosad/spData")
 ```
 
 ## spDataLarge
 
-This package interacts with data available through the **spDataLarge**
-package, which is available in a ‘drat’ repository. To access this data
-package, run:
+This package interacts with data available through the **spDataLarge** package, which is available in a 'drat' repository. 
+To access this data package, run:
 
-``` r
+```R
 install.packages("spDataLarge", repos = "https://nowosad.github.io/drat/", type = "source")
 ```
 
-The size of the **spDataLarge** package is approximately 20 MB. Learn
-more about the **spDataLarge** package at
-<https://github.com/Nowosad/spDataLarge>.
+The size of the **spDataLarge** package is approximately 20 MB.
+Learn more about the **spDataLarge** package at https://github.com/Nowosad/spDataLarge.
 
 ## Contributions
 
-[Feel free to submit issues and enhancement
-requests.](https://github.com/Nowosad/spData/issues)
+[Feel free to submit issues and enhancement requests.](https://github.com/Nowosad/spData/issues)
diff --git a/_pkgdown.yml b/_pkgdown.yml
@@ -0,0 +1,3 @@
+template:
+  bootstrap: 5
+url: https://jakubnowosad.com/spData/
diff --git a/inst/shapes/NY8_utm18.dbf b/inst/shapes/NY8_utm18.dbf
diff --git a/inst/shapes/NY8_utm18.prj b/inst/shapes/NY8_utm18.prj
diff --git a/inst/shapes/NY8_utm18.shp b/inst/shapes/NY8_utm18.shp
diff --git a/inst/shapes/NY8_utm18.shx b/inst/shapes/NY8_utm18.shx
diff --git a/inst/shapes/auckland.dbf b/inst/shapes/auckland.dbf
diff --git a/inst/shapes/auckland.shp b/inst/shapes/auckland.shp
diff --git a/inst/shapes/auckland.shx b/inst/shapes/auckland.shx
diff --git a/inst/shapes/baltim.dbf b/inst/shapes/baltim.dbf
diff --git a/inst/shapes/baltim.shp b/inst/shapes/baltim.shp
diff --git a/inst/shapes/baltim.shx b/inst/shapes/baltim.shx
diff --git a/inst/shapes/boston_tracts.dbf b/inst/shapes/boston_tracts.dbf
diff --git a/inst/shapes/boston_tracts.prj b/inst/shapes/boston_tracts.prj
diff --git a/inst/shapes/boston_tracts.shp b/inst/shapes/boston_tracts.shp
diff --git a/inst/shapes/boston_tracts.shx b/inst/shapes/boston_tracts.shx
diff --git a/inst/shapes/columbus.dbf b/inst/shapes/columbus.dbf
diff --git a/inst/shapes/columbus.shp b/inst/shapes/columbus.shp
diff --git a/inst/shapes/columbus.shx b/inst/shapes/columbus.shx
diff --git a/inst/shapes/eire.dbf b/inst/shapes/eire.dbf
diff --git a/inst/shapes/eire.shp b/inst/shapes/eire.shp
diff --git a/inst/shapes/eire.shx b/inst/shapes/eire.shx
diff --git a/inst/shapes/sids.dbf b/inst/shapes/sids.dbf
diff --git a/inst/shapes/sids.shp b/inst/shapes/sids.shp
diff --git a/inst/shapes/sids.shx b/inst/shapes/sids.shx
diff --git a/inst/shapes/wheat.dbf b/inst/shapes/wheat.dbf
diff --git a/inst/shapes/wheat.shp b/inst/shapes/wheat.shp
diff --git a/inst/shapes/wheat.shx b/inst/shapes/wheat.shx
diff --git a/inst/shapes/world.dbf b/inst/shapes/world.dbf
diff --git a/inst/shapes/world.prj b/inst/shapes/world.prj
diff --git a/inst/shapes/world.shp b/inst/shapes/world.shp
diff --git a/inst/shapes/world.shx b/inst/shapes/world.shx
diff --git a/man/wheat.Rd b/man/wheat.Rd