added tm_scale_continuous_sqrt and option component.autoscale

NAMESPACE

@@ -207,6 +207,7 @@ export(tm_scale_categorical)
 export(tm_scale_continuous)
 export(tm_scale_continuous_log)
 export(tm_scale_continuous_log1p)
+export(tm_scale_continuous_sqrt)
 export(tm_scale_discrete)
 export(tm_scale_intervals)
 export(tm_scale_ordinal)

R/misc_trans_data.R

@@ -14,6 +14,14 @@ trans_log = list(
 # domain = c(-Inf, Inf)
 # )
 
+
+trans_sqrt = list(
+ fun = sqrt,
+ rev = function(x) x^2,
+ domain = c(0, Inf)
+)
+
+
 trans_log1p = list(
  fun = log1p,
  rev = expm1,

R/tm_scale_.R

@@ -309,6 +309,13 @@ tm_scale_continuous_log1p = function(...) {
  tm_scale_continuous(trans = "log1p", ...)
 }
 
+#' @export
+#' @rdname tm_scale_continuous
+#' @name tm_scale_continuous_sqrt
+tm_scale_continuous_sqrt = function(...) {
+ tm_scale_continuous(trans = "sqrt", ...)
+}
+
 # 
 # #' @export
 # #' @rdname tm_scale_continuous

R/tmapGridLegend.R

@@ -49,7 +49,14 @@ tmapGridCompCorner = function(comp, o, stack, pos.h, pos.v, maxH, maxW, offsetIn
  scaleH = legHin / maxH
 
  # because of legend frames (for which margins are added in tmapGridLegend), the scale may be a bit above 1, even though automatic layout is applied and there is enough space
- if (any(scaleW > 1.1) || any(scaleH > 1.1)) warning("Some legend items or map compoments do not fit well (e.g. due to the specified font size).", call. = FALSE)
+
+ if (o$component.autoscale) {
+ if (any(scaleW > 1.1) || any(scaleH > 1.1)) message("Some legend items or map compoments do not fit well (e.g. due to the specified font size). They are rescaled Set the tmap option component.autoscale to FALSE to disable this.", call. = FALSE)
+ } else {
+ scaleW[scaleW > 1.1] = 1
+ scaleH[scaleH > 1.1] = 1
+ }
+
 
  clipW = pmax(1, scaleW) 
  clipH = pmax(1, scaleH) 
@@ -77,13 +84,15 @@ tmapGridCompCorner = function(comp, o, stack, pos.h, pos.v, maxH, maxW, offsetIn
  scaleS = sum(legWin) / maxW
  }
 
- if (scaleS > 1.01) {
- if (scaleS > 1.05) {
- message("(Some) components or legends are too ", ifelse(stack == "vertical", "high", "wide"), " and are therefore rescaled.")
+ if (o$component.autoscale) {
+ if (scaleS > 1.01) {
+ if (scaleS > 1.05) {
+ message("(Some) components or legends are too ", ifelse(stack == "vertical", "high", "wide"), " and are therefore rescaled. Set the tmap option component.autoscale to FALSE to disable this.")
+ }
+ legWin = legWin / scaleS
+ legHin = legHin / scaleS
+ clipT = clipT * scaleS
  }
- legWin = legWin / scaleS
- legHin = legHin / scaleS
- clipT = clipT * scaleS
  }
 
  legW = grid::unit(legWin, "inches")

R/tmap_options.R

@@ -129,7 +129,7 @@
  xmod = c(0, 1),
  ymod = c(0, 1),
  angle = c(0, 360)),
- values.range = list(fill = NA, col = NA, size = c(0, 1), lwd = c(0.1, 1),
+ values.range = list(fill = NA, col = NA, size = c(0, 1), lwd = c(0, 1),
  lty = NA, text = NA, fontface = NA, fill_alpha = NA,
  col_alpha = NA, shape = NA, angle = NA), # NA = automatic, NULL is not applicable
  value.neutral = list(size = 0.75,
@@ -275,6 +275,8 @@
  pos.h = "left", pos.v = "top",
  align.h = "left", align.v = "top", just.h = "left", just.v = "top")),
 
+ component.autoscale = TRUE,
+
  # legend 
  legend.show = TRUE,
  legend.design = "standard",