Merge pull request #150 from ropensci/marianne-geom-text-colour

Let geom_text layer split into traces along colour

Author: mkcor

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: plotly
 Type: Package
 Title: Interactive, publication-quality graphs online.
-Version: 0.5.15
+Version: 0.5.16
 Authors@R: c(person("Chris", "Parmer", role = c("aut", "cre"),
     email = "[email protected]"),
     person("Scott", "Chamberlain", role = "aut",

NEWS

@@ -1,3 +1,7 @@
+0.5.16 -- 29 December 2014.
+
+Support colour aesthetic in geom_text().
+
 0.5.15 -- 19 December 2014.
 
 Use proper RCurlOptions in get_figure() method.

R/ggplotly.R

@@ -53,7 +53,8 @@ markLegends <-
        polygon=c("colour", "fill", "linetype", "size", "group"),
        bar=c("colour", "fill"),
        step=c("linetype", "size", "colour"),
-       boxplot=c("x"))
+       boxplot=c("x"),
+       text=c("colour"))
 
 markUnique <- as.character(unique(unlist(markLegends)))
 

R/plotly-package.r

@@ -7,7 +7,7 @@
 #' \itemize{
 #'  \item Package: plotly
 #'  \item Type: Package
-#'  \item Version: 0.5.15
+#'  \item Version: 0.5.16
 #'  \item Date: 2014-03-07
 #'  \item License: MIT
 #' }

R/plotly.R

@@ -82,7 +82,7 @@ For more help, see https://plot.ly/R or contact <[email protected]>.")
 
   # public attributes/methods that the user has access to
   pub <- list(username=username, key=key, filename="from api", fileopt=NULL,
-              version="0.5.15")
+              version="0.5.16")
   priv <- list()
 
   pub$makecall <- function(args, kwargs, origin) {

R/trace_generation.R

@@ -428,8 +428,8 @@ geom2trace <- list(
     if (!is.null(params$size)) {
       L$textfont$size <- params$size
     }
-    if (!is.null(data$colour)) {
-      L$textfont$color <- data$colour
+    if (!is.null(params$colour)) {
+      L$textfont$color <- params$colour
     }
     L
   },

tests/testthat/test-ggplot-text.R

@@ -1,4 +1,4 @@
-context("text")
+context("Text")
 
 gg <- ggplot(mtcars, aes(x=wt, y=mpg, label=rownames(mtcars))) +
   geom_text(size=18)
@@ -18,3 +18,34 @@ test_that("textsize is translated correctly", {
 })
 
 save_outputs(gg, "text")
+
+test_that("geom_text splits along colour", {
+  mds <- data.frame(State=c("Alabama", "Alabama", "Alabama", "Alabama",
+                            "Arizona", "Arizona"),
+                    City=c("HUNTSVILLE", "MOBILE", "BIRMINGHAM", "MONTGOMERY",
+                           "TUCSON", "PEORIA"),
+                    coord.1=c(1.561284, 6.088862, 9.978292, 15.454877,
+                              23.225289, -7.283954),
+                    coord.2=c(0.2228790, 0.8343259, -3.6507234, -4.8520206,
+                              -0.4438650, 9.1252792),
+                    Division=c("East South Central", "East South Central",
+                               "East South Central", "East South Central",
+                               "Mountain", "Mountain"))
+  
+  gg <- ggplot(mds) +
+    geom_text(aes(x=coord.1, y=coord.2, label=City, colour=Division))
+  
+  L <- gg2list(gg)
+  
+  expect_equal(length(L), 3)  # 2 traces + layout
+  # Proper type and mode conversion
+  expect_identical(L[[1]]$type, "scatter")
+  expect_identical(L[[1]]$mode, "text")
+  expect_identical(L[[2]]$type, "scatter")
+  expect_identical(L[[2]]$mode, "text")
+  # Right colour for each trace
+  expect_identical(L[[1]]$textfont$color, "#F8766D")
+  expect_identical(L[[2]]$textfont$color, "#00BFC4")
+  
+  save_outputs(gg, "text-colour")
+})