Merge pull request #347 from ropensci/fix/merge

fix #346

Author: cpsievert

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: plotly
 Title: Create Interactive Web Graphics via Plotly's JavaScript Graphing Library
-Version: 2.0.14
+Version: 2.0.15
 Authors@R: c(person("Carson", "Sievert", role = c("aut", "cre"),
     email = "[email protected]"),
     person("Chris", "Parmer", role = c("aut", "cph"),

NEWS

@@ -1,3 +1,7 @@
+2.0.15 -- 13 Dec 2015
+
+Fix #346
+
 2.0.14 -- 13 Dec 2015
 
 Fix #212

R/ggplotly.R

@@ -845,16 +845,18 @@ gg2list <- function(p) {
     not.merged <- not.merged[-1]
     # Are there any traces that have not yet been merged, and can be
     # merged with tr?
-    can.merge <- rep(FALSE, l=length(not.merged))
+    can.merge <- logical(length(not.merged))
     for(other.i in seq_along(not.merged)){
       other <- not.merged[[other.i]]
       criteria <- c()
       for(must.be.equal in c("x", "y", "xaxis", "yaxis")){
         other.attr <- other[[must.be.equal]]
         tr.attr <- tr[[must.be.equal]]
-        criteria[[must.be.equal]] <- isTRUE(all.equal(other.attr, tr.attr))
+        criteria[[must.be.equal]] <- 
+          isTRUE(all.equal(other.attr, tr.attr)) && 
+          unique(other$type, tr$type) == "scatter"
       }
-      if(all(criteria) && tr$type != "bar"){
+      if(all(criteria)){
         can.merge[[other.i]] <- TRUE
       }
     }
@@ -866,7 +868,7 @@ gg2list <- function(p) {
       }, error=function(e){
         NA
       })
-      if(is.character(new.mode) && !is.na(new.mode)){
+      if(is.character(new.mode) && !is.na(new.mode %||% NA)){
         tr$mode <- new.mode
       }
       attrs <- c("error_x", "error_y", "marker", "line")

tests/testthat/test-ggplot-density2d.R

@@ -1,14 +1,16 @@
 context("Density2d")
 
 # Draw a 2d density estimation using geom_density2d
-m <- ggplot(MASS::geyser) + geom_density2d(aes(x=duration, y=waiting))
+m <- ggplot(MASS::geyser, aes(x=duration, y=waiting)) + 
+  geom_point(alpha = 0.4) +
+  geom_density2d()
 L <- save_outputs(m, "density2d")
 
 test_that("geom_density2d is translated to type=histogram2dcontour", {
-  expect_equal(length(L$data), 1)
-  expect_identical(L$data[[1]]$type, "histogram2dcontour")
+  expect_equal(length(L$data), 2)
+  expect_identical(L$data[[2]]$type, "histogram2dcontour")
 })
 
 test_that("geom_density2d uses line contours by default", {
-  expect_identical(L$data[[1]]$contours$coloring, "lines")
+  expect_identical(L$data[[2]]$contours$coloring, "lines")
 })