done #873

NAMESPACE

@@ -130,6 +130,7 @@ export(opt_tm_lines)
 export(opt_tm_markers)
 export(opt_tm_polygons)
 export(opt_tm_raster)
+export(opt_tm_rgb)
 export(opt_tm_sf)
 export(opt_tm_squares)
 export(opt_tm_symbols)

R/tm_layers_raster.R

@@ -1,9 +1,10 @@
 #' @rdname tm_raster
 #' @name opt_tm_raster
+#' @param interpolate Should the raster image be interpolated? Currently only applicable in view mode (passed on to [`grid`][grid::rasterGrob()])
 #' @export
-opt_tm_raster = function() {
+opt_tm_raster = function(interpolate = FALSE) {
  list(trans.args = list(),
- mapping.args = list())
+ mapping.args = list(interpolate = interpolate))
 }
 
 

R/tm_layers_rgb.R

@@ -1,12 +1,22 @@
+#' @rdname tm_raster
+#' @name opt_tm_rgb
+#' @export
+opt_tm_rgb = function(interpolate = TRUE) {
+ list(trans.args = list(),
+ mapping.args = list(interpolate = interpolate))
+}
+
 #' Map layer: RGB
 #' 
 #' @param col,col.scale,col.legend,col.chart,col.free Visual variable that determines
 #' the col color.
+#' @param options options passed on to the corresponding `opt_<layer_function>` function 
 #' @export
 tm_rgb = function(col = tm_mv(1:3),
  col.scale = tm_scale_rgb(),
  col.legend = tm_legend(),
  col.chart = tm_chart_none(),
- col.free = NA) {
- do.call(tm_raster, args = list(col = col, col.scale = col.scale, col.legend = col.legend, col.chart = col.chart, col.free = col.free))
+ col.free = NA,
+ options = opt_tm_rgb()) {
+ do.call(tm_raster, args = list(col = col, col.scale = col.scale, col.legend = col.legend, col.chart = col.chart, col.free = col.free, options = options))
 }

R/tmapGridRaster.R

@@ -1,4 +1,5 @@
 tmapGridRaster <- function(shpTM, dt, gp, bbx, facet_row, facet_col, facet_page, id, pane, group, o, ...) {
+ args = list(...)
  gts = get("gts", .TMAP_GRID)
  #bbx = get("bbx", .TMAP_GRID)
 
@@ -70,7 +71,7 @@ tmapGridRaster <- function(shpTM, dt, gp, bbx, facet_row, facet_col, facet_page,
  }
  m[is.na(m)] = NA #"#0000FF"
 
- grb = grid::rasterGrob(m, x=cx, y=cy, width=width, height=height, interpolate = FALSE, name = paste0("raster_", id)) #gpl$raster.misc$interpolate
+ grb = grid::rasterGrob(m, x=cx, y=cy, width=width, height=height, interpolate = args$interpolate, name = paste0("raster_", id)) #gpl$raster.misc$interpolate
  gt = grid::addGrob(gts[[facet_page]], grb, gPath = grid::gPath(paste0("gt_facet_", rc_text)))
  gts[[facet_page]] = gt
  assign("gts", gts, envir = .TMAP_GRID)