make sure plotly_data returns sf class and start on sensible trace defaults

Author: cpsievert

NAMESPACE

@@ -9,6 +9,7 @@ S3method(do_,plotly)
 S3method(embed_notebook,plotly)
 S3method(filter_,plotly)
 S3method(fortify,SharedData)
+S3method(fortify,plotly)
 S3method(geom2trace,GeomBar)
 S3method(geom2trace,GeomBlank)
 S3method(geom2trace,GeomBoxplot)
@@ -20,7 +21,6 @@ S3method(geom2trace,GeomPolygon)
 S3method(geom2trace,GeomText)
 S3method(geom2trace,GeomTile)
 S3method(geom2trace,default)
-S3method(ggplot,plotly)
 S3method(ggplotly,ggmatrix)
 S3method(ggplotly,ggplot)
 S3method(ggplotly,plotly)

R/plotly_build.R

@@ -114,6 +114,14 @@ plotly_build.plotly <- function(p, registerFrames = TRUE) {
 
     # perform the evaluation
     dat <- plotly_data(p, y)
+    
+    # set special defaults for sf
+    if (inherits(dat, "sf")) {
+      dat <- fortify_sf(dat)
+      x$x <- ~x
+      x$y <- ~y
+    }
+    
     trace <- structure(
       rapply(x, eval_attr, data = dat, how = "list"),
       class = oldClass(x)
@@ -527,6 +535,7 @@ train_data <- function(data, trace) {
     dat[idx2, "y"] <- data[["yend"]]
     data <- dplyr::group_by_(dat, ".plotlyGroupIndex", add = TRUE)
   }
+  
   # TODO: a lot more geoms!!!
   data
 }

R/plotly_data.R

@@ -62,26 +62,33 @@
 #' 
 plotly_data <- function(p, id = p$x$cur_data) {
   if (!is.plotly(p)) {
-    stop("This function can only retrieve data from plotly objects.")
+    stop("`plotly_data()` expects a plotly object as it's first argument.", call. = FALSE)
   }
+  # TODO: attach a special class here so that it gets printed as a tibble?
+  # Or, maybe, add an `as_tibble = TRUE` argument and use FALSE internally
+  fortify(p)
+}
+
+#' @export
+fortify.plotly <- function(p, id = p$x$cur_data) {
   f <- p$x$visdat[[id]]
   # if data has been specified, f should be a closure that, when called,
   # returns data
-  if (is.null(f)) return(f)
-  if (!is.function(f)) stop("Expected a closure", call. = FALSE)
-  dat <- f()
-  if (crosstalk::is.SharedData(dat)) {
-    key <- dat$key()
-    set <- dat$groupName()
-    dat <- dat$origData()
-    dat[[crosstalk_key()]] <- key
-    # not allowed for list-columns!
-    #dat <- dplyr::group_by_(dat, crosstalk_key(), add = TRUE)
-    dat <- structure(dat, set = set)
-  }
-  if (is.data.frame(dat)) tibble::as_tibble(dat) else dat
+  if (!is.function(f)) stop("Expected a closure function", call. = FALSE)
+  fortify(f())
 }
 
+#' @export
+fortify.SharedData <- function(model, data, ...) {
+  key <- model$key()
+  set <- model$groupName()
+  data <- model$origData()
+  # need a consistent name so we know how to access it ggplotly()
+  data[[crosstalk_key()]] <- key
+  structure(data, set = set)
+}
+
+
 #' @rdname plotly_data
 #' @export
 groups.plotly <- function(x) {
@@ -226,28 +233,3 @@ transmute_.plotly <- function(.data, ..., .dots) {
 # }
 # 
 # n_dots <- function(...) nargs()
-
-
-# ---------------------------------------------------------------------------
-# miscellanous methods
-# ---------------------------------------------------------------------------
-
-# Avoid errors when passing a shared data to ggplot2
-# qplot(data = crosstalk::SharedData$new(mtcars), mpg, wt)
-
-#' @export
-fortify.SharedData <- function(model, data, ...) {
-  key <- model$key()
-  set <- model$groupName()
-  data <- model$origData()
-  # need a consistent name so we know how to access it ggplotly()
-  data[[crosstalk_key()]] <- key
-  structure(data, set = set)
-}
-
-# yes, you can feed a plotly object into ggplot %^)
-#' @export
-ggplot.plotly <- function(data, mapping = aes(), ...,
-                          environment = parent.frame()) {
-  ggplot(plotly_data(data), mapping = mapping, ..., environment = environment)
-}

demo/00Index

@@ -1,3 +1,5 @@
+animation-tour-basic                A basic example of a grand tour
+animation-tour-USArrests            Linking a dendrogram to a tour
 crosstalk-highlight-intro           An introduction to linked views
 crosstalk-highlight-subplot         Basic scatterplot brushing with subplot()
 crosstalk-highlight-ggplotly        Linking ggplot2 plots
@@ -8,7 +10,7 @@ crosstalk-highlight-binned-target   Let plotly.js dynamically bin the raw data
 crosstalk-highlight-epl             An example of linked facets
 crosstalk-filter-lines              Using crosstalk's filter_select() to filter lines
 crosstalk-filter-dynamic-axis       Using crosstalk's filter_select() to dynamically change the y-axis
-animation-tour-basic                A basic example of a grand tour
-animation-tour-USArrests            Linking a dendrogram to a tour
 rotate                              Using htmlwidgets::onRender() to rotate the camera of a 3D graph
 ternary                             A basic ternary plot
+sf-data-scattermapbox               Mapping sf objects with mapbox
+sf-layout-scattermapbox             Mapping sf objects with mapbox (as a layer)