Merge pull request #92 from rOpenGov/update24

Update internal database to get new versions of the dataset (2024)
rOpenGov · Aug 25, 2024 · cd78768 · cd78768
2 parents d65f7af + 51c4b12
commit cd78768
Show file tree

Hide file tree

Showing 22 changed files with 117 additions and 28 deletions.
diff --git a/.github/workflows/recheck.yaml b/.github/workflows/recheck.yaml
@@ -0,0 +1,20 @@
+# Workflow derived from https://github.com/r-devel/recheck
+on:
+    workflow_dispatch:
+      inputs:
+        which:
+          type: choice
+          description: Which dependents to check
+          options:
+          - strong
+          - most
+
+name: r-devel reverse dependency check
+
+jobs:
+    revdep_check:
+      name: Reverse check ${{ inputs.which }} dependents
+      uses: r-devel/recheck/.github/workflows/recheck.yml@v1
+      with:
+        which: ${{ inputs.which }}
+
diff --git a/CITATION.cff b/CITATION.cff
@@ -8,8 +8,11 @@ message: 'To cite package "giscoR" in publications use:'
 type: software
 license: GPL-3.0-only
 title: 'giscoR: Download Map Data from GISCO API - Eurostat'
-version: 0.5.1
+version: 0.5.1.9000
 doi: 10.32614/CRAN.package.giscoR
+identifiers:
+- type: doi
+  value: 10.32614/CRAN.package.giscoR
 abstract: Tools to download data from the GISCO (Geographic Information System of
   the Commission) Eurostat database <https://ec.europa.eu/eurostat/web/gisco>. Global
   and European map data available. This package is in no way officially related to
@@ -31,7 +34,7 @@ preferred-citation:
     affiliation: rOpenGov
   doi: 10.32614/CRAN.package.giscoR
   year: '2024'
-  version: 0.5.1
+  version: 0.5.1.9000
   url: https://ropengov.github.io/giscoR/
   abstract: Tools to download data from the GISCO (Geographic Information System of
     the Commission) Eurostat database <https://ec.europa.eu/eurostat/web/gisco>. Global
@@ -84,6 +87,7 @@ references:
     email: vincent.arel-bundock@umontreal.ca
     orcid: https://orcid.org/0000-0003-2042-7063
   year: '2024'
+  doi: 10.32614/CRAN.package.countrycode
   version: '>= 1.2.0'
 - type: software
   title: geojsonsf
@@ -96,6 +100,7 @@ references:
     given-names: David
     email: dcooley@symbolix.com.au
   year: '2024'
+  doi: 10.32614/CRAN.package.geojsonsf
   version: '>= 2.0.0'
 - type: software
   title: jsonlite
@@ -109,9 +114,7 @@ references:
     email: jeroen@berkeley.edu
     orcid: https://orcid.org/0000-0002-4035-0289
   year: '2024'
-  identifiers:
-  - type: url
-    value: https://arxiv.org/abs/1403.2805
+  doi: 10.32614/CRAN.package.jsonlite
 - type: software
   title: rappdirs
   abstract: 'rappdirs: Application Directories: Determine Where to Save Data, Caches,
@@ -127,6 +130,7 @@ references:
   - family-names: Davis
     given-names: Trevor
   year: '2024'
+  doi: 10.32614/CRAN.package.rappdirs
   version: '>= 0.3.0'
 - type: software
   title: sf
@@ -140,6 +144,7 @@ references:
     email: edzer.pebesma@uni-muenster.de
     orcid: https://orcid.org/0000-0001-8049-7069
   year: '2024'
+  doi: 10.32614/CRAN.package.sf
   version: '>= 0.9.0'
 - type: software
   title: utils
@@ -175,6 +180,7 @@ references:
     email: davis@posit.co
     orcid: https://orcid.org/0000-0003-4777-038X
   year: '2024'
+  doi: 10.32614/CRAN.package.dplyr
 - type: software
   title: eurostat
   abstract: 'eurostat: Tools for Eurostat Open Data'
@@ -193,6 +199,7 @@ references:
   - family-names: Biecek
     given-names: Przemyslaw
   year: '2024'
+  doi: 10.32614/CRAN.package.eurostat
 - type: software
   title: ggplot2
   abstract: 'ggplot2: Create Elegant Data Visualisations Using the Grammar of Graphics'
@@ -232,6 +239,7 @@ references:
     name-particle: van den
     orcid: https://orcid.org/0000-0002-9335-7468
   year: '2024'
+  doi: 10.32614/CRAN.package.ggplot2
   version: '>= 3.5.0'
 - type: software
   title: httr2
@@ -242,8 +250,9 @@ references:
   authors:
   - family-names: Wickham
     given-names: Hadley
