From 81036a1f9cf73809929deff5dc01011cf1228790 Mon Sep 17 00:00:00 2001 From: olivroy Date: Tue, 17 Dec 2024 09:42:55 -0500 Subject: [PATCH 1/2] fix messages --- R/messages.R | 4 ++-- R/tm_layers_polygons.R | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/R/messages.R b/R/messages.R index ffe4430ed..b46b3f598 100644 --- a/R/messages.R +++ b/R/messages.R @@ -119,12 +119,12 @@ message_webgl_checks = function(checks, checkif) { message_qtm_empty = function() { cli::cli_inform( - "{.field [qtm]} nothing to show. Either specify {.arg shp} or {.arg basemap}. Alternatively, switch to view mode with {.code tmap_mode(\"view\")}" + "{.field [qtm()]} nothing to show. Either specify {.arg shp} or {.arg basemap}. Alternatively, switch to view mode with {.code tmap_mode(\"view\")}" ) } message_layer_unused_args = function(layer_fun, args) { cli::cli_inform(c( - "{.field [{layer_fun}]} Argument{ifelse(length(args)>1, 's', '')} {.arg {args}} unknown." + "{.field [{layer_fun}()]} Argument{ifelse(length(args)>1, 's', '')} {.arg {args}} unknown." )) } diff --git a/R/tm_layers_polygons.R b/R/tm_layers_polygons.R index 0093b68f6..691e8efe6 100644 --- a/R/tm_layers_polygons.R +++ b/R/tm_layers_polygons.R @@ -260,7 +260,7 @@ tm_polygons = function(fill = tm_const(), } # unused arguments: typos? - unused = setdiff(names(args), v3_only("tm_polygons")) + unused = setdiff(names(args), c(v3_only("tm_polygons"), "called_from")) if (length(unused)) { message_layer_unused_args(layer_fun, unused) From 484751158353e021aa54ccf719c6e51e2489c249 Mon Sep 17 00:00:00 2001 From: olivroy Date: Tue, 17 Dec 2024 09:57:26 -0500 Subject: [PATCH 2/2] apply fix everywhere --- R/tm_layers_lines.R | 2 +- R/tm_layers_raster.R | 2 +- R/tm_layers_rgb.R | 2 +- R/tm_layers_symbols.R | 2 +- R/tm_layers_text.R | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/R/tm_layers_lines.R b/R/tm_layers_lines.R index df65900b4..388e5367a 100644 --- a/R/tm_layers_lines.R +++ b/R/tm_layers_lines.R @@ -217,7 +217,7 @@ tm_lines = function(col = tm_const(), } # unused arguments: typos? - unused = setdiff(names(args), v3_only("tm_lines")) + unused = setdiff(names(args), c(v3_only("tm_lines"), "called_from")) if (length(unused)) { message_layer_unused_args(layer_fun, unused) diff --git a/R/tm_layers_raster.R b/R/tm_layers_raster.R index 0b47a2fc6..8a94eb91f 100644 --- a/R/tm_layers_raster.R +++ b/R/tm_layers_raster.R @@ -166,7 +166,7 @@ tm_raster = function(col = tm_vars(), } # unused arguments: typos? - unused = setdiff(names(args), v3_only("tm_raster")) + unused = setdiff(names(args), c(v3_only("tm_raster"), "called_from")) if (length(unused)) { message_layer_unused_args(layer_fun, unused) diff --git a/R/tm_layers_rgb.R b/R/tm_layers_rgb.R index 501a192eb..532e41706 100644 --- a/R/tm_layers_rgb.R +++ b/R/tm_layers_rgb.R @@ -47,7 +47,7 @@ tm_rgb = function(col = tm_vars(n = 3, multivariate = TRUE), } # unused arguments: typos? - unused = setdiff(names(args), v3_only("tm_rgb")) + unused = setdiff(names(args), c(v3_only("tm_rgb"), "called_from")) if (length(unused)) { message_layer_unused_args(layer_fun, unused) diff --git a/R/tm_layers_symbols.R b/R/tm_layers_symbols.R index c8ffe3d7e..f6ae7cedc 100644 --- a/R/tm_layers_symbols.R +++ b/R/tm_layers_symbols.R @@ -127,7 +127,7 @@ tm_symbols = function(size = tm_const(), } # unused arguments: typos? - unused = setdiff(names(args), v3_only("tm_symbols")) + unused = setdiff(names(args), c(v3_only("tm_symbols"), "called_from")) if (length(unused)) { layer_fun = if ("called_from" %in% names(args)) { diff --git a/R/tm_layers_text.R b/R/tm_layers_text.R index af2a51a5f..0de628d18 100644 --- a/R/tm_layers_text.R +++ b/R/tm_layers_text.R @@ -249,7 +249,7 @@ tm_text = function(text = tm_const(), } # unused arguments: typos? - unused = setdiff(names(args), v3_only("tm_text")) + unused = setdiff(names(args), c(v3_only("tm_text"), "called_from")) if (length(unused)) { message_layer_unused_args(layer_fun, unused)