Merge branch 'master' of https://github.com/r-tmap/tmap

r-tmap · Mar 7, 2024 · f890a5c · f890a5c
2 parents e584195 + fdaadd5
commit f890a5c
Show file tree

Hide file tree

Showing 11 changed files with 97 additions and 17 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,4 +1,3 @@
-Type: Package
 Package: tmap
 Title: Thematic Maps
 Version: 3.99.9000
@@ -26,7 +25,7 @@ Depends:
     R (>= 3.5.0)
 Imports:
     classInt (>= 0.4-3),
-    cols4all (>= 0.6-1),
+    cols4all (>= 0.7),
     data.table,
     grid,
     htmltools,
@@ -48,7 +47,6 @@ Suggests:
     av,
     cartogram,
     colorspace,
-    covr,
     dplyr,
     ggplot2,
     gifski,
@@ -64,9 +62,6 @@ Suggests:
     tidyr
 VignetteBuilder: 
     knitr
-Remotes: 
-    mtennekes/cols4all,
-    r-tmap/tmaptools
 Config/Needs/check: Nowosad/spDataLarge, lwgeom
 Config/Needs/coverage: Nowosad/spDataLarge, lwgeom
 Config/testthat/edition: 3

diff --git a/NAMESPACE b/NAMESPACE
@@ -119,6 +119,7 @@ export(make_by_vars)
 export(marker_icon)
 export(providers)
 export(qtm)
+export(renderTmap)
 export(shapeTM)
 export(theme_ps)
 export(tm_add_legend)
@@ -176,7 +177,9 @@ export(tm_pos_auto_out)
 export(tm_pos_in)
 export(tm_pos_out)
 export(tm_raster)
+export(tm_remove_layer)
 export(tm_rgb)
+export(tm_rgba)
 export(tm_scale)
 export(tm_scale_bar)
 export(tm_scale_bivariate)
@@ -207,6 +210,8 @@ export(tm_ylab)
 export(tmapAddLayerOptions)
 export(tmapGetShapeMeta1)
 export(tmapGetShapeMeta2)
+export(tmapOutput)
+export(tmapProxy)
 export(tmapShape)
 export(tmapSplitShp)
 export(tmapSubsetShp)
@@ -217,6 +222,7 @@ export(tmap_devel_mode)
 export(tmap_format)
 export(tmap_format_add)
 export(tmap_grid)
+export(tmap_grob)
 export(tmap_icons)
 export(tmap_last)
 export(tmap_leaflet)
@@ -228,6 +234,9 @@ export(tmap_options_reset)
 export(tmap_options_save)
 export(tmap_save)
 export(tmap_style)
+export(tmap_style_catalog)
+export(tmap_style_catalogue)
+export(tmap_tip)
 export(ttm)
 export(ttmp)
 import(classInt)

diff --git a/R/v4-not-implemented.R b/R/v4-not-implemented.R
@@ -1,7 +1,8 @@
 #' These functions will be implemented soon
 #' @export
+#' @param ... Arguments
 #' @name v4-not-yet
