Merge branch 'master' into doc

r-tmap · Feb 6, 2024 · 957b0c1 · 957b0c1
2 parents ac180d7 + 4bf91df
commit 957b0c1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/R/tmapGridAux.R b/R/tmapGridAux.R
@@ -77,7 +77,7 @@ tmapGridTilesPrep = function(a, bs, id, o) {
  }
 
  ss = lapply(xs, function(x) {
- if (is.null(x)) NULL else do.call(tmapShape, list(shp = x, is.main = FALSE, crs = crs, bbox = NULL, unit=NULL, filter=NULL, shp_name = "x", smeta = list(), o = o))
+ if (is.null(x)) NULL else do.call(tmapShape, list(shp = x, is.main = FALSE, crs = crs, bbox = NULL, unit=NULL, filter=NULL, shp_name = "x", smeta = list(), o = o, tmf = NULL))
  })
 
  srgb = tm_scale_rgb(maxValue = 255, value.na = "#FFFFFF")

diff --git a/R/tmapShape.R b/R/tmapShape.R
@@ -133,8 +133,10 @@ tmapShape.SpatRaster = function(shp, is.main, crs, bbox, unit, filter, shp_name,
 
  names(ctabs) = dtcols
  names(cats) = dtcols
- # tmf not defined?
- make_by_vars(dt, tmf, smeta)
+
+
+ if (!is.null(tmf)) make_by_vars(dt, tmf, smeta)
+
 
  if (is.null(filter)) filter = rep(TRUE, nrow(dt))
  dt[, ':='(sel__ = filter)] # tmapID__ = 1L:nrow(dt),