moved composition to tmap.glyphs

r-tmap · Jun 18, 2024 · d133496 · d133496
1 parent 2d6d261
commit d133496
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 127 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -207,7 +207,6 @@ export(tm_scale_asis)
 export(tm_scale_bar)
 export(tm_scale_bivariate)
 export(tm_scale_categorical)
-export(tm_scale_composition)
 export(tm_scale_continuous)
 export(tm_scale_continuous_log)
 export(tm_scale_continuous_log10)

diff --git a/R/tm_scale_composition.R b/R/tm_scale_composition.R
diff --git a/R/tmapLeafletLegend.R b/R/tmapLeafletLegend.R
@@ -84,7 +84,6 @@ make_equal_list = function(x) {
 
 
 tmapLeaflet_legend = function(cmp, lf, o, orientation) {
-
 	group = "tmp" # TODO
 	leg_className = paste("info legend", gsub(" ", "", group, fixed = TRUE))
 	layerId =  paste0("legend", sprintf("%02d", .TMAP_LEAFLET$leg_id)) # "legend401" #todo

diff --git a/R/tmapScaleComposition.R b/R/tmapScaleComposition.R
diff --git a/R/tmapScale_.R b/R/tmapScale_.R
@@ -189,7 +189,8 @@ tmapScaleAuto = function(x1, scale, legend, chart, o, aes, layer, layer_args, so
 	if (k == 2) {
 		sc = "bivariate"
 	} else if (k > 2) {
-		sc = "composition"
+		stop("No default scale for multivariate variables", call. = FALSE)
+		#sc = "composition"
 	} else if (cls[1] == "asis") {
 		sc = "asis"	
 	} else if (attr(cls, "unique") && !(sc_opt == "asis")) {