Merge branch 'master' of https://github.com/r-tmap/tmap

R/qtm.R

@@ -25,6 +25,7 @@
 #'    plain interactive map is shown positioned according to the results of the
 #'    search query (from OpenStreetMap nominatim)
 #' @param fill,col,size,shape,lwd,lty,fill_alpha,col_alpha Visual variables.
+#' @param text,text_col,text_size Visual variables.
 #' @param by data variable name by which the data is split, or a vector of two
 #'   variable names to split the data by two variables (where the first is used
 #'   for the rows and the second for the columns). See also [tm_facets()].

examples/tm_symbols.R

@@ -30,11 +30,12 @@ tm_shape(land) +
 ## plot symbol shapes
 ########################
 
-# create grid of 25 points in the Athlantic
+# create grid of 25 points in the Atlantic
 library(sf)
-x = st_as_sf(cbind(expand.grid(x = -51:-47, y = 20:24), id = seq_len(25)), coords = c("x", "y"), crs = 4326)
+atlantic_grid = cbind(expand.grid(x = -51:-47, y = 20:24), id = seq_len(25))
+x = st_as_sf(atlantic_grid, coords = c("x", "y"), crs = 4326)
 
-tm_shape(x, bbox = bb(x, ext = 1.2)) +
+tm_shape(x, bbox = tmaptools::bb(x, ext = 1.2)) +
 	tm_symbols(shape = "id",
 			   size = 2,
 			   lwd = 2,

tests/testthat/test-v3.R

@@ -2,8 +2,8 @@ test_that("v3 syntax works", {
 	skip_on_cran()
 
 
-	expect_warning(tm_shape(World) + tm_fill("darkolivegreen3") + tm_format("World", title = "A green World"))
-	expect_warning(tm_shape(World) + tm_polygons(fill = "darkolivegreen3", col = NA) + tm_format("World", title = "A green World"))
+	expect_message(tm_shape(World) + tm_fill("darkolivegreen3") + tm_format("World", title = "A green World"))
+	expect_message(tm_shape(World) + tm_polygons(fill = "darkolivegreen3", col = NA) + tm_format("World", title = "A green World"))
 
 
 	# Data variable containing color values