-    email: hadley@rstudio.com
+    email: hadley@posit.co
   year: '2024'
+  doi: 10.32614/CRAN.package.httr2
 - type: software
   title: knitr
   abstract: 'knitr: A General-Purpose Package for Dynamic Report Generation in R'
@@ -256,6 +265,7 @@ references:
     email: xie@yihui.name
     orcid: https://orcid.org/0000-0003-0645-5666
   year: '2024'
+  doi: 10.32614/CRAN.package.knitr
 - type: software
   title: lwgeom
   abstract: 'lwgeom: Bindings to Selected ''liblwgeom'' Functions for Simple Features'
@@ -268,6 +278,7 @@ references:
     email: edzer.pebesma@uni-muenster.de
     orcid: https://orcid.org/0000-0001-8049-7069
   year: '2024'
+  doi: 10.32614/CRAN.package.lwgeom
   version: '>= 0.2-2'
 - type: software
   title: rmarkdown
@@ -312,6 +323,7 @@ references:
     email: rich@posit.co
     orcid: https://orcid.org/0000-0003-3925-190X
   year: '2024'
+  doi: 10.32614/CRAN.package.rmarkdown
 - type: software
   title: testthat
   abstract: 'testthat: Unit Testing for R'
@@ -323,5 +335,6 @@ references:
     given-names: Hadley
     email: hadley@posit.co
   year: '2024'
+  doi: 10.32614/CRAN.package.testthat
   version: '>= 3.0.0'
 
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Type: Package
 Package: giscoR
 Title: Download Map Data from GISCO API - Eurostat
