fixed bug (#972), check ok

r-tmap · Dec 3, 2024 · 5713d4e · 5713d4e
1 parent e38c73c
commit 5713d4e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/R/step1_rearrange.R b/R/step1_rearrange.R
@@ -235,7 +235,7 @@ step1_rearrange = function(tmel) {
 			sel_aux
 		})
 		if (all((!sel_aux))) {
-			is_aux = FALSE
+			#is_aux = FALSE
 			aux = list()
 		} else if (any(!sel_aux)) {
 			aux = aux[sel_aux]

diff --git a/R/tm_vars.R b/R/tm_vars.R
@@ -17,7 +17,7 @@ tmapVV = function(x) {
 	if (is.null(x)) {
 		x = structure(list("value.blank"), class = "tmapOption")
 
-	} else if (is.na(x)) {
+	} else if (!is.list(x) && length(x) == 1 && is.na(x)) {
 		x = structure(list("value.const"), class = "tmapOption")
 	}
 

diff --git a/R/tmapGridAux.R b/R/tmapGridAux.R
@@ -13,7 +13,6 @@ tmapGridTilesPrep = function(a, bs, id, o) {
 	g = get("g", envir = .TMAP_GRID)
 	rlang::check_installed("maptiles")
 
-
 	crs = sf::st_crs(bs[[1]])
 
 	isproj = !sf::st_is_longlat(crs)
@@ -364,8 +363,11 @@ tmapGridGridPrep = function(a, bs, id, o) {
 tmapGridTiles = function(bi, bbx, facet_row, facet_col, facet_page, id, pane, group, o) {
 	g = get("g", envir = .TMAP_GRID)
 
-	dt = g$bmaps_dts[[id]][[bi]]
-	shpTM = g$bmaps_shpTHs[[id]][[bi]]
+	# id is on aux level
+	id2 = which(names(g$bmaps_dts) == as.character(id))
+
+	dt = g$bmaps_dts[[id2]][[bi]]
+	shpTM = g$bmaps_shpTHs[[id2]][[bi]]
 	gp = list()
 
 	if (!is.null(dt)) tmapGridRaster(shpTM, dt, gp, bbx, facet_row, facet_col, facet_page, id, pane, group, o, interpolate = FALSE)

diff --git a/man/tm_basemap.Rd b/man/tm_basemap.Rd