From 3d29c2c84b7e972f5a3350163488d8aab3306e9a Mon Sep 17 00:00:00 2001 From: Diego H Date: Sun, 15 Dec 2024 12:58:15 +0100 Subject: [PATCH] prepare for CRAN --- CITATION.cff | 7 ++--- DESCRIPTION | 4 +-- NEWS.md | 4 +-- R/esp_get_comarca.R | 15 +-------- README.md | 2 +- codemeta.json | 4 +-- inst/schemaorg.json | 2 +- man/esp_get_comarca.Rd | 15 +-------- man/mapSpain-package.Rd | 2 +- revdep/README.md | 69 +++++++++++++++++++++-------------------- 10 files changed, 48 insertions(+), 76 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index 7bbc89aa..72217795 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -8,7 +8,7 @@ message: 'To cite package "mapSpain" in publications use:' type: software license: GPL-3.0-only title: 'mapSpain: Administrative Boundaries of Spain' -version: 0.9.2.9000 +version: 0.10.0 doi: 10.5281/zenodo.5366622 identifiers: - type: doi @@ -23,7 +23,6 @@ authors: given-names: Diego email: diego.hernangomezherrero@gmail.com orcid: https://orcid.org/0000-0001-8457-4658 - affiliation: rOpenSpain preferred-citation: type: manual title: 'mapSpain: Administrative Boundaries of Spain' @@ -32,9 +31,8 @@ preferred-citation: given-names: Diego email: diego.hernangomezherrero@gmail.com orcid: https://orcid.org/0000-0001-8457-4658 - affiliation: rOpenSpain year: '2024' - version: 0.9.2.9000 + version: 0.10.0 doi: 10.5281/zenodo.5366622 url: https://ropenspain.github.io/mapSpain/ abstract: Administrative Boundaries of Spain at several levels (Autonomous Communities, @@ -50,7 +48,6 @@ contact: given-names: Diego email: diego.hernangomezherrero@gmail.com orcid: https://orcid.org/0000-0001-8457-4658 - affiliation: rOpenSpain keywords: - ropenspain - tiles diff --git a/DESCRIPTION b/DESCRIPTION index 80236d90..4da49f52 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,10 +1,10 @@ Type: Package Package: mapSpain Title: Administrative Boundaries of Spain -Version: 0.9.2.9000 +Version: 0.10.0 Authors@R: person("Diego", "Hernangómez", , "diego.hernangomezherrero@gmail.com", role = c("aut", "cre", "cph"), - comment = c(ORCID = "0000-0001-8457-4658", affiliation = "rOpenSpain")) + comment = c(ORCID = "0000-0001-8457-4658")) Description: Administrative Boundaries of Spain at several levels (Autonomous Communities, Provinces, Municipalities) based on the 'GISCO' 'Eurostat' database diff --git a/NEWS.md b/NEWS.md index 35b68bf3..30f3076a 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,7 +1,7 @@ -# mapSpain (development version) +# mapSpain 0.10.0 - Fix a bug on `esp_get_prov_siane()` when selecting columns #115. -- New argument `type` in `esp_get_comarcas()`. Now it is possible to extract +- New argument `type` in `esp_get_comarca()`. Now it is possible to extract different types of comarcas: Official (IGN), statistical (INE), agrarian or livestock comarcas (MAPA). diff --git a/R/esp_get_comarca.R b/R/esp_get_comarca.R index 12d2bfc8..8eb03a57 100644 --- a/R/esp_get_comarca.R +++ b/R/esp_get_comarca.R @@ -42,7 +42,7 @@ #' #' ## Types #' -#' `esp_get_comarcas()` can retrieve several types of comarcas, each one +#' `esp_get_comarca()` can retrieve several types of comarcas, each one #' provided under different classification criteria. #' #' - `"INE"`: Comarcas as defined by the National Statistics Institute (INE). @@ -95,19 +95,6 @@ #' ggplot(comarcas_cat) + #' geom_sf(aes(fill = ine.prov.name)) + #' labs(fill = "Province") -#' -#' # Livestock Comarcas with Mountains or Alt(o,a) in the name -#' -#' comarcas_alto <- esp_get_comarca( -#' comarca = "Montaña|Monte|Sierra|Alt", -#' type = "LIV", -#' epsg = 3857 -#' ) -#' -#' ggplot(comarcas_alto) + -#' geom_sf(aes(fill = ine.ccaa.name)) + -#' geom_sf_text(aes(label = name), check_overlap = TRUE) + -#' labs(fill = "CCAA") #' } #' esp_get_comarca <- function(region = NULL, comarca = NULL, moveCAN = TRUE, diff --git a/README.md b/README.md index 90d5456e..11acdae3 100644 --- a/README.md +++ b/README.md @@ -244,7 +244,7 @@ A BibTeX entry for LaTeX users is: @Manual{R-mapspain, title = {{mapSpain}: Administrative Boundaries of Spain}, year = {2024}, - version = {0.9.2.9000}, + version = {0.10.0}, author = {Diego Hernangómez}, doi = {10.5281/zenodo.5366622}, url = {https://ropenspain.github.io/mapSpain/}, diff --git a/codemeta.json b/codemeta.json index d36a5439..5dc0de80 100644 --- a/codemeta.json +++ b/codemeta.json @@ -8,7 +8,7 @@ "codeRepository": "https://github.com/rOpenSpain/mapSpain", "issueTracker": "https://github.com/rOpenSpain/mapSpain/issues", "license": "https://spdx.org/licenses/GPL-3.0", - "version": "0.9.2.9000", + "version": "0.10.0", "programmingLanguage": { "@type": "ComputerLanguage", "name": "R", @@ -245,7 +245,7 @@ "applicationCategory": "cartography", "isPartOf": "https://ropenspain.es/", "keywords": ["ropenspain", "tiles", "r", "maps", "spatial", "rstats", "r-package", "municipalities", "spain", "gisco", "provinces", "ign", "administrative-boundaries", "ccaa", "static-tiles", "cran", "ggplot2", "gis"], - "fileSize": "2841.115KB", + "fileSize": "2840.415KB", "citation": [ { "@type": "SoftwareSourceCode", diff --git a/inst/schemaorg.json b/inst/schemaorg.json index 86eeba5c..7fcbf7e8 100644 --- a/inst/schemaorg.json +++ b/inst/schemaorg.json @@ -29,7 +29,7 @@ "url": "https://cran.r-project.org" }, "runtimePlatform": "R version 4.4.2 (2024-10-31 ucrt)", - "version": "0.9.2.9000" + "version": "0.10.0" }, { "id": "https://doi.org/10.5281/zenodo.5366622", diff --git a/man/esp_get_comarca.Rd b/man/esp_get_comarca.Rd index 7d638ac8..f868e952 100644 --- a/man/esp_get_comarca.Rd +++ b/man/esp_get_comarca.Rd @@ -72,7 +72,7 @@ the Principality of Asturias, and Andalusia have functional comarcas. \subsection{Types}{ -\code{esp_get_comarcas()} can retrieve several types of comarcas, each one +\code{esp_get_comarca()} can retrieve several types of comarcas, each one provided under different classification criteria. \itemize{ \item \code{"INE"}: Comarcas as defined by the National Statistics Institute (INE). @@ -148,19 +148,6 @@ comarcas_cat <- esp_get_comarca("Catalunya", type = "IGN") ggplot(comarcas_cat) + geom_sf(aes(fill = ine.prov.name)) + labs(fill = "Province") - -# Livestock Comarcas with Mountains or Alt(o,a) in the name - -comarcas_alto <- esp_get_comarca( - comarca = "Montaña|Monte|Sierra|Alt", - type = "LIV", - epsg = 3857 -) - -ggplot(comarcas_alto) + - geom_sf(aes(fill = ine.ccaa.name)) + - geom_sf_text(aes(label = name), check_overlap = TRUE) + - labs(fill = "CCAA") } \dontshow{\}) # examplesIf} } diff --git a/man/mapSpain-package.Rd b/man/mapSpain-package.Rd index b4f4099e..2a51dbe6 100644 --- a/man/mapSpain-package.Rd +++ b/man/mapSpain-package.Rd @@ -20,7 +20,7 @@ Useful links: } \author{ -\strong{Maintainer}: Diego Hernangómez \email{diego.hernangomezherrero@gmail.com} (\href{https://orcid.org/0000-0001-8457-4658}{ORCID}) (rOpenSpain) [copyright holder] +\strong{Maintainer}: Diego Hernangómez \email{diego.hernangomezherrero@gmail.com} (\href{https://orcid.org/0000-0001-8457-4658}{ORCID}) [copyright holder] } \keyword{internal} diff --git a/revdep/README.md b/revdep/README.md index 3a38e3a7..63feb4b3 100644 --- a/revdep/README.md +++ b/revdep/README.md @@ -1,42 +1,43 @@ # Platform -|field |value | -|:--------|:------------------------------| -|version |R version 4.4.2 (2024-10-31) | -|os |macOS Sonoma 14.7.1 | -|system |aarch64, darwin20 | -|ui |X11 | -|language |(EN) | -|collate |en_US.UTF-8 | -|ctype |en_US.UTF-8 | -|tz |UTC | -|date |2024-12-13 | -|pandoc |3.1.11 @ /usr/local/bin/pandoc | +|field |value | +|:--------|:------------------------------------------| +|version |R version 4.4.2 (2024-10-31 ucrt) | +|os |Windows 11 x64 (build 26100) | +|system |x86_64, mingw32 | +|ui |RStudio | +|language |(EN) | +|collate |Spanish_Spain.utf8 | +|ctype |Spanish_Spain.utf8 | +|tz |Europe/Madrid | +|date |2024-12-15 | +|rstudio |2024.09.1+394 Cranberry Hibiscus (desktop) | +|pandoc |3.1.12.2 @ C:\PROGRA~1\Pandoc\pandoc.exe | # Dependencies -|package |old |new |Δ | -|:-----------|:--------|:----------|:--| -|mapSpain |0.9.2 |0.9.2.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-16 |1.7-16 | | -|geojsonsf |2.0.3 |2.0.3 | | -|geometries |0.2.4 |0.2.4 | | -|giscoR |0.6.0 |0.6.0 | | -|jsonify |1.2.2 |1.2.2 | | -|jsonlite |1.8.9 |1.8.9 | | -|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.13-1 |1.0.13-1 | | -|s2 |1.1.7 |1.1.7 | | -|sf |1.0-19 |1.0-19 | | -|sfheaders |0.4.4 |0.4.4 | | -|units |0.8-5 |0.8-5 | | -|wk |0.9.4 |0.9.4 | | +|package |old |new |Δ | +|:-----------|:--------|:--------|:--| +|mapSpain |0.9.2 |0.10.0 |* | +|classInt |0.4-10 |0.4-10 | | +|countrycode |1.6.0 |1.6.0 | | +|DBI |1.2.3 |1.2.3 | | +|e1071 |1.7-16 |1.7-16 | | +|geojsonsf |2.0.3 |2.0.3 | | +|geometries |0.2.4 |0.2.4 | | +|giscoR |0.6.0 |0.6.0 | | +|jsonify |1.2.2 |1.2.2 | | +|jsonlite |1.8.9 |1.8.9 | | +|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.13-1 |1.0.13-1 | | +|s2 |1.1.7 |1.1.7 | | +|sf |1.0-19 |1.0-19 | | +|sfheaders |0.4.4 |0.4.4 | | +|units |0.8-5 |0.8-5 | | +|wk |0.9.4 |0.9.4 | | # Revdeps