allow empty annotations. fixes #3317

Author: clauswilke

R/annotation.r

@@ -46,15 +46,16 @@ annotate <- function(geom, x = NULL, y = NULL, xmin = NULL, xmax = NULL,
 
   # Check that all aesthetic have compatible lengths
   lengths <- vapply(aesthetics, length, integer(1))
-  unequal <- length(unique(setdiff(lengths, 1L))) > 1L
+  n <- unique(setdiff(lengths, 1L))
+  unequal <- length(n) > 1L
   if (unequal) {
     bad <- lengths != 1L
     details <- paste(names(aesthetics)[bad], " (", lengths[bad], ")",
       sep = "", collapse = ", ")
     stop("Unequal parameter lengths: ", details, call. = FALSE)
   }
 
-  data <- new_data_frame(position, n = max(lengths))
+  data <- new_data_frame(position, n = n)
   layer(
     geom = geom,
     params = list(

R/performance.R

@@ -4,7 +4,7 @@ new_data_frame <- function(x = list(), n = NULL) {
   if (length(x) != 0 && is.null(names(x))) stop("Elements must be named", call. = FALSE)
   lengths <- vapply(x, length, integer(1))
   if (is.null(n)) {
-    n <- if (length(x) == 0) 0 else max(lengths)
+    n <- if (length(x) == 0 || min(lengths) == 0) 0 else max(lengths)
   }
   for (i in seq_along(x)) {
     if (lengths[i] == n) next
@@ -32,7 +32,7 @@ split_matrix <- function(x, col_names = colnames(x)) {
   if (!is.null(col_names)) names(x) <- col_names
   x
 }
-              
+
 mat_2_df <- function(x, col_names = colnames(x)) {
   new_data_frame(split_matrix(x, col_names))
 }