Add non_missing_aes field to Geom.

Call remove_missing systematically. #1304

DESCRIPTION

@@ -97,6 +97,7 @@ Collate:
     'geom-contour.r'
     'geom-count.r'
     'geom-crossbar.r'
+    'geom-segment.r'
     'geom-curve.r'
     'geom-defaults.r'
     'geom-ribbon.r'
@@ -117,7 +118,6 @@ Collate:
     'geom-pointrange.r'
     'geom-quantile.r'
     'geom-rug.r'
-    'geom-segment.r'
     'geom-smooth.r'
     'geom-spoke.r'
     'geom-step.r'

R/geom-.r

@@ -53,14 +53,20 @@ NULL
 #' @export
 Geom <- ggproto("Geom",
   required_aes = character(),
+  non_missing_aes = character(),
 
   default_aes = aes(),
 
   draw_key = draw_key_point,
 
   draw_layer = function(self, data, params, panel, coord) {
-    args <- c(list(quote(data), quote(panel_scales), quote(coord)), params)
+    data <- remove_missing(data, isTRUE(params$na.rm),
+      c(self$required_aes, self$non_missing_aes),
+      snake_class(self)
+    )
+    if (empty(data)) return(list(zeroGrob()))
 
+    args <- c(list(quote(data), quote(panel_scales), quote(coord)), params)
     plyr::dlply(data, "PANEL", function(data) {
       if (empty(data)) return(zeroGrob())
 

R/geom-curve.r

@@ -25,19 +25,13 @@ geom_curve <- function(mapping = NULL, data = NULL, stat = "identity",
 }
 
 #' @rdname ggplot2-ggproto
+#' @include geom-segment.r
 #' @format NULL
 #' @usage NULL
 #' @export
-GeomCurve <- ggproto("GeomCurve", Geom,
+GeomCurve <- ggproto("GeomCurve", GeomSegment,
   draw_panel = function(data, panel_scales, coord, curvature = 0.5, angle = 90,
                         ncp = 5, arrow = NULL, lineend = "butt", na.rm = FALSE) {
-
-    data <- remove_missing(data, na.rm = na.rm,
-                           c("x", "y", "xend", "yend", "linetype", "size", "shape"),
-                           name = "geom_curve")
-
-    if (empty(data)) return(zeroGrob())
-
     if (!coord$is_linear()) {
       warning("geom_curve is not implemented for non-linear coordinates",
         call. = FALSE)
@@ -55,11 +49,5 @@ GeomCurve <- ggproto("GeomCurve", Geom,
         lineend = trans$lineend),
       arrow = arrow
     )
-  },
-
-  required_aes = c("x", "y", "xend", "yend"),
-
-  default_aes = aes(colour = "black", size = 0.5, linetype = 1, alpha = NA),
-
-  draw_key = draw_key_path
+  }
 )

R/geom-dotplot.r

@@ -163,6 +163,11 @@ geom_dotplot <- function(mapping = NULL, data = NULL,
 #' @usage NULL
 #' @export
 GeomDotplot <- ggproto("GeomDotplot", Geom,
+  required_aes = c("x", "y"),
+  non_missing_aes = c("size", "shape"),
+
+  default_aes = aes(colour = "black", fill = "black", alpha = NA),
+
   setup_data = function(data, params) {
     data$width <- data$width %||%
       params$width %||% (resolution(data$x, FALSE) * 0.9)
@@ -238,10 +243,6 @@ GeomDotplot <- ggproto("GeomDotplot", Geom,
   draw_group = function(data, panel_scales, coord, na.rm = FALSE,
                         binaxis = "x", stackdir = "up", stackratio = 1,
                         dotsize = 1, stackgroups = FALSE) {
-
-    data <- remove_missing(data, na.rm, c("x", "y", "size", "shape"), name = "geom_dotplot")
-    if (empty(data)) return(zeroGrob())
-
     if (!coord$is_linear()) {
       warning("geom_dotplot does not work properly with non-linear coordinates.")
     }
@@ -270,10 +271,5 @@ GeomDotplot <- ggproto("GeomDotplot", Geom,
     )
   },
 
-  draw_key = draw_key_dotplot,
-
-  required_aes = c("x", "y"),
-
-  default_aes = aes(colour = "black", fill = "black", alpha = NA)
-
+  draw_key = draw_key_dotplot
 )

R/geom-label.R

@@ -38,11 +38,18 @@ geom_label <- function(mapping = NULL, data = NULL, stat = "identity",
 #' @usage NULL
 #' @export
 GeomLabel <- ggproto("GeomLabel", Geom,
+  required_aes = c("x", "y", "label"),
+
+  default_aes = aes(
+    colour = "black", fill = "white", size = 3.88, angle = 0,
+    hjust = 0.5, vjust = 0.5, alpha = NA, family = "", fontface = 1,
+    lineheight = 1.2
+  ),
+
   draw_panel = function(self, data, panel_scales, coord, parse = FALSE,
                         na.rm = FALSE,
                         label.padding = unit(0.25, "lines"),
                         label.r = unit(0.15, "lines")) {
-    data <- remove_missing(data, na.rm, c("x", "y", "label"), name = "geom_label")
     lab <- data$label
     if (parse) {
       lab <- parse(text = lab)
@@ -82,11 +89,6 @@ GeomLabel <- ggproto("GeomLabel", Geom,
     ggname("geom_label", grobTree(children = grobs))
   },
 
-  required_aes = c("x", "y", "label"),
-
-  default_aes = aes(colour = "black", fill = "white", size = 3.88, angle = 0,
-    hjust = 0.5, vjust = 0.5, alpha = NA, family = "", fontface = 1, lineheight = 1.2),
-
   draw_key = draw_key_label
 )
 

R/geom-point.r

@@ -136,11 +136,14 @@ geom_point <- function(mapping = NULL, data = NULL, stat = "identity",
 #' @usage NULL
 #' @export
 GeomPoint <- ggproto("GeomPoint", Geom,
-  draw_panel = function(data, panel_scales, coord, na.rm = FALSE) {
-    data <- remove_missing(data, na.rm, c("x", "y", "size", "shape"),
-      name = "geom_point")
-    if (empty(data)) return(zeroGrob())
+  required_aes = c("x", "y"),
+  non_missing_aes = c("size", "shape"),
+  default_aes = aes(
+    shape = 19, colour = "black", size = 1.5, fill = NA,
+    alpha = NA, stroke = 0.5
+  ),
 
+  draw_panel = function(data, panel_scales, coord, na.rm = FALSE) {
     coords <- coord$transform(data, panel_scales)
     ggname("geom_point",
       pointsGrob(
@@ -157,9 +160,5 @@ GeomPoint <- ggproto("GeomPoint", Geom,
     )
   },
 
-  draw_key = draw_key_point,
-
-  required_aes = c("x", "y"),
-  default_aes = aes(shape = 19, colour = "black", size = 1.5, fill = NA,
-    alpha = NA, stroke = 0.5)
+  draw_key = draw_key_point
 )

R/geom-raster.r

@@ -38,6 +38,10 @@ geom_raster <- function(mapping = NULL, data = NULL, stat = "identity",
 #' @usage NULL
 #' @export
 GeomRaster <- ggproto("GeomRaster", Geom,
+  default_aes = aes(fill = "grey20", alpha = NA),
+  non_missing_aes = "fill",
+  required_aes = c("x", "y"),
+
   setup_data = function(data, params) {
     hjust <- params$hjust %||% 0.5
     vjust <- params$vjust %||% 0.5
@@ -57,8 +61,6 @@ GeomRaster <- ggproto("GeomRaster", Geom,
     if (!inherits(coord, "CoordCartesian")) {
       stop("geom_raster only works with Cartesian coordinates", call. = FALSE)
     }
-    data <- remove_missing(data, TRUE, c("x", "y", "fill"),
-      name = "geom_raster")
     data <- coord$transform(data, panel_scales)
 
     # Convert vector of data to raster
@@ -81,10 +83,5 @@ GeomRaster <- ggproto("GeomRaster", Geom,
       default.units = "native", interpolate = interpolate
     )
   },
-
-  default_aes = aes(fill = "grey20", alpha = NA),
-
-  required_aes = c("x", "y"),
-
   draw_key = draw_key_rect
 )

R/geom-segment.r

@@ -69,6 +69,10 @@ geom_segment <- function(mapping = NULL, data = NULL, stat = "identity",
 #' @usage NULL
 #' @export
 GeomSegment <- ggproto("GeomSegment", Geom,
+  required_aes = c("x", "y", "xend", "yend"),
+  non_missing_aes = c("linetype", "size", "shape"),
+  default_aes = aes(colour = "black", size = 0.5, linetype = 1, alpha = NA),
+
   draw_panel = function(data, panel_scales, coord, arrow = NULL,
                         lineend = "butt", na.rm = FALSE) {
 
@@ -104,8 +108,5 @@ GeomSegment <- ggproto("GeomSegment", Geom,
       lineend = lineend)
   },
 
-  required_aes = c("x", "y", "xend", "yend"),
-  default_aes = aes(colour = "black", size = 0.5, linetype = 1, alpha = NA),
-
   draw_key = draw_key_path
 )

R/geom-text.r

@@ -149,11 +149,15 @@ geom_text <- function(mapping = NULL, data = NULL, stat = "identity",
 #' @usage NULL
 #' @export
 GeomText <- ggproto("GeomText", Geom,
+  required_aes = c("x", "y", "label"),
+
+  default_aes = aes(
+    colour = "black", size = 3.88, angle = 0, hjust = 0.5,
+    vjust = 0.5, alpha = NA, family = "", fontface = 1, lineheight = 1.2
+  ),
+
   draw_panel = function(data, panel_scales, coord, parse = FALSE,
                         na.rm = FALSE, check_overlap = FALSE) {
-    data <- remove_missing(data, na.rm,
-      c("x", "y", "label"), name = "geom_text")
-
     lab <- data$label
     if (parse) {
       lab <- parse(text = lab)
@@ -183,11 +187,6 @@ GeomText <- ggproto("GeomText", Geom,
     )
   },
 
-  required_aes = c("x", "y", "label"),
-
-  default_aes = aes(colour = "black", size = 3.88, angle = 0, hjust = 0.5,
-    vjust = 0.5, alpha = NA, family = "", fontface = 1, lineheight = 1.2),
-
   draw_key = draw_key_text
 )