Merge remote-tracking branch 'upstream/master' into sec_scale

Author: dpseidel

DESCRIPTION

@@ -164,6 +164,7 @@ Collate:
     'layout.R'
     'limits.r'
     'margins.R'
+    'performance.R'
     'plot-build.r'
     'plot-construction.r'
     'plot-last.r'
@@ -243,6 +244,6 @@ Collate:
     'zxx.r'
     'zzz.r'
 VignetteBuilder: knitr
-RoxygenNote: 6.1.0
+RoxygenNote: 6.1.1
 Roxygen: list(markdown = TRUE)
 Encoding: UTF-8

NAMESPACE

@@ -180,6 +180,7 @@ export(GeomText)
 export(GeomTile)
 export(GeomViolin)
 export(GeomVline)
+export(LayerSf)
 export(Layout)
 export(Position)
 export(PositionDodge)

NEWS.md

@@ -1,13 +1,21 @@
 # ggplot2 3.1.0.9000
 
-*   `geom_rug()` now works with `coord_flip()` (@has2k1, #2987).
+* `geom_rug()` now works with `coord_flip()` (@has2k1, #2987).
+
+* Layers now have a new member function `setup_layer()` which is called at the
+  very beginning of the plot building process and which has access to the original
+  input data and the plot object being built. This function allows the creation of
+  custom layers that autogenerate aesthetic mappings based on the input data or that
+  filter the input data in some form. One example is the new `LayerSf` class which
+  locates the geometry column in sf objects and sets up an aesthetic mapping for it
+  (@clauswilke, #2872).
 
 * Default labels are now generated more consistently; e.g., symbols no longer
   get backticks, and long expressions are abbreviated with `...`
   (@yutannihilation, #2981).
 
 * Aesthetic mappings now accept functions that return `NULL` (@yutannihilation,
-  #2997)
+  #2997).
 
 * Closed arrows in `element_line()` are now filled (@yutannihilation, #2924).
 

R/annotation-custom.r

@@ -74,7 +74,7 @@ GeomCustomAnn <- ggproto("GeomCustomAnn", Geom,
       stop("annotation_custom only works with Cartesian coordinates",
         call. = FALSE)
     }
-    corners <- data.frame(x = c(xmin, xmax), y = c(ymin, ymax))
+    corners <- new_data_frame(list(x = c(xmin, xmax), y = c(ymin, ymax)), n = 2)
     data <- coord$transform(corners, panel_params)
 
     x_rng <- range(data$x, na.rm = TRUE)

R/annotation-logticks.r

@@ -238,7 +238,7 @@ calc_logticks <- function(base = 10, ticks_per_base = base - 1,
   longtick_after_base <- floor(ticks_per_base/2)
   tickend[ cycleIdx == longtick_after_base ] <- midend
 
-  tickdf <- data.frame(value = ticks, start = start, end = tickend)
+  tickdf <- new_data_frame(list(value = ticks, start = start, end = tickend), n = length(ticks))
 
   return(tickdf)
 }

R/annotation-raster.r

@@ -76,7 +76,7 @@ GeomRasterAnn <- ggproto("GeomRasterAnn", Geom,
       stop("annotation_raster only works with Cartesian coordinates",
         call. = FALSE)
     }
-    corners <- data.frame(x = c(xmin, xmax), y = c(ymin, ymax))
+    corners <- new_data_frame(list(x = c(xmin, xmax), y = c(ymin, ymax)), n = 2)
     data <- coord$transform(corners, panel_params)
 
     x_rng <- range(data$x, na.rm = TRUE)

R/annotation.r

@@ -54,7 +54,7 @@ annotate <- function(geom, x = NULL, y = NULL, xmin = NULL, xmax = NULL,
     stop("Unequal parameter lengths: ", details, call. = FALSE)
   }
 
-  data <- data.frame(position)
+  data <- new_data_frame(position, n = max(lengths))
   layer(
     geom = geom,
     params = list(

R/axis-secondary.R

@@ -140,7 +140,7 @@ AxisSecondary <- ggproto("AxisSecondary", NULL,
   },
 
   transform_range = function(self, range) {
-    range <- structure(data.frame(range), names = '.')
+    range <- new_data_frame(list(. = range))
     rlang::eval_tidy(
       rlang::f_rhs(self$trans),
       data = range,

R/bench.r

@@ -23,7 +23,7 @@ benchplot <- function(x) {
 
   times <- rbind(construct, build, render, draw)[, 1:3]
 
-  plyr::unrowname(data.frame(
+  plyr::unrowname(base::data.frame(
     step = c("construct", "build", "render", "draw", "TOTAL"),
     rbind(times, colSums(times))))
 }

R/bin.R

@@ -157,15 +157,14 @@ bin_out <- function(count = integer(0), x = numeric(0), width = numeric(0),
   xmin = x - width / 2, xmax = x + width / 2) {
   density <- count / width / sum(abs(count))
 
-  data.frame(
+  new_data_frame(list(
     count = count,
     x = x,
     xmin = xmin,
     xmax = xmax,
     width = width,
     density = density,
     ncount = count / max(abs(count)),
-    ndensity = density / max(abs(density)),
-    stringsAsFactors = FALSE
-  )
+    ndensity = density / max(abs(density))
+  ), n = length(count))
 }