Refactor code to use esp_move_can

rOpenSpain · Jan 15, 2024 · 57d4c19 · 57d4c19
1 parent 323c8fa
commit 57d4c19
Show file tree

Hide file tree

Showing 13 changed files with 80 additions and 196 deletions.
diff --git a/R/esp_get_can_box.R b/R/esp_get_can_box.R
@@ -10,6 +10,8 @@
 #'   Islands.
 #'
 #' @family political
+#' @family canary
+#'
 #' @seealso [esp_move_can()]
 #' @rdname esp_get_can_box
 #'
@@ -154,25 +156,8 @@ esp_get_can_box <- function(style = "right",
     lall <- sf::st_sfc(lall, crs = sf::st_crs(can))
   }
 
-  moving <- FALSE
-  moving <- isTRUE(moveCAN) | length(moveCAN) > 1
-
-  if (moving) {
-    offset <- c(550000, 920000)
-
-    if (length(moveCAN) > 1) {
-      coords <- sf::st_point(moveCAN)
-      coords <- sf::st_sfc(coords, crs = sf::st_crs(4326))
-      coords <- sf::st_transform(coords, 3857)
-      coords <- sf::st_coordinates(coords)
-      offset <- offset + as.double(coords)
-    }
-
-    can <- sf::st_transform(lall, 3857) + offset
-    can <- sf::st_sfc(can, crs = 3857)
-    can <- sf::st_transform(can, sf::st_crs(lall))
-    lall <- can
-  }
+  # Move
+  lall <- esp_move_can(lall, moveCAN = moveCAN)
 
   # Transform
 
