Merge pull request #849 from olivroy/note

Export tm_scale_asis() + wrap examples

NAMESPACE

@@ -186,6 +186,7 @@ export(tm_remove_layer)
 export(tm_rgb)
 export(tm_rgba)
 export(tm_scale)
+export(tm_scale_asis)
 export(tm_scale_bar)
 export(tm_scale_bivariate)
 export(tm_scale_categorical)

R/tm_scale_.R

@@ -32,6 +32,8 @@ tm_scale = function(...) {
  structure(c(list(FUN = "tmapScaleAuto"), list(...)), class = c("tm_scale_auto", "tm_scale", "list"))
 }
 
+#' @export
+#' @rdname tm_scale
 tm_scale_asis = function(...) {
  structure(c(list(FUN = "tmapScaleAsIs"), list(...)), class = c("tm_scale_asis", "tm_scale", "list"))
 }

examples/tm_chart.R

@@ -34,7 +34,9 @@ tm_shape(World) +
  tm_polygons("HPI", 
  fill.scale = tm_scale_intervals(), 
  fill.chart = tm_chart_bar(
- extra.ggplot2 = theme(panel.grid.major.y = element_line(colour = "red")))
+ extra.ggplot2 = theme(
+ panel.grid.major.y = element_line(colour = "red")
+ ))
  )
 
 tm_shape(land) +

examples/tm_text.R

@@ -39,7 +39,7 @@ tm_shape(metro) +
  angle = "upside_down", size.legend = tm_legend_hide())
 
 DE = World[World$name == "Germany",]
-rivers_DE = st_intersection(rivers, DE)
+rivers_DE = sf::st_intersection(rivers, DE)
 
 tm_shape(DE) +
  tm_polygons() +
@@ -58,7 +58,8 @@ tm_shape(metroAfrica) +
  tm_text("name", bgcol = "yellow", remove.overlap = TRUE) +
  tm_dots("red")
 
-# tm_labels uses a labeling algorithm that uses randomization (so rerunning this code may give different outcomes, unless set.seed is used)
+# tm_labels uses a labeling algorithm that uses randomization 
+# (so rerunning this code may give different outcomes, unless set.seed is used)
 tm_shape(metroAfrica) +
  tm_labels("name", bgcol = "yellow") +
  tm_dots("red")