-Version: 0.5.1
+Version: 0.5.1.9000
 Authors@R: c(
     person("Diego", "Hernangómez", , "diego.hernangomezherrero@gmail.com", role = c("aut", "cre", "cph"),
            comment = c(ORCID = "0000-0001-8457-4658", affiliation = "rOpenGov")),

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,12 @@
+# giscoR (development version)
+
+## Update with latest data available
+
+-   `gisco_get_education()` and `gisco_get_healthcare()` gains a new `year`
+    argument: years available now are 2020 and 2023 versions of the dataset.
+-   `gisco_get_nuts()` and `gisco_get_countries()` now can download the 2024
+    version of the datasets.
+
 # giscoR 0.5.1
 
 -   Use **CRAN** DOI: <https://doi.org/10.32614/CRAN.package.giscoR>.

diff --git a/R/gisco_get_education.R b/R/gisco_get_education.R
@@ -12,7 +12,7 @@
 #' @source
 #' <https://ec.europa.eu/eurostat/web/gisco/geodata/basic-services>
 #'
-#' @inheritParams gisco_get_countries
+#' @inheritParams gisco_get_healthcare
 #'
 #' @inheritSection gisco_get_countries About caching
 #'
@@ -34,10 +34,12 @@
 #' }
 #' }
 #' @export
-gisco_get_education <- function(cache = TRUE, update_cache = FALSE,
+gisco_get_education <- function(year = c("2023", "2020"),
+                                cache = TRUE, update_cache = FALSE,
                                 cache_dir = NULL, verbose = FALSE,
                                 country = NULL) {
   # Given vars
+  year <- match.arg(year)
   epsg <- "4326"
   ext <- "gpkg"
 
@@ -49,15 +51,15 @@ gisco_get_education <- function(cache = TRUE, update_cache = FALSE,
 
 
   api_entry <- paste0(
-    "https://gisco-services.ec.europa.eu/pub/education/2020/",
-    "/gpkg/", country_get, ".gpkg"
+    "https://gisco-services.ec.europa.eu/pub/education/", year, "/gpkg/",
+    country_get, ".gpkg"
   )
 
   n_cnt <- seq_len(length(api_entry))
 
   ress <- lapply(n_cnt, function(x) {
     api <- api_entry[x]
-    filename <- basename(api)
+    filename <- paste0("edu_", year, "_", basename(api))
 
 
     if (cache) {

diff --git a/R/gisco_get_healthcare.R b/R/gisco_get_healthcare.R
@@ -13,6 +13,7 @@
 #' @source
 #' <https://ec.europa.eu/eurostat/web/gisco/geodata/basic-services>
 #'
+#' @param year Release year of the file. One of `"2020"`, `"2023"` (default).
 #' @inheritParams gisco_get_countries
 #'
 #' @inheritSection gisco_get_countries About caching
@@ -35,18 +36,19 @@
 #' }
 #' }
 #' @export
-gisco_get_healthcare <- function(cache = TRUE, update_cache = FALSE,
-                                 cache_dir = NULL, verbose = FALSE,
-                                 country = NULL) {
+gisco_get_healthcare <- function(year = c("2023", "2020"), cache = TRUE,
+                                 update_cache = FALSE, cache_dir = NULL,
+                                 verbose = FALSE, country = NULL) {
   # Given vars
+  year <- match.arg(year)
   epsg <- "4326"
   ext <- "gpkg"
 
   api_entry <- paste0(
-    "https://gisco-services.ec.europa.eu/pub/healthcare/2020",
+    "https://gisco-services.ec.europa.eu/pub/healthcare/", year,
     "/gpkg/EU.gpkg"
   )
-  filename <- basename(api_entry)
+  filename <- paste0("health_", year, "_", basename(api_entry))
 
 
   if (cache) {

diff --git a/README.md b/README.md
@@ -68,6 +68,9 @@ install.packages("giscoR",
 
 ## Usage
 
+You can have a look to the documentation of the dev version in
+<https://ropengov.github.io/giscoR/dev/>
+
 This script highlights some features of **giscoR** :
 
 ``` r
@@ -326,7 +329,7 @@ A BibTeX entry for LaTeX users is
       doi = {10.32614/CRAN.package.giscoR},
       author = {Diego Hernangómez},
       year = {2024},
-      version = {0.5.1},
+      version = {0.5.1.9000},
       url = {https://ropengov.github.io/giscoR/},
       abstract = {Tools to download data from the GISCO (Geographic Information System of the Commission) Eurostat database <https://ec.europa.eu/eurostat/web/gisco>. Global and European map data available. This package is in no way officially related to or endorsed by Eurostat.},
     }

diff --git a/codemeta.json b/codemeta.json
@@ -8,7 +8,7 @@
   "codeRepository": "https://github.com/rOpenGov/giscoR",
   "issueTracker": "https://github.com/rOpenGov/giscoR/issues",
   "license": "https://spdx.org/licenses/GPL-3.0",
-  "version": "0.5.1",
+  "version": "0.5.1.9000",
   "programmingLanguage": {
     "@type": "ComputerLanguage",
     "name": "R",
@@ -240,7 +240,7 @@
   "applicationCategory": "cartography",
   "isPartOf": "http://ropengov.org/",
   "keywords": ["ropengov", "r", "spatial", "api-wrapper", "rstats", "r-package", "eurostat", "gisco", "thematic-maps", "eurostat-data", "cran", "ggplot2", "gis"],
-  "fileSize": "1257.482KB",
+  "fileSize": "1258.247KB",
   "citation": [
     {
       "@type": "SoftwareSourceCode",

diff --git a/data/gisco_db.rda b/data/gisco_db.rda
diff --git a/img/README-example-1.png b/img/README-example-1.png
diff --git a/img/README-example-2.png b/img/README-example-2.png
diff --git a/img/README-labels-1.png b/img/README-labels-1.png
diff --git a/img/README-thematic-1.png b/img/README-thematic-1.png
diff --git a/inst/schemaorg.json b/inst/schemaorg.json
@@ -41,7 +41,7 @@
         "url": "https://cran.r-project.org"
       },
       "runtimePlatform": "R version 4.4.1 (2024-06-14 ucrt)",
-      "version": "0.5.1"
+      "version": "0.5.1.9000"
     },
     {
       "id": "https://doi.org/10.32614/CRAN.package.giscoR",

diff --git a/man/gisco_get.Rd b/man/gisco_get.Rd
diff --git a/man/gisco_get_education.Rd b/man/gisco_get_education.Rd
diff --git a/man/gisco_get_healthcare.Rd b/man/gisco_get_healthcare.Rd
diff --git a/man/gisco_get_nuts.Rd b/man/gisco_get_nuts.Rd
diff --git a/man/gisco_get_units.Rd b/man/gisco_get_units.Rd
diff --git a/tests/testthat/test-gisco_get_countries.R b/tests/testthat/test-gisco_get_countries.R
@@ -44,6 +44,15 @@ test_that("Countries online", {
     cache = FALSE
   ))
 
+  expect_silent(
+    gisco_get_countries(
+      year = 2024,
+      spatialtype = "BN",
+      resolution = 60,
+      cache = TRUE
+    )
+  )
+
   expect_silent(gisco_get_countries(
     spatialtype = "COASTL",
     country = c("ESP", "ITA")

diff --git a/tests/testthat/test-gisco_get_nuts.R b/tests/testthat/test-gisco_get_nuts.R
@@ -95,6 +95,14 @@ test_that("NUTS online", {
   expect_equal(epsg3035, sf::st_crs(a))
   expect_equal(epsg3857, sf::st_crs(b))
   expect_equal(epsg4326, sf::st_crs(c))
+
+  expect_silent(aa <-
+    gisco_get_nuts(
+      year = 2024,
+      resolution = "60",
+      nuts_level = "0",
+      nuts_id = "ES5"
+    ))
 })