Merge branch 'main' into issue-5647-geom-function-nodata-xaxis-title

Author: thomasp85

NEWS.md

@@ -1,8 +1,9 @@
 # ggplot2 (development version)
 
 * Fixed bug in `stat_function()` so x-axis title now produced automatically 
-  when no data added. 
-  (@phispu, #5647).
+  when no data added. (@phispu, #5647).
+* geom_sf now accepts shape names (@sierrajohnson, #5808)
+* Added `gg` class to `labs()` (@phispu, #5553).
 * Missing values from discrete palettes are no longer translated 
   (@teunbrand, #5929).
 * Fixed bug in `facet_grid(margins = TRUE)` when using expresssions 

R/geom-sf.R

@@ -200,6 +200,9 @@ GeomSf <- ggproto("GeomSf", Geom,
     if (!inherits(coord, "CoordSf")) {
       cli::cli_abort("{.fn {snake_class(self)}} can only be used with {.fn coord_sf}.")
     }
+    if (is.character(data$shape)) {
+      data$shape <- translate_shape_string(data$shape)
+    }
 
     data <- coord$transform(data, panel_params)
 

R/labeller.R

@@ -323,7 +323,7 @@ as_labeller <- function(x, default = label_value, multi_line = TRUE) {
 #'
 #' This function makes it easy to assign different labellers to
 #' different factors. The labeller can be a function or it can be a
-#' named character vectors that will serve as a lookup table.
+#' named character vector that will serve as a lookup table.
 #'
 #' In case of functions, if the labeller has class `labeller`, it
 #' is directly applied on the data frame of labels. Otherwise, it is

R/labels.R

@@ -139,7 +139,7 @@ labs <- function(..., title = waiver(), subtitle = waiver(), caption = waiver(),
   args <- args[!duplicated(names(args))]
   args <- rename_aes(args)
 
-  structure(args, class = "labels")
+  structure(args, class = c("labels", "gg"))
 }
 
 #' @rdname labs

R/utilities-break.R

@@ -24,6 +24,9 @@
 #' table(cut_width(runif(1000), 0.1, center = 0))
 #' table(cut_width(runif(1000), 0.1, labels = FALSE))
 cut_interval <- function(x, n = NULL, length = NULL, ...) {
+  if ((!is.null(n) && !is.null(length)) || (is.null(n) && is.null(length))) {
+    cli::cli_abort("Specify exactly one of {.var n} and {.var length}.")
+  }
   cut(x, breaks(x, "width", n, length), include.lowest = TRUE, ...)
 }
 

tests/testthat/_snaps/utilities-break.md

@@ -0,0 +1,4 @@
+# cut_interval gives the correct
+
+    Specify exactly one of `n` and `length`.
+

tests/testthat/test-utilities-break.R

@@ -0,0 +1,3 @@
+test_that("cut_interval throws the correct error message", {
+  expect_snapshot_error(cut_interval(x = 1:10, width = 10))
+})