Adapt to SIANE 2024

rOpenSpain · Aug 2, 2024 · 1a7867d · 1a7867d
1 parent 551cb7b
commit 1a7867d
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 2 deletions.
diff --git a/DESCRIPTION b/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"))

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,5 @@
+# mapSpain (development version)
+
 # mapSpain 0.9.1
 
 -   Update actions and docs.

diff --git a/R/esp_get_ccaa.R b/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)

diff --git a/R/esp_get_hypsobath.R b/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
 }
diff --git a/R/utils_siane.R b/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)

diff --git a/data/esp_codelist.rda b/data/esp_codelist.rda
diff --git a/data/esp_tiles_providers.rda b/data/esp_tiles_providers.rda
diff --git a/data/leaflet.providersESP.df.rda b/data/leaflet.providersESP.df.rda
diff --git a/img/README-static-1.png b/img/README-static-1.png
diff --git a/vignettes/basic-1.png b/vignettes/basic-1.png
diff --git a/vignettes/basic2-1.png b/vignettes/basic2-1.png
diff --git a/vignettes/basic3-1.png b/vignettes/basic3-1.png
diff --git a/vignettes/choro-1.png b/vignettes/choro-1.png
diff --git a/vignettes/giscoR-1.png b/vignettes/giscoR-1.png
diff --git a/vignettes/thematic-1.png b/vignettes/thematic-1.png