Merge pull request #771 from wch/fix-polygon

Fix polygon grouping bug

Author: wch

NEWS

@@ -6,6 +6,9 @@ BUG FIXES
 * The theme element `legend.box.just` now can be set. It was not properly
   recognized before.
 
+* `stat_density2d` previously resulted in errors when geom="polygon". This
+  is fixed. (Fixes #741 and #749)
+
 ggplot2 0.9.3
 ----------------------------------------------------------------
 

R/geom-polygon.r

@@ -58,6 +58,11 @@ GeomPolygon <- proto(Geom, {
   draw <- function(., data, scales, coordinates, ...) {
     n <- nrow(data)
     if (n == 1) return()
+
+    # Check if group is numeric, to make polygonGrob happy (factors are numeric,
+    # but is.numeric() will report FALSE because it actually checks something else)
+    if (mode(data$group) != "numeric")
+      data$group <- factor(data$group)
 
     munched <- coord_munch(coordinates, data, scales)
     # Sort by group to make sure that colors, fill, etc. come in same order

R/stat-contour.r

@@ -111,13 +111,15 @@ contour_lines <- function(data, breaks, complete = FALSE) {
   xs <- unlist(lapply(cl, "[[", "x"), use.names = FALSE)
   ys <- unlist(lapply(cl, "[[", "y"), use.names = FALSE)
   pieces <- rep(seq_along(cl), lengths)
-  
+  # Add leading zeros so that groups can be properly sorted later
+  groups <- paste(data$group[1], sprintf("%03d", pieces), sep = "-")
+
   data.frame(
     level = rep(levels, lengths),
     x = xs,
     y = ys,
     piece = pieces,
-    group = paste(data$group[1], pieces, sep = "-")
+    group = groups
   )
 }
 

visual_test/geom-polygon.r

@@ -0,0 +1,13 @@
+vcontext("geom-polygon")
+
+ggplot(faithful, aes(x = eruptions, y = waiting)) +
+  stat_density2d(aes(colour = ..level..), geom="path") +
+  xlim(0.5, 6) + ylim(40, 110)
+save_vtest("stat_density2d with paths")
+
+ggplot(faithful, aes(x = eruptions, y = waiting)) +
+  stat_density2d(aes(fill = ..level..), geom="polygon", colour="white") +
+  xlim(0.5, 6) + ylim(40, 110)
+save_vtest("stat_density2d with filled polygons")
+
+end_vcontext()