#994

r-tmap · Dec 18, 2024 · 900f33d · 900f33d
1 parent 00ecab7
commit 900f33d
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 8 deletions.
diff --git a/R/step1_rearrange.R b/R/step1_rearrange.R
@@ -341,6 +341,26 @@ get_class = function(tms) {
 	class(tms$shp)
 }
 
+str2pos = function(x) {
+	if (length(x) == 1L) {
+		if (tolower(x) %in% c("left", "right")) {
+			args = list(pos.h = x)
+		} else if (tolower(x) %in% c("top", "bottom")) {
+			args = list(pos.v = x)
+		} else if (tolower(x) %in% c("center", "centre")) {
+			args = list(pos.h = "center", pos.v = "center")
+		} else {
+			stop("position: incorrect specification")
+		}
+	}
+	do.call(tm_pos_in, args)
+}
+
+num2pos = function(x) {
+	if (length(x) == 1L) stop("position: please provide two values: the horizontal and the vertical")
+	tm_pos_in(x[1], x[2])
+}
+
 process_position = function(position, o) {
 	if (is.null(position)) return(NULL)
 

diff --git a/R/tm_pos.R b/R/tm_pos.R
@@ -161,10 +161,4 @@ tm_pos_auto_in = function(align.h, align.v, just.h, just.v) {
 	structure(args, class = "tm_pos")
 }
 
-str2pos = function(x) {
-	tm_pos_in(x[1], x[2])
-}
 
-num2pos = function(x) {
-	tm_pos_in(x[1], x[2])
-}
diff --git a/R/tmapGridComp.R b/R/tmapGridComp.R
@@ -238,7 +238,9 @@ tmapGridComp = function(comp, o, facet_row = NULL, facet_col = NULL, facet_page,
 	n = length(comp)
 	# rows and cols in main grid
 	rows = if (facet_row[1] == -2) g$meta_rows[1] else if (facet_row[1] == -1) g$meta_rows[2] else {
-		panel_rows = if (o$panel.type == "xtab") {
+		panel_rows = if (class == "in") {
+			NULL
+		} else if (o$panel.type == "xtab") {
 			c(g$cols_panel_row_id, g$rows_panel_row_ids)
 		} else if (o$panel.type == "wrap") {
 			g$rows_panel_ids[facet_row]
@@ -248,7 +250,9 @@ tmapGridComp = function(comp, o, facet_row = NULL, facet_col = NULL, facet_page,
 		c(g$rows_facet_ids[facet_row], panel_rows)
 	}
 	cols = if (facet_col[1] == -2) g$meta_cols[1] else if (facet_col[1] == -1) g$meta_cols[2] else {
-		panel_cols = if (o$panel.type == "xtab") {
+		panel_cols = if (class == "in") {
+			NULL
+		} else if (o$panel.type == "xtab") {
 			c(g$cols_panel_col_ids, g$rows_panel_col_id)
 		} else if (o$panel.type == "wrap") {
 			g$cols_panel_ids[facet_col]