@@ -188,6 +173,9 @@ esp_get_can_box <- function(style = "right",
 #' * [esp_get_can_provinces()] is used to draw a separator line between the two
 #' provinces of the Canary Islands.
 #'
+#'
+#' See also [esp_move_can()] to align stand-alone \CRANpkg{sf} objects.
+#'
 #' @return `esp_get_can_provinces` returns a `LINESTRING` object.
 #'
 #' @source
@@ -212,25 +200,8 @@ esp_get_can_provinces <- function(moveCAN = TRUE,
   lall <- sf::st_linestring(sf::st_coordinates(m))
   lall <- sf::st_sfc(lall, crs = sf::st_crs(4326))
 
-  moving <- FALSE
-  moving <- isTRUE(moveCAN) | length(moveCAN) > 1
-
-  if (moving) {
-    offset <- c(550000, 920000)
-
-    if (length(moveCAN) > 1) {
-      coords <- sf::st_point(moveCAN)
-      coords <- sf::st_sfc(coords, crs = sf::st_crs(4326))
-      coords <- sf::st_transform(coords, 3857)
-      coords <- sf::st_coordinates(coords)
-      offset <- offset + as.double(coords)
-    }
-
-    can <- sf::st_transform(lall, 3857) + offset
-    can <- sf::st_sfc(can, crs = 3857)
-    can <- sf::st_transform(can, sf::st_crs(lall))
-    lall <- can
-  }
+  # Move
+  lall <- esp_move_can(lall, moveCAN = moveCAN)
 
   # Transform
 

diff --git a/R/esp_get_capimun.R b/R/esp_get_capimun.R
@@ -156,29 +156,16 @@ esp_get_capimun <- function(year = Sys.Date(),
 
   # Checks
   moving <- FALSE
-  moving <- isTRUE(moveCAN) | length(moveCAN) > 1
+  moving <- any(isTRUE(moveCAN), length(moveCAN) > 1,
+                length(grep("05", data_sf$codauto)) > 0)
+
 
   if (moving) {
-    if (length(grep("05", data_sf$codauto)) > 0) {
-      offset <- c(550000, 920000)
-
-      if (length(moveCAN) > 1) {
-        coords <- sf::st_point(moveCAN)
-        coords <- sf::st_sfc(coords, crs = sf::st_crs(4326))
-        coords <- sf::st_transform(coords, 3857)
-        coords <- sf::st_coordinates(coords)
-        offset <- offset + as.double(coords)
-      }
 
-      data_sf <- sf::st_transform(data_sf, 3857)
-      penin <- data_sf[-grep("05", data_sf$codauto), ]
-      can <- data_sf[grep("05", data_sf$codauto), ]
+    penin <- data_sf[-grep("05", data_sf$codauto), ]
+    can <- data_sf[grep("05", data_sf$codauto), ]
 
-      # Move CAN
-      can <- sf::st_sf(sf::st_drop_geometry(can),
-        geometry = sf::st_geometry(can) + offset,
-        crs = sf::st_crs(can)
-      )
+    can <- esp_move_can(can, moveCAN = moveCAN)
 
       # Regenerate
       if (nrow(penin) > 0) {
@@ -187,7 +174,6 @@ esp_get_capimun <- function(year = Sys.Date(),
         data_sf <- can
       }
     }
-  }
 
   data_sf <- sf::st_transform(data_sf, as.double(init_epsg))
   data_sf <- data_sf[order(data_sf$codauto, data_sf$cpro, data_sf$cmun), ]

diff --git a/R/esp_get_ccaa.R b/R/esp_get_ccaa.R
@@ -244,29 +244,16 @@ esp_get_ccaa_siane <- function(ccaa = NULL,
 
   # Checks
   moving <- FALSE
-  moving <- isTRUE(moveCAN) | length(moveCAN) > 1
+  moving <- any(isTRUE(moveCAN), length(moveCAN) > 1,
+                length(grep("05", data_sf$codauto)) > 0)
 
   if (moving) {
     if (length(grep("05", data_sf$codauto)) > 0) {
-      offset <- c(550000, 920000)
-
-      if (length(moveCAN) > 1) {
-        coords <- sf::st_point(moveCAN)
-        coords <- sf::st_sfc(coords, crs = sf::st_crs(4326))
-        coords <- sf::st_transform(coords, 3857)
-        coords <- sf::st_coordinates(coords)
-        offset <- offset + as.double(coords)
-      }
-
-      data_sf <- sf::st_transform(data_sf, 3857)
       penin <- data_sf[-grep("05", data_sf$codauto), ]
       can <- data_sf[grep("05", data_sf$codauto), ]
 
       # Move CAN
-      can <- sf::st_sf(sf::st_drop_geometry(can),
-        geometry = sf::st_geometry(can) + offset,
-        crs = sf::st_crs(can)
-      )
+      can <- esp_move_can(can, moveCAN = moveCAN)
 
       # Regenerate
       if (nrow(penin) > 0) {

diff --git a/R/esp_get_comarca.R b/R/esp_get_comarca.R
@@ -134,30 +134,16 @@ esp_get_comarca <- function(region = NULL,
   # Checks
 
   moving <- FALSE
-  moving <- isTRUE(moveCAN) | length(moveCAN) > 1
+  moving <- any(isTRUE(moveCAN), length(moveCAN) > 1,
+                length(grep("05", data_sf$codauto)) > 0)
 
 
   if (moving) {
-    if (length(grep("05", data_sf$codauto)) > 0) {
-      offset <- c(550000, 920000)
-
-      if (length(moveCAN) > 1) {
-        coords <- sf::st_point(moveCAN)
-        coords <- sf::st_sfc(coords, crs = sf::st_crs(4326))
-        coords <- sf::st_transform(coords, 3857)
-        coords <- sf::st_coordinates(coords)
-        offset <- offset + as.double(coords)
-      }
-
-      data_sf <- sf::st_transform(data_sf, 3857)
       penin <- data_sf[-grep("05", data_sf$codauto), ]
       can <- data_sf[grep("05", data_sf$codauto), ]
 
       # Move CAN
-      can <- sf::st_sf(sf::st_drop_geometry(can),
-        geom = sf::st_geometry(can) + offset,
-        crs = sf::st_crs(can)
-      )
+      can <- esp_move_can(can, moveCAN = moveCAN)
 
       # Regenerate
       if (nrow(penin) > 0) {
@@ -166,7 +152,6 @@ esp_get_comarca <- function(region = NULL,
         data_sf <- can
       }
     }
-  }
 
   data_sf <- sf::st_transform(data_sf, as.double(init_epsg))
   data_sf <- data_sf[order(data_sf$codauto, data_sf$cpro, data_sf$COMAGR), ]

diff --git a/R/esp_get_munic.R b/R/esp_get_munic.R
@@ -268,31 +268,17 @@ esp_get_munic <- function(year = "2019",
   # Checks
 
   moving <- FALSE
-  moving <- isTRUE(moveCAN) | length(moveCAN) > 1
+  moving <- any(isTRUE(moveCAN), length(moveCAN) > 1,
+  length(grep("05", data_sf$codauto)) > 0)
 
 
   if (moving) {
-    if (length(grep("05", data_sf$codauto)) > 0) {
-      offset <- c(550000, 920000)
-
-      if (length(moveCAN) > 1) {
-        coords <- sf::st_point(moveCAN)
-        coords <- sf::st_sfc(coords, crs = sf::st_crs(4326))
-        coords <- sf::st_transform(coords, 3857)
-        coords <- sf::st_coordinates(coords)
-        offset <- offset + as.double(coords)
-      }
-
-      data_sf <- sf::st_transform(data_sf, 3857)
       penin <- data_sf[-grep("05", data_sf$codauto), ]
       can <- data_sf[grep("05", data_sf$codauto), ]
 
       # Move CAN
-      can <- sf::st_sf(
-        sf::st_drop_geometry(can),
-        geometry = sf::st_geometry(can) + offset,
-        crs = sf::st_crs(can)
-      )
+      can <- esp_move_can(can, moveCAN = moveCAN)
+
 
       # Regenerate
       if (nrow(penin) > 0) {
@@ -301,7 +287,6 @@ esp_get_munic <- function(year = "2019",
         data_sf <- can
       }
     }
-  }
 
   data_sf <- sf::st_transform(data_sf, as.double(init_epsg))
   data_sf <-
@@ -413,30 +398,15 @@ esp_get_munic_siane <- function(year = Sys.Date(),
 
   # Checks
   moving <- FALSE
-  moving <- isTRUE(moveCAN) | length(moveCAN) > 1
+  moving <- any(isTRUE(moveCAN), length(moveCAN) > 1,
+                length(grep("05", data_sf$codauto)) > 0)
 
   if (moving) {
-    if (length(grep("05", data_sf$codauto)) > 0) {
-      offset <- c(550000, 920000)
-
-      if (length(moveCAN) > 1) {
-        coords <- sf::st_point(moveCAN)
-        coords <- sf::st_sfc(coords, crs = sf::st_crs(4326))
-        coords <- sf::st_transform(coords, 3857)
-        coords <- sf::st_coordinates(coords)
-        offset <- offset + as.double(coords)
-      }
-
-      data_sf <- sf::st_transform(data_sf, 3857)
       penin <- data_sf[-grep("05", data_sf$codauto), ]
       can <- data_sf[grep("05", data_sf$codauto), ]
 
       # Move CAN
-      can <- sf::st_sf(
-        sf::st_drop_geometry(can),
-        geometry = sf::st_geometry(can) + offset,
-        crs = sf::st_crs(can)
-      )
+      can <- esp_move_can(can, moveCAN = moveCAN)
 
       # Regenerate
       if (nrow(penin) > 0) {
@@ -445,7 +415,6 @@ esp_get_munic_siane <- function(year = Sys.Date(),
         data_sf <- can
       }
     }
-  }
 
   data_sf <- sf::st_transform(data_sf, as.double(init_epsg))
   data_sf <-

diff --git a/R/esp_get_nuts.R b/R/esp_get_nuts.R
@@ -267,26 +267,12 @@ esp_get_nuts <- function(year = "2016",
 
   if (moving) {
     if (length(grep("ES7", data_sf$NUTS_ID)) > 0) {
-      offset <- c(550000, 920000)
 
-      if (length(moveCAN) > 1) {
-        coords <- sf::st_point(moveCAN)
-        coords <- sf::st_sfc(coords, crs = sf::st_crs(4326))
-        coords <- sf::st_transform(coords, 3857)
-        coords <- sf::st_coordinates(coords)
-        offset <- offset + as.double(coords)
-      }
-
-      data_sf <- sf::st_transform(data_sf, 3857)
       penin <- data_sf[-grep("ES7", data_sf$NUTS_ID), ]
       can <- data_sf[grep("ES7", data_sf$NUTS_ID), ]
 
       # Move can
-      can <- sf::st_sf(
-        sf::st_drop_geometry(can),
-        geometry = sf::st_geometry(can) + offset,
-        crs = sf::st_crs(can)
-      )
+      can <- esp_move_can(can, moveCAN = moveCAN)
 
       # Regenerate
       if (nrow(penin) > 0) {

diff --git a/R/esp_get_prov.R b/R/esp_get_prov.R
@@ -342,30 +342,15 @@ esp_get_prov_siane <- function(prov = NULL,
 
   # Checks
   moving <- FALSE
-  moving <- isTRUE(moveCAN) | length(moveCAN) > 1
+  moving <- any(isTRUE(moveCAN), length(moveCAN) > 1,
+                length(grep("05", data_sf$codauto)) > 0)
 
   if (moving) {
-    if (length(grep("05", data_sf$codauto)) > 0) {
-      offset <- c(550000, 920000)
-
-      if (length(moveCAN) > 1) {
-        coords <- sf::st_point(moveCAN)
-        coords <- sf::st_sfc(coords, crs = sf::st_crs(4326))
-        coords <- sf::st_transform(coords, 3857)
-        coords <- sf::st_coordinates(coords)
-        offset <- offset + as.double(coords)
-      }
-
-      data_sf <- sf::st_transform(data_sf, 3857)
       penin <- data_sf[-grep("05", data_sf$codauto), ]
       can <- data_sf[grep("05", data_sf$codauto), ]
 
       # Move can
-      can <- sf::st_sf(
-        sf::st_drop_geometry(can),
-        geometry = sf::st_geometry(can) + offset,
-        crs = sf::st_crs(can)
-      )
+      can <- esp_move_can(can, moveCAN = moveCAN)
 
       # Regenerate
       if (nrow(penin) > 0) {
@@ -374,7 +359,6 @@ esp_get_prov_siane <- function(prov = NULL,
         data_sf <- can
       }
     }
-  }
 
   data_sf <- sf::st_transform(data_sf, as.double(init_epsg))
 

diff --git a/R/esp_get_roads.R b/R/esp_get_roads.R
@@ -86,42 +86,19 @@ esp_get_roads <- function(year = Sys.Date(),
   # Move can
   # Checks
   moving <- FALSE
-  moving <- isTRUE(moveCAN) | length(moveCAN) > 1
+  moving <- any(isTRUE(moveCAN), length(moveCAN) > 1,
+                length(grep("05", data_sf$codauto)) > 0)
 
   if (moving) {
-    if (length(grep("05", data_sf$codauto)) > 0) {
-      offset <- c(550000, 920000)
-
-      if (length(moveCAN) > 1) {
-        coords <- sf::st_point(moveCAN)
-        coords <- sf::st_sfc(coords, crs = sf::st_crs(4326))
-        coords <- sf::st_transform(coords, 3857)
-        coords <- sf::st_coordinates(coords)
-        offset <- offset + as.double(coords)
-      }
-
-      data_sf <- sf::st_transform(data_sf, 3857)
       penin <- data_sf[-grep("05", data_sf$codauto), ]
       can <- data_sf[grep("05", data_sf$codauto), ]
 
-      # Change geometry name on penin
-      penin <- sf::st_sf(
-        sf::st_drop_geometry(penin),
-        geometry = sf::st_geometry(penin),
-        crs = sf::st_crs(penin)
-      )
-
-      # Move can
-      can <- sf::st_sf(
-        sf::st_drop_geometry(can),
-        geometry = sf::st_geometry(can) + offset,
-        crs = sf::st_crs(can)
-      )
 
+      can <- esp_move_can(can, moveCAN = moveCAN)
       # Regenerate
       data_sf <- rbind(penin, can)
     }
-  }
+
 
   data_sf <- sf::st_transform(data_sf, as.double(init_epsg))