-tm_squares <- function() {
+tm_squares <- function(...) {
 	stop("Not yet implemented in v4")
 }
 #' @export
@@ -16,11 +17,57 @@ tm_markers <- function() {
 }
 #' @export
 #' @rdname v4-not-yet
-tm_logo <- function() {
+tm_logo <- function(...) {
 	stop("Not yet implemented in v4")
 }
 #' @export
 #' @rdname v4-not-yet
 tm_minimap <- function() {
   stop("Not yet implemented in v4")
+}
+#' @export
+#' @rdname v4-not-yet
+tmap_grob <- function(...) {
+	stop("Not yet implemented in v4")
+}
+#' @export
+#' @rdname v4-not-yet
+tmapOutput <- function(...) {
+	stop("Not yet implemented in v4")
+}
+#' @export
+#' @rdname v4-not-yet
+tmapProxy <- function(...) {
+	stop("Not yet implemented in v4")
+}
+#' @export
+#' @rdname v4-not-yet
+renderTmap <- function(...) {
+	stop("Not yet implemented in v4")
+}
+#' @export
+#' @rdname v4-not-yet
+tm_remove_layer <- function(...) {
+	stop("Not yet implemented in v4")
+}
+#' @export
+#' @rdname v4-not-yet
+tm_rgba <- function(...) {
+	.Deprecated(new = "tm_rgb()")
+	stop("Not yet implemented in v4")
+}
+#' @export
+#' @rdname v4-not-yet
+tmap_tip <- function(...) {
+	stop("Not yet implemented in v4")
+}
+#' @export
+#' @rdname v4-not-yet
+tmap_style_catalog <- function(...) {
+	stop("Not yet implemented in v4")
+}
+#' @export
+#' @rdname v4-not-yet
+tmap_style_catalogue <- function(...) {
+	stop("Not yet implemented in v4")
 }
diff --git a/README.md b/README.md
@@ -61,7 +61,6 @@ In order to use the development version of `tmap`, it is recommended to use the
 
 ```r
 # install.packages("remotes")
-install_github("r-tmap/tmaptools")
 install_github("r-tmap/tmap")
 
 # On Linux, with pak

diff --git a/man/v4-not-yet.Rd b/man/v4-not-yet.Rd
diff --git a/tests/testing_aux_layers.Rmd b/tests/testing_aux_layers.Rmd
@@ -31,7 +31,7 @@ metro$pop2020_class = cut(metro$pop2020, breaks = c(.5, 1.5, 2.5, 5, 15, 40) * 1
 
 
 Africa = World[World$continent == "Africa", ]
-tmapV = substr(packageVersion("tmap"), 1, 1)
+tmapV =  ifelse(packageVersion("tmap") >= "3.4", "4", "3")
 txt = function(x) print(grid::grid.text(x, gp = gpar(cex = 3)))
 v3 = function(e) {
 	if (tmapV == "3") {

diff --git a/tests/testing_facet_vars.Rmd b/tests/testing_facet_vars.Rmd
@@ -61,7 +61,7 @@ weather2 = split(weather1, 'time')
 
 
 
-tmapV = substr(packageVersion("tmap"), 1, 1)
+tmapV =  ifelse(packageVersion("tmap") >= "3.4", "4", "3")
 txt = function(x) print(grid::grid.text(x, gp = gpar(cex = 3)))
 v3 = function(e) {
 	if (tmapV == "3") {

diff --git a/tests/testing_facetting.Rmd b/tests/testing_facetting.Rmd
@@ -31,7 +31,7 @@ metro$pop2020_class = cut(metro$pop2020, breaks = c(.5, 1.5, 2.5, 5, 15, 40) * 1
 
 
 Africa = World[World$continent == "Africa", ]
-tmapV = substr(packageVersion("tmap"), 1, 1)
+tmapV =  ifelse(packageVersion("tmap") >= "3.4", "4", "3")
 txt = function(x) print(grid::grid.text(x, gp = gpar(cex = 3)))
 v3 = function(e) {
 	if (tmapV == "3") {

diff --git a/tests/testing_legends.Rmd b/tests/testing_legends.Rmd
@@ -29,7 +29,7 @@ metro$pop2020_class = cut(metro$pop2020, breaks = c(.5, 1.5, 2.5, 5, 15, 40) * 1
 
 
 Africa = World[World$continent == "Africa", ]
-tmapV = substr(packageVersion("tmap"), 1, 1)
+tmapV =  ifelse(packageVersion("tmap") >= "3.4", "4", "3")
 txt = function(x) print(grid::grid.text(x, gp = gpar(cex = 3)))
 v3 = function(e) {
 	if (tmapV == "3") {

diff --git a/tests/testing_scales.Rmd b/tests/testing_scales.Rmd
@@ -29,7 +29,7 @@ metro$pop2020_class = cut(metro$pop2020, breaks = c(.5, 1.5, 2.5, 5, 15, 40) * 1
 
 
 Africa = World[World$continent == "Africa", ]
-tmapV = substr(packageVersion("tmap"), 1, 1)
+tmapV =  ifelse(packageVersion("tmap") >= "3.4", "4", "3")
 txt = function(x) print(grid::grid.text(x, gp = gpar(cex = 3)))
 v3 = function(e) {
 	if (tmapV == "3") {

diff --git a/tests/testing_stars.Rmd b/tests/testing_stars.Rmd
@@ -41,7 +41,7 @@ weather1 = st_set_dimensions(merge(weather), names = c('longitude','latitude','t
 weather2 = split(weather1, 'time')
 
 
-tmapV = substr(packageVersion("tmap"), 1, 1)
+tmapV = ifelse(packageVersion("tmap") >= "3.4", "4", "3")
 txt = function(x) print(grid::grid.text(x, gp = gpar(cex = 3)))
 v3 = function(e) {
 	if (tmapV == "3") {