Fixes for submission

hafen · Nov 29, 2023 · 6e8bc63 · 6e8bc63
1 parent debae68
commit 6e8bc63
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/R/facet_geo.R b/R/facet_geo.R
@@ -173,14 +173,15 @@ plot.facet_geo <- function(x, ...) {
 #' @param x a data frame containing a grid
 #' @param label the column name in \code{x} that should be used for text labels in the grid plot
 #' @param label_raw the column name in the optional SpatialPolygonsDataFrame attached to \code{x} that should be used for text labels in the raw geography plot
+#' @param do_plot should the grid preview be plotted?
 #' @export
 #' @importFrom ggplot2 ggplot geom_rect geom_text aes xlim ylim
 #' @importFrom gridExtra grid.arrange
 #' @importFrom rlang .data
 #' @examples
 #' grid_preview(us_state_grid2)
 #' grid_preview(eu_grid1, label = "name")
-grid_preview <- function(x, label = NULL, label_raw = NULL) {
+grid_preview <- function(x, label = NULL, label_raw = NULL, do_plot = TRUE) {
 
   if (!inherits(x, "geofacet_grid"))
     x <- get_grid(x)
@@ -221,7 +222,8 @@ grid_preview <- function(x, label = NULL, label_raw = NULL) {
     p2 <- plot_geo_raw(spdf, label = label_raw)
     p <- gridExtra::grid.arrange(p2, p, nrow = 1)
   } else {
-    suppressWarnings(plot(p))
+    if (do_plot)
+      plot(p)
   }
   invisible(p)
 }

diff --git a/man/grid_preview.Rd b/man/grid_preview.Rd
diff --git a/tests/testthat/test-grids.R b/tests/testthat/test-grids.R
@@ -4,5 +4,5 @@ library(ggplot2)
 
 test_that("grids all load and work correctly", {
   for (grd in .valid_grids)
-    expect_no_error(grid_preview(grd))
+    expect_no_error(prv <- grid_preview(grd, do_plot = FALSE))
 })