diff --git a/.Rbuildignore b/.Rbuildignore index 4d14022..806f683 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -10,3 +10,4 @@ ^pkgdown$ ^\.github$ ^CRAN-SUBMISSION$ +^pkgdown$ diff --git a/DESCRIPTION b/DESCRIPTION index 03d2de3..91a3d36 100644 --- 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="Roger.Bivand@nhh.no", comment = c(ORCID = "0000-0003-2392-6140")), person("Jakub", "Nowosad", role = c("aut", "cre"), email="nowosad.jakub@gmail.com", 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="Roger.Bivand@nhh.no" 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 index 241fdd1..78f3149 100644 --- 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). \ No newline at end of file +* 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 index e4200b5..b65ddc6 100644 --- 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 index 2385429..b0a43a2 100644 --- 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 index 186386c..68a8932 100644 --- a/README.md +++ b/README.md @@ -1,26 +1,25 @@ - +--- +output: + github_document +--- + + # 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) +[![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 @@ -28,14 +27,14 @@ Datasets for spatial analysis - `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 -. +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 index e69de29..bff833e 100644 --- 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 deleted file mode 100644 index 9996e04..0000000 Binary files a/inst/shapes/NY8_utm18.dbf and /dev/null differ diff --git a/inst/shapes/NY8_utm18.prj b/inst/shapes/NY8_utm18.prj deleted file mode 100644 index 7a17e3c..0000000 --- a/inst/shapes/NY8_utm18.prj +++ /dev/null @@ -1 +0,0 @@ -PROJCS["WGS_1984_UTM_Zone_18N",GEOGCS["GCS_WGS_1984",DATUM["D_unknown",SPHEROID["WGS84",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-75],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["Meter",1]] \ No newline at end of file diff --git a/inst/shapes/NY8_utm18.shp b/inst/shapes/NY8_utm18.shp deleted file mode 100644 index af6dd78..0000000 Binary files a/inst/shapes/NY8_utm18.shp and /dev/null differ diff --git a/inst/shapes/NY8_utm18.shx b/inst/shapes/NY8_utm18.shx deleted file mode 100644 index 1659e01..0000000 Binary files a/inst/shapes/NY8_utm18.shx and /dev/null differ diff --git a/inst/shapes/auckland.dbf b/inst/shapes/auckland.dbf deleted file mode 100644 index 9a552f2..0000000 Binary files a/inst/shapes/auckland.dbf and /dev/null differ diff --git a/inst/shapes/auckland.shp b/inst/shapes/auckland.shp deleted file mode 100644 index f34d39a..0000000 Binary files a/inst/shapes/auckland.shp and /dev/null differ diff --git a/inst/shapes/auckland.shx b/inst/shapes/auckland.shx deleted file mode 100644 index a8f222e..0000000 Binary files a/inst/shapes/auckland.shx and /dev/null differ diff --git a/inst/shapes/baltim.dbf b/inst/shapes/baltim.dbf deleted file mode 100644 index be9d815..0000000 Binary files a/inst/shapes/baltim.dbf and /dev/null differ diff --git a/inst/shapes/baltim.shp b/inst/shapes/baltim.shp deleted file mode 100644 index f867886..0000000 Binary files a/inst/shapes/baltim.shp and /dev/null differ diff --git a/inst/shapes/baltim.shx b/inst/shapes/baltim.shx deleted file mode 100644 index 8414722..0000000 Binary files a/inst/shapes/baltim.shx and /dev/null differ diff --git a/inst/shapes/boston_tracts.dbf b/inst/shapes/boston_tracts.dbf deleted file mode 100644 index d455d1d..0000000 Binary files a/inst/shapes/boston_tracts.dbf and /dev/null differ diff --git a/inst/shapes/boston_tracts.prj b/inst/shapes/boston_tracts.prj deleted file mode 100644 index c8a8fe8..0000000 --- a/inst/shapes/boston_tracts.prj +++ /dev/null @@ -1 +0,0 @@ -GEOGCS["GCS_North_American_1927",DATUM["D_North_American_1927",SPHEROID["Clarke_1866",6378206.4,294.9786982]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]] \ No newline at end of file diff --git a/inst/shapes/boston_tracts.shp b/inst/shapes/boston_tracts.shp deleted file mode 100644 index f3d9b5b..0000000 Binary files a/inst/shapes/boston_tracts.shp and /dev/null differ diff --git a/inst/shapes/boston_tracts.shx b/inst/shapes/boston_tracts.shx deleted file mode 100644 index 1c3f001..0000000 Binary files a/inst/shapes/boston_tracts.shx and /dev/null differ diff --git a/inst/shapes/columbus.dbf b/inst/shapes/columbus.dbf deleted file mode 100644 index f850bda..0000000 Binary files a/inst/shapes/columbus.dbf and /dev/null differ diff --git a/inst/shapes/columbus.shp b/inst/shapes/columbus.shp deleted file mode 100644 index d6dde43..0000000 Binary files a/inst/shapes/columbus.shp and /dev/null differ diff --git a/inst/shapes/columbus.shx b/inst/shapes/columbus.shx deleted file mode 100644 index 7086b6f..0000000 Binary files a/inst/shapes/columbus.shx and /dev/null differ diff --git a/inst/shapes/eire.dbf b/inst/shapes/eire.dbf deleted file mode 100644 index 14f2d8e..0000000 Binary files a/inst/shapes/eire.dbf and /dev/null differ diff --git a/inst/shapes/eire.shp b/inst/shapes/eire.shp deleted file mode 100644 index 612397b..0000000 Binary files a/inst/shapes/eire.shp and /dev/null differ diff --git a/inst/shapes/eire.shx b/inst/shapes/eire.shx deleted file mode 100644 index 580107d..0000000 Binary files a/inst/shapes/eire.shx and /dev/null differ diff --git a/inst/shapes/sids.dbf b/inst/shapes/sids.dbf deleted file mode 100644 index 849801d..0000000 Binary files a/inst/shapes/sids.dbf and /dev/null differ diff --git a/inst/shapes/sids.shp b/inst/shapes/sids.shp deleted file mode 100644 index 3267447..0000000 Binary files a/inst/shapes/sids.shp and /dev/null differ diff --git a/inst/shapes/sids.shx b/inst/shapes/sids.shx deleted file mode 100644 index 7b4d652..0000000 Binary files a/inst/shapes/sids.shx and /dev/null differ diff --git a/inst/shapes/wheat.dbf b/inst/shapes/wheat.dbf deleted file mode 100644 index 040d41a..0000000 Binary files a/inst/shapes/wheat.dbf and /dev/null differ diff --git a/inst/shapes/wheat.shp b/inst/shapes/wheat.shp deleted file mode 100644 index d1264a0..0000000 Binary files a/inst/shapes/wheat.shp and /dev/null differ diff --git a/inst/shapes/wheat.shx b/inst/shapes/wheat.shx deleted file mode 100644 index c05c4b8..0000000 Binary files a/inst/shapes/wheat.shx and /dev/null differ diff --git a/inst/shapes/world.dbf b/inst/shapes/world.dbf deleted file mode 100644 index d25e90f..0000000 Binary files a/inst/shapes/world.dbf and /dev/null differ diff --git a/inst/shapes/world.prj b/inst/shapes/world.prj deleted file mode 100644 index f45cbad..0000000 --- a/inst/shapes/world.prj +++ /dev/null @@ -1 +0,0 @@ -GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]] \ No newline at end of file diff --git a/inst/shapes/world.shp b/inst/shapes/world.shp deleted file mode 100644 index da4c233..0000000 Binary files a/inst/shapes/world.shp and /dev/null differ diff --git a/inst/shapes/world.shx b/inst/shapes/world.shx deleted file mode 100644 index 413d907..0000000 Binary files a/inst/shapes/world.shx and /dev/null differ diff --git a/man/wheat.Rd b/man/wheat.Rd index 1540ca7..d18e4dd 100644 --- a/man/wheat.Rd +++ b/man/wheat.Rd @@ -50,7 +50,7 @@ wheat <- SpatialPolygonsDataFrame(wheat_spl, data=df) 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) } }