diff --git a/CITATION.cff b/CITATION.cff index 8649c5e0..bc154a6b 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -8,7 +8,7 @@ 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.0.9000 +version: 0.5.1 doi: 10.32614/CRAN.package.giscoR abstract: Tools to download data from the GISCO (Geographic Information System of the Commission) Eurostat database . Global @@ -31,7 +31,7 @@ preferred-citation: affiliation: rOpenGov doi: 10.32614/CRAN.package.giscoR year: '2024' - version: 0.5.0.9000 + version: 0.5.1 url: https://ropengov.github.io/giscoR/ abstract: Tools to download data from the GISCO (Geographic Information System of the Commission) Eurostat database . Global @@ -109,9 +109,6 @@ 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 - type: software title: rappdirs abstract: 'rappdirs: Application Directories: Determine Where to Save Data, Caches, diff --git a/DESCRIPTION b/DESCRIPTION index 84f2b9dd..56d761cd 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Type: Package Package: giscoR Title: Download Map Data from GISCO API - Eurostat -Version: 0.5.0.9000 +Version: 0.5.1 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 index dbdf9509..414d4aeb 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# giscoR (development version) +# giscoR 0.5.1 - Use **CRAN** DOI: . - `gisco_get_education()`: Fix API entry points. diff --git a/R/gisco_get_healthcare.R b/R/gisco_get_healthcare.R index d6e92b83..84f80e90 100644 --- a/R/gisco_get_healthcare.R +++ b/R/gisco_get_healthcare.R @@ -25,13 +25,13 @@ #' @examplesIf gisco_check_access() #' \donttest{ #' -#' health_BEL <- gisco_get_healthcare(country = "Belgium") +#' health_be <- gisco_get_healthcare(country = "Belgium") #' #' # Plot if downloaded -#' if (nrow(health_BEL) > 3) { +#' if (inherits(health_be, "sf")) { #' library(ggplot2) -#' ggplot(health_BEL) + -#' geom_sf(aes(color = emergency)) +#' ggplot(health_be) + +#' geom_sf() #' } #' } #' @export @@ -65,9 +65,9 @@ gisco_get_healthcare <- function(cache = TRUE, update_cache = FALSE, data_sf <- gsc_api_load(namefileload, epsg, ext, cache, verbose) - if (!is.null(country) && "cc" %in% names(data_sf)) { + if (!is.null(country) && "cntr_id" %in% names(data_sf)) { country <- gsc_helper_countrynames(country, "eurostat") - data_sf <- data_sf[data_sf$cc %in% country, ] + data_sf <- data_sf[data_sf$cntr_id %in% country, ] } return(data_sf) } diff --git a/README.Rmd b/README.Rmd index f613fa82..527d43c8 100644 --- a/README.Rmd +++ b/README.Rmd @@ -187,7 +187,7 @@ We start by extracting the corresponding geographic data: nuts3 <- gisco_get_nuts( year = "2021", epsg = "3035", - resolution = "3", + resolution = "10", nuts_level = "3" ) diff --git a/README.md b/README.md index 8e148ec5..deafce94 100644 --- a/README.md +++ b/README.md @@ -68,9 +68,6 @@ install.packages("giscoR", ## Usage -You can have a look to the documentation of the dev version in - - This script highlights some features of **giscoR** : ``` r @@ -166,7 +163,7 @@ We start by extracting the corresponding geographic data: nuts3 <- gisco_get_nuts( year = "2021", epsg = "3035", - resolution = "3", + resolution = "10", nuts_level = "3" ) @@ -329,7 +326,7 @@ A BibTeX entry for LaTeX users is doi = {10.32614/CRAN.package.giscoR}, author = {Diego Hernangómez}, year = {2024}, - version = {0.5.0.9000}, + version = {0.5.1}, url = {https://ropengov.github.io/giscoR/}, abstract = {Tools to download data from the GISCO (Geographic Information System of the Commission) Eurostat database . Global and European map data available. This package is in no way officially related to or endorsed by Eurostat.}, } @@ -363,7 +360,8 @@ This package is in no way officially related to or endorsed by Eurostat. ## References -
+
diff --git a/codemeta.json b/codemeta.json index 8de149fb..b8d4de9f 100644 --- a/codemeta.json +++ b/codemeta.json @@ -8,13 +8,13 @@ "codeRepository": "https://github.com/rOpenGov/giscoR", "issueTracker": "https://github.com/rOpenGov/giscoR/issues", "license": "https://spdx.org/licenses/GPL-3.0", - "version": "0.5.0.9000", + "version": "0.5.1", "programmingLanguage": { "@type": "ComputerLanguage", "name": "R", "url": "https://r-project.org" }, - "runtimePlatform": "R version 4.4.1 (2024-06-14)", + "runtimePlatform": "R version 4.4.1 (2024-06-14 ucrt)", "provider": { "@id": "https://cran.r-project.org", "@type": "Organization", @@ -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": "1250.925KB", + "fileSize": "1256.916KB", "citation": [ { "@type": "SoftwareSourceCode", diff --git a/data/gisco_countrycode.rda b/data/gisco_countrycode.rda index 96f2dfc1..7934a2ef 100644 Binary files a/data/gisco_countrycode.rda and b/data/gisco_countrycode.rda differ diff --git a/data/gisco_db.rda b/data/gisco_db.rda index 22910165..48805910 100644 Binary files a/data/gisco_db.rda and b/data/gisco_db.rda differ diff --git a/img/README-example-1.png b/img/README-example-1.png index 15f47246..e534a80b 100644 Binary files a/img/README-example-1.png and b/img/README-example-1.png differ diff --git a/img/README-example-2.png b/img/README-example-2.png index 2a4bc624..2f1fff2e 100644 Binary files a/img/README-example-2.png and b/img/README-example-2.png differ diff --git a/img/README-labels-1.png b/img/README-labels-1.png index 1c666981..5d54504f 100644 Binary files a/img/README-labels-1.png and b/img/README-labels-1.png differ diff --git a/img/README-thematic-1.png b/img/README-thematic-1.png index f2ab5f7c..020702e1 100644 Binary files a/img/README-thematic-1.png and b/img/README-thematic-1.png differ diff --git a/inst/schemaorg.json b/inst/schemaorg.json index a5c593c7..d24fbf2f 100644 --- a/inst/schemaorg.json +++ b/inst/schemaorg.json @@ -40,8 +40,8 @@ "name": "Comprehensive R Archive Network (CRAN)", "url": "https://cran.r-project.org" }, - "runtimePlatform": "R version 4.4.1 (2024-06-14)", - "version": "0.5.0.9000" + "runtimePlatform": "R version 4.4.1 (2024-06-14 ucrt)", + "version": "0.5.1" }, { "id": "https://doi.org/10.32614/CRAN.package.giscoR", diff --git a/man/gisco_get_healthcare.Rd b/man/gisco_get_healthcare.Rd index 1aed8ec9..6b46637a 100644 --- a/man/gisco_get_healthcare.Rd +++ b/man/gisco_get_healthcare.Rd @@ -61,13 +61,13 @@ For a complete list of files available check \link{gisco_db}. \dontshow{if (gisco_check_access()) (if (getRversion() >= "3.4") withAutoprint else force)(\{ # examplesIf} \donttest{ -health_BEL <- gisco_get_healthcare(country = "Belgium") +health_be <- gisco_get_healthcare(country = "Belgium") # Plot if downloaded -if (nrow(health_BEL) > 3) { +if (inherits(health_be, "sf")) { library(ggplot2) - ggplot(health_BEL) + - geom_sf(aes(color = emergency)) + ggplot(health_be) + + geom_sf() } } \dontshow{\}) # examplesIf} diff --git a/revdep/README.md b/revdep/README.md index abd1d66f..aaf46fbb 100644 --- a/revdep/README.md +++ b/revdep/README.md @@ -1,41 +1,48 @@ # Platform -|field |value | -|:--------|:------------------------------------------------------| -|version |R version 4.4.1 (2024-06-14) | -|os |Ubuntu 22.04.4 LTS | -|system |x86_64, linux-gnu | -|ui |X11 | -|language |(EN) | -|collate |C.UTF-8 | -|ctype |C.UTF-8 | -|tz |UTC | -|date |2024-07-05 | -|pandoc |3.1.11 @ /opt/hostedtoolcache/pandoc/3.1.11/x64/pandoc | +|field |value | +|:--------|:----------------------------------------| +|version |R version 4.4.1 (2024-06-14 ucrt) | +|os |Windows 11 x64 (build 22631) | +|system |x86_64, mingw32 | +|ui |RStudio | +|language |(EN) | +|collate |Spanish_Spain.utf8 | +|ctype |Spanish_Spain.utf8 | +|tz |Europe/Madrid | +|date |2024-07-06 | +|rstudio |2024.04.2+764 Chocolate Cosmos (desktop) | +|pandoc |3.1.12.2 @ C:\PROGRA~1\Pandoc\pandoc.exe | # Dependencies -|package |old |new |Δ | -|:-----------|:------|:----------|:--| -|giscoR |0.5.0 |0.5.0.9000 |* | -|classInt |0.4-10 |0.4-10 | | -|countrycode |1.6.0 |1.6.0 | | -|DBI |1.2.3 |1.2.3 | | -|e1071 |1.7-14 |1.7-14 | | -|geojsonsf |2.0.3 |2.0.3 | | -|geometries |0.2.4 |0.2.4 | | -|jsonify |1.2.2 |1.2.2 | | -|jsonlite |1.8.8 |1.8.8 | | -|magrittr |2.0.3 |2.0.3 | | -|proxy |0.4-27 |0.4-27 | | -|rapidjsonr |1.2.0 |1.2.0 | | -|rappdirs |0.3.3 |0.3.3 | | -|Rcpp |1.0.12 |1.0.12 | | -|s2 |1.1.6 |1.1.6 | | -|sf |1.0-16 |1.0-16 | | -|sfheaders |0.4.4 |0.4.4 | | -|units |0.8-5 |0.8-5 | | -|wk |0.9.1 |0.9.1 | | +|package |old |new |Δ | +|:-----------|:------|:------|:--| +|giscoR |0.5.0 |0.5.1 |* | +|classInt |0.4-10 |0.4-10 | | +|countrycode |1.6.0 |1.6.0 | | +|DBI |1.2.3 |1.2.3 | | +|e1071 |1.7-14 |1.7-14 | | +|geojsonsf |2.0.3 |2.0.3 | | +|geometries |0.2.4 |0.2.4 | | +|jsonify |1.2.2 |1.2.2 | | +|jsonlite |1.8.8 |1.8.8 | | +|magrittr |2.0.3 |2.0.3 | | +|proxy |0.4-27 |0.4-27 | | +|rapidjsonr |1.2.0 |1.2.0 | | +|rappdirs |0.3.3 |0.3.3 | | +|Rcpp |1.0.12 |1.0.12 | | +|s2 |1.1.6 |1.1.6 | | +|sf |1.0-16 |1.0-16 | | +|sfheaders |0.4.4 |0.4.4 | | +|units |0.8-5 |0.8-5 | | +|wk |0.9.1 |0.9.1 | | # Revdeps +## New problems (1) + +|package |version |error |warning |note | +|:--------|:-------|:------|:-------|:----| +|[mapSpain](problems.md#mapspain)|0.9.1 |__+1__ | |1 | + diff --git a/revdep/cran.md b/revdep/cran.md index cb582d73..835003e6 100644 --- a/revdep/cran.md +++ b/revdep/cran.md @@ -1,7 +1,15 @@ ## revdepcheck results -We checked 3 reverse dependencies (0 from CRAN + 3 from Bioconductor), comparing R CMD check results across CRAN and dev versions of this package. +We checked 4 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package. - * We saw 0 new problems + * We saw 1 new problems * We failed to check 0 packages +Issues with CRAN packages are summarised below. + +### New problems +(This reports the first line of each new failure) + +* mapSpain + checking tests ... + diff --git a/revdep/problems.md b/revdep/problems.md index 9a207363..0d8741fb 100644 --- a/revdep/problems.md +++ b/revdep/problems.md @@ -1 +1,46 @@ -*Wow, no problems at all. :)* \ No newline at end of file +# mapSpain + +
+ +* Version: 0.9.1 +* GitHub: https://github.com/rOpenSpain/mapSpain +* Source code: https://github.com/cran/mapSpain +* Date/Publication: 2024-06-10 18:20:01 UTC +* Number of recursive dependencies: 102 + +Run `revdepcheck::revdep_details(, "mapSpain")` for more info + +
+ +## Newly broken + +* checking tests ... + ``` + Running 'testthat.R' + ERROR + Running the tests in 'tests/testthat.R' failed. + Last 13 lines of output: + 4. └─testthat:::test_files_parallel(...) + 5. ├─withr::with_dir(...) + 6. │ └─base::force(code) + 7. ├─testthat::with_reporter(...) + 8. │ └─base::tryCatch(...) + 9. │ └─base (local) tryCatchList(expr, classes, parentenv, handlers) + 10. │ └─base (local) tryCatchOne(expr, names, parentenv, handlers[[1L]]) + 11. │ └─base (local) doTryCatch(return(expr), name, parentenv, handler) + 12. └─testthat:::parallel_event_loop_chunky(queue, reporters, ".") + 13. └─queue$poll(Inf) + 14. └─base::lapply(...) + 15. └─testthat (local) FUN(X[[i]], ...) + 16. └─private$handle_error(msg, i) + 17. └─rlang::abort(...) + Execution halted + ``` + +## In both + +* checking data for non-ASCII characters ... NOTE + ``` + Note: found 13138 marked UTF-8 strings + ``` + diff --git a/vignettes/africa-1.png b/vignettes/africa-1.png index bf36122f..1cab61c5 100644 Binary files a/vignettes/africa-1.png and b/vignettes/africa-1.png differ diff --git a/vignettes/country-1.png b/vignettes/country-1.png index 5375de2b..ecf20668 100644 Binary files a/vignettes/country-1.png and b/vignettes/country-1.png differ diff --git a/vignettes/giscoR-1.png b/vignettes/giscoR-1.png index a5264da6..50d3657d 100644 Binary files a/vignettes/giscoR-1.png and b/vignettes/giscoR-1.png differ diff --git a/vignettes/giscoR.Rmd b/vignettes/giscoR.Rmd index 9a24b9ea..1596572b 100644 --- a/vignettes/giscoR.Rmd +++ b/vignettes/giscoR.Rmd @@ -177,7 +177,7 @@ library(dplyr) library(eurostat) nuts2 <- gisco_get_nuts( - year = "2021", epsg = "3035", resolution = "3", + year = "2021", epsg = "3035", resolution = "10", nuts_level = "2" ) # Borders from countries diff --git a/vignettes/giscoR.Rmd.orig b/vignettes/giscoR.Rmd.orig index 514520b5..eaa70abd 100644 --- a/vignettes/giscoR.Rmd.orig +++ b/vignettes/giscoR.Rmd.orig @@ -165,7 +165,7 @@ library(dplyr) library(eurostat) nuts2 <- gisco_get_nuts( - year = "2021", epsg = "3035", resolution = "3", + year = "2021", epsg = "3035", resolution = "10", nuts_level = "2" ) # Borders from countries