Merge branch 'main' into boxplot_key

Author: teunbrand

.github/workflows/R-CMD-check.yaml

@@ -62,11 +62,8 @@ jobs:
           cache-version: 2
           extra-packages: >
             any::rcmdcheck,
-            maps=?ignore-before-r=3.5.0,
             Hmisc=?ignore-before-r=3.6.0,
-            mapproj=?ignore-before-r=3.5.0,
-            multcomp=?ignore-before-r=3.5.0,
-            quantreg=?ignore-before-r=3.5.0,
+            quantreg=?ignore-before-r=3.6.0,
           needs: check
 
       - uses: r-lib/actions/check-r-package@v2

NEWS.md

@@ -2,11 +2,15 @@
 
 * Fixed misbehaviour of `draw_key_boxplot()` and `draw_key_crossbar()` with 
   skewed key aspect ratio (@teunbrand, #5082).
+* Fixed a regression in `geom_hex()` where aesthetics were replicated across 
+  bins (@thomasp85, #5037 and #5044)
 * Fixed spurious warning when `weight` aesthetic was used in `stat_smooth()` 
   (@teunbrand based on @clauswilke's suggestion, #5053).
 * The `lwd` alias now correctly replaced by `linewidth` instead of `size` 
   (@teunbrand based on @clauswilke's suggestion #5051).
-
+* Fixed a regression in `Coord$train_panel_guides()` where names of guides were 
+  dropped (@maxsutton, #5063)
+  
 # ggplot2 3.4.0
 This is a minor release focusing on tightening up the internals and ironing out
 some inconsistencies in the API. The biggest change is the addition of the 

R/coord-.r

@@ -158,9 +158,11 @@ Coord <- ggproto("Coord",
 
   train_panel_guides = function(self, panel_params, layers, default_mapping, params = list()) {
     aesthetics <- c("x", "y", "x.sec", "y.sec")
-    names(aesthetics) <- aesthetics
+
     # If the panel_params doesn't contain the scale, there's no guide for the aesthetic
     aesthetics <- intersect(aesthetics, names(panel_params$guides))
+    
+    names(aesthetics) <- aesthetics
 
     panel_params$guides <- lapply(aesthetics, function(aesthetic) {
       axis <- substr(aesthetic, 1, 1)

R/geom-hex.r

@@ -80,19 +80,19 @@ GeomHex <- ggproto("GeomHex", Geom,
 
     n <- nrow(data)
 
-    data <- data[rep(seq_len(n), each = 6), ]
-    data$x <- rep.int(hexC$x, n) + data$x
-    data$y <- rep.int(hexC$y, n) + data$y
+    hexdata <- data[rep(seq_len(n), each = 6), c("x", "y")]
+    hexdata$x <- rep.int(hexC$x, n) + hexdata$x
+    hexdata$y <- rep.int(hexC$y, n) + hexdata$y
 
-    coords <- coord$transform(data, panel_params)
+    coords <- coord$transform(hexdata, panel_params)
 
     ggname("geom_hex", polygonGrob(
       coords$x, coords$y,
       gp = gpar(
-        col = coords$colour,
-        fill = alpha(coords$fill, coords$alpha),
-        lwd = coords$linewidth * .pt,
-        lty = coords$linetype,
+        col = data$colour,
+        fill = alpha(data$fill, data$alpha),
+        lwd = data$linewidth * .pt,
+        lty = data$linetype,
         lineend = lineend,
         linejoin = linejoin,
         linemitre = linemitre

R/save.r

@@ -147,8 +147,24 @@ plot_dim <- function(dim = c(NA, NA), scale = 1, units = "in",
   }
 
   if (limitsize && any(dim >= 50)) {
+    units <- switch(
+      units,
+      "in" = "inches",
+      "cm" = "centimeters",
+      "mm" = "millimeters",
+      "px" = "pixels"
+    )
+    msg <- paste0(
+      "Dimensions exceed 50 inches ({.arg height} and {.arg width} are ",
+      "specified in {.emph {units}}"
+    )
+    if (units == "pixels") {
+      msg <- paste0(msg, ").")
+    } else {
+      msg <- paste0(msg, " not pixels).")
+    }
     cli::cli_abort(c(
-      "Dimensions exceed 50 inches ({.arg height} and {.arg width} are specified in {.emph {units}} not pixels).",
+      msg,
       "i" = "If you're sure you want a plot that big, use {.code limitsize = FALSE}.
     "), call = call)
   }

R/scale-date.r

@@ -15,10 +15,13 @@
 #'   - A function that takes the limits as input and returns breaks as output
 #' @param date_breaks A string giving the distance between breaks like "2
 #'   weeks", or "10 years". If both `breaks` and `date_breaks` are
-#'   specified, `date_breaks` wins.
+#'   specified, `date_breaks` wins. Valid specifications are 'sec', 'min',
+#'   'hour', 'day', 'week', 'month' or 'year', optionally followed by 's'.
 #' @param date_minor_breaks A string giving the distance between minor breaks
 #'   like "2 weeks", or "10 years". If both `minor_breaks` and
-#'   `date_minor_breaks` are specified, `date_minor_breaks` wins.
+#'   `date_minor_breaks` are specified, `date_minor_breaks` wins. Valid
+#'   specifications are 'sec', 'min', 'hour', 'day', 'week', 'month' or 'year',
+#'   optionally followed by 's'.
 #' @param minor_breaks One of:
 #'   - `NULL` for no breaks
 #'   - `waiver()` for the breaks specified by `date_minor_breaks`
@@ -282,14 +285,14 @@ datetime_scale <- function(aesthetics, trans, palette,
 
 
   # Backward compatibility
-  if (is.character(breaks)) breaks <- date_breaks(breaks)
-  if (is.character(minor_breaks)) minor_breaks <- date_breaks(minor_breaks)
+  if (is.character(breaks)) breaks <- breaks_width(breaks)
+  if (is.character(minor_breaks)) minor_breaks <- breaks_width(minor_breaks)
 
   if (!is.waive(date_breaks)) {
-    breaks <- date_breaks(date_breaks)
+    breaks <- breaks_width(date_breaks)
   }
   if (!is.waive(date_minor_breaks)) {
-    minor_breaks <- date_breaks(date_minor_breaks)
+    minor_breaks <- breaks_width(date_minor_breaks)
   }
   if (!is.waive(date_labels)) {
     labels <- function(self, x) {