Revert default resolution(), add argument (#5765)

* add `discrete` as argument to `resolution()`

* explicitly declare `discrete`

* add test

* document

* add news bullet

Author: teunbrand

NEWS.md

@@ -17,6 +17,9 @@
 * Patterns and gradients are now also enabled in `geom_sf()` 
   (@teunbrand, #5716).
 * `stat_bin()` deals with non-finite breaks better (@teunbrand, #5665).
+* The default behaviour of `resolution()` has been reverted to pre-3.5.0 
+  behaviour. Whether mapped discrete vectors should be treated as having 
+  resolution of 1 is controlled by the new `discrete` argument.
 * Fixed bug in `guide_bins()` and `guide_coloursteps()` where discrete breaks,
   such as the levels produced by `cut()`, were ordered incorrectly 
   (@teunbrand, #5757).

R/geom-boxplot.R

@@ -189,7 +189,7 @@ GeomBoxplot <- ggproto("GeomBoxplot", Geom,
     data$flipped_aes <- params$flipped_aes
     data <- flip_data(data, params$flipped_aes)
     data$width <- data$width %||%
-      params$width %||% (resolution(data$x, FALSE) * 0.9)
+      params$width %||% (resolution(data$x, FALSE, TRUE) * 0.9)
 
     if (isFALSE(params$outliers)) {
       data$outliers <- NULL

R/geom-dotplot.R

@@ -193,7 +193,7 @@ GeomDotplot <- ggproto("GeomDotplot", Geom,
 
   setup_data = function(data, params) {
     data$width <- data$width %||%
-      params$width %||% (resolution(data$x, FALSE) * 0.9)
+      params$width %||% (resolution(data$x, FALSE, TRUE) * 0.9)
 
     # Set up the stacking function and range
     if (is.null(params$stackdir) || params$stackdir == "up") {

R/geom-errorbar.R

@@ -45,7 +45,7 @@ GeomErrorbar <- ggproto("GeomErrorbar", Geom,
     data$flipped_aes <- params$flipped_aes
     data <- flip_data(data, params$flipped_aes)
     data$width <- data$width %||%
-      params$width %||% (resolution(data$x, FALSE) * 0.9)
+      params$width %||% (resolution(data$x, FALSE, TRUE) * 0.9)
     data <- transform(data,
       xmin = x - width / 2, xmax = x + width / 2, width = NULL
     )

R/geom-errorbarh.R

@@ -60,7 +60,7 @@ GeomErrorbarh <- ggproto("GeomErrorbarh", Geom,
 
   setup_data = function(data, params) {
     data$height <- data$height %||%
-      params$height %||% (resolution(data$y, FALSE) * 0.9)
+      params$height %||% (resolution(data$y, FALSE, TRUE) * 0.9)
 
     transform(data,
       ymin = y - height / 2, ymax = y + height / 2, height = NULL

R/geom-hex.R

@@ -66,15 +66,15 @@ GeomHex <- ggproto("GeomHex", Geom,
     if (!is.null(data$width)) {
       dx <- data$width[1] / 2
     } else {
-      dx <- resolution(data$x, FALSE)
+      dx <- resolution(data$x, FALSE, TRUE)
     }
     # Adjust for difference in width and height of regular hexagon. 1.15 adjusts
     # for the effect of the overlapping range in y-direction on the resolution
     # calculation
     if (!is.null(data$height)) {
       dy <- data$height[1] /  sqrt(3) / 2
     } else {
-      dy <- resolution(data$y, FALSE) / sqrt(3) / 2 * 1.15
+      dy <- resolution(data$y, FALSE, TRUE) / sqrt(3) / 2 * 1.15
     }
 
     hexC <- hexbin::hexcoords(dx, dy, n = 1)

R/geom-raster.R

@@ -94,8 +94,8 @@ GeomRaster <- ggproto("GeomRaster", Geom,
     }
 
     # Convert vector of data to raster
-    x_pos <- as.integer((data$x - min(data$x)) / resolution(unclass(data$x), FALSE))
-    y_pos <- as.integer((data$y - min(data$y)) / resolution(unclass(data$y), FALSE))
+    x_pos <- as.integer((data$x - min(data$x)) / resolution(data$x, FALSE))
+    y_pos <- as.integer((data$y - min(data$y)) / resolution(data$y, FALSE))
 
     data <- coord$transform(data, panel_params)
 

R/geom-tile.R

@@ -109,8 +109,8 @@ GeomTile <- ggproto("GeomTile", GeomRect,
   extra_params = c("na.rm"),
 
   setup_data = function(data, params) {
-    data$width <- data$width %||% params$width %||% resolution(data$x, FALSE)
-    data$height <- data$height %||% params$height %||% resolution(data$y, FALSE)
+    data$width <- data$width %||% params$width %||% resolution(data$x, FALSE, TRUE)
+    data$height <- data$height %||% params$height %||% resolution(data$y, FALSE, TRUE)
 
     transform(data,
       xmin = x - width / 2,  xmax = x + width / 2,  width = NULL,

R/geom-violin.R

@@ -135,7 +135,7 @@ GeomViolin <- ggproto("GeomViolin", Geom,
     data$flipped_aes <- params$flipped_aes
     data <- flip_data(data, params$flipped_aes)
     data$width <- data$width %||%
-      params$width %||% (resolution(data$x, FALSE) * 0.9)
+      params$width %||% (resolution(data$x, FALSE, TRUE) * 0.9)
     # ymin, ymax, xmin, and xmax define the bounding rectangle for each group
     data <- dapply(data, "group", transform,
       xmin = x - width / 2,

R/position-jitter.R

@@ -68,8 +68,8 @@ PositionJitter <- ggproto("PositionJitter", Position,
       seed <- self$seed
     }
     list(
-      width = self$width %||% (resolution(data$x, zero = FALSE) * 0.4),
-      height = self$height %||% (resolution(data$y, zero = FALSE) * 0.4),
+      width = self$width %||% (resolution(data$x, zero = FALSE, TRUE) * 0.4),
+      height = self$height %||% (resolution(data$y, zero = FALSE, TRUE) * 0.4),
       seed = seed
     )
   },