done #724

r-tmap · Oct 19, 2023 · 83490d8 · 83490d8
1 parent 3783bbb
commit 83490d8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/R/step1_helper_facets.R b/R/step1_helper_facets.R
@@ -163,7 +163,7 @@ step1_rearrange_facets = function(tmo, o) {
 				} else if (identical(popup.vars, FALSE)) {
 					popup.vars = character(0)
 				} else if (is.na(popup.vars[1])) {
-					popup.vars = get("used_vars", envir = .TMAP)
+					popup.vars = setdiff(get("used_vars", envir = .TMAP), c("AREA", "LENGTH", "MAP_COLORS"))
 					if (!length(popup.vars)) popup.vars = smeta$vars
 				}
 				popup.format = process_label_format(popup.format, o$label.format)

diff --git a/R/tmapSubsetShp.R b/R/tmapSubsetShp.R
@@ -64,7 +64,7 @@ tmapSubsetShp.sf = function(shp, vars) {
 		shp$LENGTH = sf::st_length(shp)
 	}
 	if ("MAP_COLORS" %in% vars) {
-		shp$MAP_COLORS = tmaptools::map_coloring(shp)
+		shp$MAP_COLORS = as.factor(tmaptools::map_coloring(shp))
 	}
 	if (!length(vars)) {
 		vars = "dummy__"