adapt tmap v4 to version 1.5.2

e-sensing · Aug 19, 2024 · 7775422 · 7775422
1 parent d0d5a49
commit 7775422
Show file tree

Hide file tree

Showing 12 changed files with 392 additions and 112 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -108,6 +108,7 @@ Suggests:
     testthat (>= 3.1.3),
     tmap (>= 3.3),
     tools,
+    vdiffr,
     xgboost
 Config/testthat/edition: 3
 Config/testthat/parallel: false
@@ -203,6 +204,7 @@ Collate:
     'api_timeline.R'
     'api_tmap.R'
     'api_tmap_v3.R'
+    'api_tmap_v4.R'
     'api_torch.R'
     'api_torch_psetae.R'
     'api_ts.R'

diff --git a/NAMESPACE b/NAMESPACE
@@ -318,12 +318,20 @@ S3method(.tile_xres,raster_cube)
 S3method(.tile_yres,default)
 S3method(.tile_yres,raster_cube)
 S3method(.tmap_class_map,tmap_v3)
+S3method(.tmap_class_map,tmap_v4)
 S3method(.tmap_dem_map,tmap_v3)
+S3method(.tmap_dem_map,tmap_v4)
 S3method(.tmap_false_color,tmap_v3)
+S3method(.tmap_false_color,tmap_v4)
 S3method(.tmap_probs_map,tmap_v3)
+S3method(.tmap_probs_map,tmap_v4)
 S3method(.tmap_rgb_color,tmap_v3)
+S3method(.tmap_rgb_color,tmap_v4)
 S3method(.tmap_vector_class,tmap_v3)
+S3method(.tmap_vector_class,tmap_v4)
 S3method(.tmap_vector_probs,tmap_v3)
+S3method(.tmap_vector_probs,tmap_v4)
+S3method(.tmap_vector_uncert,tmap_v4)
 S3method(.values_ts,bands_cases_dates)
 S3method(.values_ts,bands_dates_cases)
 S3method(.values_ts,cases_dates_bands)

diff --git a/R/api_tmap.R b/R/api_tmap.R
@@ -27,7 +27,7 @@
     if (as.numeric_version(utils::packageVersion("tmap")) < "3.9")
         class(st) <- "tmap_v3"
     else
-        class(st) <- "tmap_v3"
+        class(st) <- "tmap_v4"
     UseMethod(".tmap_false_color", st)
 }
 #' @title  Plot a DEM
@@ -49,7 +49,7 @@
     if (as.numeric_version(utils::packageVersion("tmap")) < "3.9")
         class(r) <- "tmap_v3"
     else
-        class(r) <- "tmap_v3"
+        class(r) <- "tmap_v4"
     UseMethod(".tmap_dem_map", r)
 }
 
@@ -73,7 +73,7 @@
     if (as.numeric_version(utils::packageVersion("tmap")) < "3.9")
         class(rgb_st) <- "tmap_v3"
     else
-        class(rgb_st) <- "tmap_v3"
+        class(rgb_st) <- "tmap_v4"
     UseMethod(".tmap_rgb_color", rgb_st)
 }
 #' @title  Plot a probs image
@@ -100,7 +100,7 @@
     if (as.numeric_version(utils::packageVersion("tmap")) < "3.9")
         class(probs_st) <- "tmap_v3"
     else
-        class(probs_st) <- "tmap_v3"
+        class(probs_st) <- "tmap_v4"
     UseMethod(".tmap_probs_map", probs_st)
 }
 #
@@ -120,7 +120,7 @@
     if (as.numeric_version(utils::packageVersion("tmap")) < "3.9")
         class(st) <- "tmap_v3"
     else
-        class(st) <- "tmap_v3"
+        class(st) <- "tmap_v4"
     UseMethod(".tmap_class_map", st)
 }
 
@@ -144,12 +144,9 @@
     if (as.numeric_version(utils::packageVersion("tmap")) < "3.9")
         class(sf_seg) <- "tmap_v3"
     else
-        class(sf_seg) <- "tmap_v3"
+        class(sf_seg) <- "tmap_v4"
     UseMethod(".tmap_vector_probs", sf_seg)
 }
-
-
-
 #' @title  Plot a vector class map
 #' @name   .tmap_vector_class
 #' @author Gilberto Camara, \email{gilberto.camara@@inpe.br}
@@ -165,7 +162,7 @@
     if (as.numeric_version(utils::packageVersion("tmap")) < "3.9")
         class(sf_seg) <- "tmap_v3"
     else
-        class(sf_seg) <- "tmap_v3"
+        class(sf_seg) <- "tmap_v4"
     UseMethod(".tmap_vector_class", sf_seg)
 }
 
@@ -187,7 +184,7 @@
     if (as.numeric_version(utils::packageVersion("tmap")) < "3.9")
         class(sf_seg) <- "tmap_v3"
     else
-        class(sf_seg) <- "tmap_v3"
+        class(sf_seg) <- "tmap_v4"
     UseMethod(".tmap_vector_uncert", sf_seg)
 
 }
@@ -207,7 +204,7 @@
 #' \item \code{legend_text_size}: relative size of legend text (default = 1.0)
 #' \item \code{legend_bg_color}: color of legend background (default = "white")
 #' \item \code{legend_bg_alpha}: legend opacity (default = 0.5)
-#' \item \code{legend_position}: 2D position of legend (default = c("left", "bottom"))
+#' \item \code{legend_position}: position of legend ("inside", "outside")))
 #' }
 .tmap_params_set <- function(dots){
 

diff --git a/R/api_tmap_v3.R b/R/api_tmap_v3.R
@@ -29,7 +29,6 @@
             legend.bg.alpha = tmap_params[["legend_bg_alpha"]],
             legend.title.size = tmap_params[["legend_title_size"]],
             legend.text.size = tmap_params[["legend_text_size"]],
-            legend.position = tmap_params[["legend_position"]],
             scale = scale
         )
     # include segments
@@ -65,7 +64,6 @@
             legend.bg.alpha = tmap_params[["legend_bg_alpha"]],
             legend.title.size = tmap_params[["legend_title_size"]],
             legend.text.size = tmap_params[["legend_text_size"]],
-            legend.position = tmap_params[["legend_position"]],
             scale = scale
         )
     return(p)
@@ -131,7 +129,6 @@
             legend.bg.alpha = tmap_params[["legend_bg_alpha"]],
             legend.title.size = tmap_params[["legend_title_size"]],
             legend.text.size = tmap_params[["legend_text_size"]],
-            legend.position = tmap_params[["legend_position"]],
             scale = scale
         )
     return(p)
@@ -242,7 +239,6 @@
             legend.bg.alpha = tmap_params[["legend_bg_alpha"]],
             legend.title.size = tmap_params[["legend_title_size"]],
             legend.text.size = tmap_params[["legend_text_size"]],
-            legend.position = tmap_params[["legend_position"]],
             scale = scale
         ) +
         tmap::tm_borders(lwd = 0.2)