Merge pull request #112 from rOpenSpain/dist2024

Adapt to SIANE 2024

DESCRIPTION

@@ -1,7 +1,7 @@
 Type: Package
 Package: mapSpain
 Title: Administrative Boundaries of Spain
-Version: 0.9.1
+Version: 0.9.1.9000
 Authors@R: 
     person("Diego", "Hernangómez", , "[email protected]", role = c("aut", "cre", "cph"),
            comment = c(ORCID = "0000-0001-8457-4658", affiliation = "rOpenSpain"))

NEWS.md

@@ -1,3 +1,8 @@
+# mapSpain (development version)
+
+-   **SIANE 2024 Update**: Adapt functions to new databases.
+-   Improve dictionaries: `esp_dict_region_code()` and `esp_dict_translate()`.
+
 # mapSpain 0.9.1
 
 -   Update actions and docs.

R/esp_dict.R

@@ -61,6 +61,20 @@
 #'
 esp_dict_region_code <- function(sourcevar, origin = "text",
                                  destination = "text") {
+  # Manually replace
+  sourcevar <- gsub("Ciudad de ceuta", "Ceuta", sourcevar,
+    ignore.case = TRUE
+  )
+  sourcevar <- gsub("Ciudad de melilla", "Melilla", sourcevar,
+    ignore.case = TRUE
+  )
+  sourcevar <- gsub("sta. cruz", "Santa Cruz", sourcevar,
+    ignore.case = TRUE
+  )
+  sourcevar <- gsub("sta cruz", "Santa Cruz", sourcevar,
+    ignore.case = TRUE
+  )
+
   initsourcevar <- sourcevar
 
   validvars <- c("text", "nuts", "iso2", "codauto", "cpro")
@@ -245,6 +259,20 @@ esp_dict_translate <- function(sourcevar, lang = "en", all = FALSE) {
     names_full[grep("name", dict$variable), c("key", "value")]
   )
 
+  # Manually replace
+  sourcevar <- gsub("Ciudad de ceuta", "Ceuta", sourcevar,
+    ignore.case = TRUE
+  )
+  sourcevar <- gsub("Ciudad de melilla", "Melilla", sourcevar,
+    ignore.case = TRUE
+  )
+  sourcevar <- gsub("sta. cruz", "Santa Cruz", sourcevar,
+    ignore.case = TRUE
+  )
+  sourcevar <- gsub("sta cruz", "Santa Cruz", sourcevar,
+    ignore.case = TRUE
+  )
+
   tokeys <- countrycode::countrycode(sourcevar,
     origin = "value",
     destination = "key",

R/esp_get_ccaa.R

@@ -194,7 +194,7 @@ esp_get_ccaa_siane <- function(ccaa = NULL, year = Sys.Date(), epsg = "4258",
   initcols <- colnames(sf::st_drop_geometry(data_sf))
 
   # Add codauto
-  data_sf$lab <- data_sf$nombres_f
+  data_sf$lab <- data_sf$rotulo
 
   data_sf$lab <- gsub("Ciudad de ", "", data_sf$lab, fixed = TRUE)
   data_sf$lab <- gsub("/Catalunya", "", data_sf$lab)

R/esp_get_hypsobath.R

@@ -154,4 +154,5 @@ esp_get_hypsobath <- function(epsg = "4258", cache = TRUE, update_cache = FALSE,
   )
 
   data_sf <- sf::st_transform(data_sf, as.double(init_epsg))
+  data_sf
 }

R/utils_siane.R

@@ -235,6 +235,11 @@ esp_hlp_get_siane <- function(type,
     # Transform and bind
     data_sf2 <- sf::st_transform(data_sf2, sf::st_crs(data_sf1))
 
+    if (ncol(data_sf1) != ncol(data_sf2)) {
+      data_sf2[, setdiff(names(data_sf1), names(data_sf2))] <- NA
+    }
+
+
     data_sf <- rbind(data_sf1, data_sf2)
   } else {
     if (verbose) {
@@ -243,6 +248,14 @@ esp_hlp_get_siane <- function(type,
     data_sf <- data_sf1
   }
   # Date management
+  # Need to adjust on 2024 dist
+  if (type %in% c(
+    "roads", "riverline", "riverarea",
+    "orogarea", "orogline"
+  )) {
+    data_sf$fecha_baja <- NA
+  }
+
   mindate <- min(data_sf$fecha_alta)
   maxdate <- Sys.Date()
   year <- as.character(year)

tests/testthat/test-esp_dict.R

@@ -16,7 +16,10 @@ test_that("Testing dict", {
         "Ciudad Autónoma de Ceuta",
         "Ciudad Autónoma de Melilla",
         "Región de Murcia",
-        "Principado de Asturias"
+        "Principado de Asturias",
+        "Ciudad de Ceuta",
+        "Ciudad de Melilla",
+        "Sta. Cruz de Tenerife"
       ),
       destination = "cpro"
     )
@@ -73,4 +76,18 @@ test_that("Testing dict", {
 
   expect_false(all(vals == test))
   expect_true(all(vals == esp_dict_translate(test, "es")))
+  expect_silent(
+    esp_dict_translate(
+      c(
+        "Ciudad Autónoma de Ceuta",
+        "Ciudad Autónoma de Melilla",
+        "Región de Murcia",
+        "Principado de Asturias",
+        "Ciudad de Ceuta",
+        "Ciudad de Melilla",
+        "Sta. Cruz de Tenerife"
+      ),
+      lang = "eu"
+    )
+  )
 })