Merge branch 'master' into scattergl

Author: cpsievert

.Rbuildignore

@@ -5,6 +5,7 @@
 CONDUCT.md
 CONTRIBUTING.md
 build_site.R
+travis_debug.R
 todo.R
 .github/
 inst/examples/rmd/*.html

.gitignore

@@ -14,3 +14,4 @@ inst/examples/*/rsconnect/*
 Untitled*
 rsconnect/
 revdep/
+travis_debug.R

.travis.yml

@@ -6,7 +6,7 @@ dist: trusty
 r:
   - oldrel
   - release
-#  - devel
+  - devel
 
 env:
   global:
@@ -15,6 +15,8 @@ env:
     - secure: "WsvmMHN4YVhnk0bLRE04APcLbs5s4vWKSHjEdU0bPXd0xdMTzZeP5D7pxyF1983C+P5LpSnGHv4dgwLMBkNzxJwBR7/Ta7lfO1akYILWwxib+1DVbCqUH5Z4Ba1FSCQptIrLNGR3P7+0Lem4hEhqKdPKltFnxhnXO0Y+MeG71IQ="
     # GITHUB_PAT (for pushing to plotly-test-table)
     - secure: "Ar5FRxsMJHxb8CQmmsoFx5Tm6ncFvF3LHtAMtfcOE2e9JAbXQ471PGzOMM7yudGa2vVuQJBpB6bWktuE30J68MQxgRmxeaJYmOp+ePqyW80y/zEa2P3R4//eb9Rif2lmsmaqz7HtVfX4xr3YX4N+ZjfyI8TFt5Phue18tXeMoJw="
+    # MAPBOX_TOKEN (for testing `plot_mapbox()`)
+    - secure: "QPBEqtLRdwb4ablJORzD0JdCT9ESe3nNdIehM1oxfcNKfpSdf2OFxH3TkeYY1nMpv0mLxiMNTy6xcj9Yk5MaaBCIA0P7q6OdZv9ruzQD1j3g84gP45KwBilbPGjb+/EvOS0fM25vR/pAmA8IyoUfPC2J8HwiNnW8DYdt/hJOJ9A="
 
 # installing Rserve from source requires non-standard R build (--enable-R-shlib) 
 r_binary_packages:

DESCRIPTION

@@ -40,6 +40,7 @@ Imports:
     dplyr,
     tibble,
     lazyeval (>= 0.2.0),
+    rlang,
     crosstalk,
     purrr,
     data.table
@@ -62,11 +63,14 @@ Suggests:
     listviewer,
     dendextend,
     sf,
+    maptools,
+    rgeos,
     RSelenium,
     png,
     IRdisplay
 Remotes:
   tidyverse/ggplot2
 LazyData: true
-RoxygenNote: 6.0.1
+RoxygenNote: 6.0.1.9000
+Encoding: UTF-8
 Roxygen: list(markdown = TRUE)

NAMESPACE

@@ -39,20 +39,10 @@ S3method(print,api)
 S3method(print,api_grid)
 S3method(print,api_grid_local)
 S3method(print,api_plot)
+S3method(print,plotly_data)
 S3method(rename_,plotly)
 S3method(select_,plotly)
 S3method(slice_,plotly)
-S3method(st_as_plotly,CIRCULARSTRING)
-S3method(st_as_plotly,COMPOUNDCURVE)
-S3method(st_as_plotly,CURVEPOLYGON)
-S3method(st_as_plotly,GEOMETRYCOLLECTION)
-S3method(st_as_plotly,LINESTRING)
-S3method(st_as_plotly,MULTILINESTRING)
-S3method(st_as_plotly,MULTIPOINT)
-S3method(st_as_plotly,MULTIPOLYGON)
-S3method(st_as_plotly,MULTISURFACE)
-S3method(st_as_plotly,POINT)
-S3method(st_as_plotly,POLYGON)
 S3method(summarise_,plotly)
 S3method(to_basic,GeomAbline)
 S3method(to_basic,GeomAnnotationMap)
@@ -112,6 +102,7 @@ export(add_polygons)
 export(add_ribbons)
 export(add_scattergeo)
 export(add_segments)
+export(add_sf)
 export(add_surface)
 export(add_text)
 export(add_trace)
@@ -257,6 +248,7 @@ importFrom(lazyeval,is_formula)
 importFrom(lazyeval,is_lang)
 importFrom(magrittr,"%>%")
 importFrom(purrr,transpose)
+importFrom(rlang,eval_tidy)
 importFrom(stats,complete.cases)
 importFrom(stats,is.leaf)
 importFrom(stats,quantile)

NEWS.md

@@ -2,13 +2,19 @@
 
 ## NEW FEATURES & IMPROVEMENTS
 
-* Upgraded to plotly.js v1.35.2. A _huge_ amount of features and improvements have been made since v1.29.2 (i.e., the version included in the last CRAN release of the R package - v4.7.1). Highlights include a complete re-write of `scattergl` to make it nearly feature complete with `scatter`, localization of text rendering (i.e., international translations), and two new trace types (`violin` & `table`). Read more about the v1.32.0 release [here](https://codeburst.io/notes-from-the-latest-plotly-js-release-b035a5b43e21) and the complete list of changes [here](https://github.com/plotly/plotly.js/releases).
-* The selection mode can now switch from 'transient' to 'persistent' by holding the 'shift' key. It's still possible to _force_ persistent selection by setting `persistent = TRUE` in `highlight()`, but `persistent = FALSE` (the default) is now recommended since it allows one to switch between [persistent/transient selection](https://plotly-book.cpsievert.me/linking-views-without-shiny.html#transient-versus-persistent-selection) in the browser, rather than at the command line.
+* Upgraded to plotly.js v1.36.0. A _huge_ amount of features and improvements have been made since v1.29.2 (i.e., the version included in the last CRAN release of the R package - v4.7.1). Highlights include a complete re-write of `scattergl` to make it nearly feature complete with `scatter`, localization of text rendering (i.e., international translations), and two new trace types (`violin` & `table`). Read more about the v1.32.0 release [here](https://codeburst.io/notes-from-the-latest-plotly-js-release-b035a5b43e21) and the complete list of changes [here](https://github.com/plotly/plotly.js/releases).
+* Support for **sf** (simple feature) data structures was added to `plot_ly()`, `plot_mapbox()`, and `plot_geo()` (via the new `add_sf()` function). See [this blog post](https://blog.cpsievert.me/2018/03/30/visualizing-geo-spatial-data-with-sf-and-plotly) for an overview.
+* New "special arguments" `stroke`, `strokes`, `alpha_stroke`, `span`, and `spans` were added for easier control over the stroke (i.e., outline) appearance of various (filled) graphical marks. For an overview, see the **sf** blog post linked to in the bullet point above and the new package demos (list all demos with `demo(package = "plotly")`).
+* The selection (i.e., linked-brushing) mode can now switch from 'transient' to 'persistent' by holding the 'shift' key. It's still possible to _force_ persistent selection by setting `persistent = TRUE` in `highlight()`, but `persistent = FALSE` (the default) is now recommended since it allows one to switch between [persistent/transient selection](https://plotly-book.cpsievert.me/linking-views-without-shiny.html#transient-versus-persistent-selection) in the browser, rather than at the command line.
 * Instead of an error, `ggplotly(NULL, "message")` and `plotly_build(NULL, "message")` now returns `htmltools::div("message")`, making it easier to relay messages in shiny when data isn't yet ready to plot (see #1116)
 * The `animation_button()` function gains a `label` argument, making it easier to control the label of an animation button generated through the `frame` API (see #1205).
 
 ## CHANGES
 
+* The `color` argument now maps to `fillcolor`, making it much easier to use polygon fills to encode data values (e.g., choropleth maps). For backwards-compatibilty reasons, when `color` maps to `fillcolor`, `alpha` defaults to 0.5 (instead of 1). For an example, `plot_mapbox(mn_res, color = ~INDRESNAME)` or `plot_mapbox(mn_res, split = ~INDRESNAME, color = ~AREA, showlegend = FALSE, stroke = I("black"))`.
+* The `color` argument no longer automatically add `"markers"` to the `mode` attribute for scatter/scattergl trace types. Those who wish to have the old behavior back, should add `"markers"` to the `mode` explicity (e.g., change `plot_ly(economics, x = ~pce, y = ~pop, color = ~as.numeric(date), mode = "lines")` to `plot_ly(economics, x = ~pce, y = ~pop, color = ~as.numeric(date), mode = "lines+markers")`).
+* The `size` argument now informs a default [error_[x/y].width](https://plot.ly/r/reference/#scatter-error_x-width) (and `span` informs [error_[x/y].thickness](https://plot.ly/r/reference/#scatter-error_x-thickness)). Note you can override the default by specifying directly (e.g. `plot_ly(x = 1:10, y = 1:10, size = I(10), error_x = list(value = 5, width = 0))`)
+* `layout.showlegend` now defaults to `TRUE` for a *single* pie trace. This is a more sensible default and matches pure plotly.js behavior.
 * The `elementId` field is no longer populated, which fixes the "Ignoring explicitly provided widget ID" warning in shiny applications (see #985).
 
 ## BUG FIXES

R/add.R

@@ -217,6 +217,61 @@ add_polygons <- function(p, x = NULL, y = NULL, ...,
 }
 
 
+
+#' @inheritParams add_trace
+#' @rdname add_trace
+#' @export
+#' @examples 
+#' 
+#' if (requireNamespace("sf", quietly = TRUE)) {
+#'   nc <- sf::st_read(system.file("shape/nc.shp", package = "sf"), quiet = TRUE)
+#'   plot_ly() %>% add_sf(data = nc)
+#' }
+add_sf <- function(p, ..., x = ~x, y = ~y, data = NULL, inherit = TRUE) {
+  try_library("sf", "add_sf")
+  dat <- plotly_data(add_data(p, data))
+  if (!is_sf(dat)) {
+    stop(
+      "The `data` for an `add_sf()` layer must be an sf object, ", 
+      "not an object of class: ", class(dat)[1],
+      call. = FALSE
+    )
+  }
+  if (is_mapbox(p) || is_geo(p)) dat <- st_cast_crs(dat)
+  bbox <- sf::st_bbox(dat)
+  set <- attr(dat, "set")
+  
+  d <- to_basic.GeomSf(dat)
+  
+  # to_basic() returns either a single data frame or a list of data frames
+  # (each data frame should be a a collection of the same feature type)
+  d <- if (is.data.frame(d)) list(d)
+  
+  # inherit attributes from the "first layer" (except the plotly_eval class)
+  attrz <- if (inherit) modify_list(unclass(p$x$attrs[[1]]), list(...)) else list(...)
+  
+  for (i in seq_along(d)) {
+    # sensible mode/style defaults based on the feature type (e.g. polygon, path, point)
+    attrs <- modify_list(sf_default_attrs(d[[i]]), attrz)
+    # scatter3d doesn't currently support fill
+    if ("z" %in% names(attrs)) attrs$fill <- NULL
+    args <- list(
+      p = p, 
+      class = "plotly_sf", 
+      x = x,
+      y = y,
+      `_bbox` = bbox,
+      set = set,
+      data = if ("group" %in% names(d[[i]])) group_by_(d[[i]], "group", add = TRUE) else d[[i]], 
+      inherit = inherit
+    )
+    p <- do.call(add_trace_classed, c(args, attrs))
+  }
+  
+  p
+}
+
+
 #' @inheritParams add_trace
 #' @rdname add_trace
 #' @export

R/coord.R

@@ -21,3 +21,12 @@
 #' @format A data frame with three variables: `r`, `t`,
 #'   `nms`.
 "hobbs"
+
+
+#' Minnesotan Indian Reservation Lands
+#'
+#' @references \url{https://www.dot.state.mn.us/maps/gdma/gis-data.html}
+#'
+#' @format An sf data frame with 13 features and 5 fields
+#' 
+"res_mn"

R/data.R

@@ -4,16 +4,18 @@
 #' sent to plotly.js.
 #' 
 #' @param p a plotly or ggplot object.
-#' @param jsonedit use `listviewer::jsonedit` to view the JSON?
-#' @param ... other options passed onto `listviewer::jsonedit`
+#' @param jsonedit use [listviewer::jsonedit] to view the JSON?
+#' @param pretty adds indentation whitespace to JSON output. Can be TRUE/FALSE
+#' or a number specifying the number of spaces to indent. See [jsonlite::prettify].
+#' @param ... other options passed onto [listviewer::jsonedit]
 #' @export
 #' @examples 
 #'   
 #' plotly_json(plot_ly())
 #' plotly_json(plot_ly(), FALSE)
 
-plotly_json <- function(p = last_plot(), jsonedit = interactive(), ...) {
-  plotlyJSON <- to_JSON(plotly_build(p)$x, pretty = TRUE)
+plotly_json <- function(p = last_plot(), jsonedit = interactive(), pretty = TRUE, ...) {
+  plotlyJSON <- to_JSON(plotly_build(p)$x, pretty = pretty)
   if (jsonedit) {
     try_library("listviewer", "plotly_json")
     listviewer::jsonedit(plotlyJSON, mode = "form", ...)

R/dev.R

@@ -261,10 +261,9 @@ gg2list <- function(p, width = NULL, height = NULL,
 
   # save the domain of the group for display in tooltips
   groupDomains <- Map(function(x, y) {
-    tryCatch(
-      eval(y$mapping[["group"]] %||% plot$mapping[["group"]], x), 
-      error = function(e) NULL
-    )
+    aes_g <- y$mapping[["group"]] %||% plot$mapping[["group"]]
+    eval_ <- if (is_dev_ggplot2()) rlang::eval_tidy else base::eval
+    tryNULL(eval_(aes_g, x))
   }, data, layers)
 
   # for simple (StatIdentity) geoms, add crosstalk key to aes mapping
@@ -976,8 +975,8 @@ gg2list <- function(p, width = NULL, height = NULL,
     for (i in seq_along(traces)) {
       tr <- traces[[i]]
       # flipping logic for bar positioning is in geom2trace.GeomBar
-      if (tr$type != "bar") traces[[i]][c("x", "y")] <- tr[c("y", "x")]
-      if (tr$type %in% "box") {
+      if (!identical(tr$type, "bar")) traces[[i]][c("x", "y")] <- tr[c("y", "x")]
+      if (identical(tr$type, "box")) {
         traces[[i]]$orientation <- "h"
         traces[[i]]$hoverinfo <- "x"
       }

R/ggplotly.R

@@ -63,9 +63,9 @@ colorbar_built <- function(p, ..., limits = NULL, which = 1) {
         # since the colorscale is in a different trace, retrain all traces
         p$x$data <- lapply(p$x$data, function(x) {
           col <- x$marker[["color"]]
-          x$marker[["color"]][col < limits[1] | limits[2] < col] <- NA
-          x$marker[["cmin"]] <- limits[1]
-          x$marker[["cmax"]] <- limits[2]
+          x$marker[["color"]][col < limits[1] | limits[2] < col] <- default(NA)
+          x$marker[["cmin"]] <- default(limits[1])
+          x$marker[["cmax"]] <- default(limits[2])
           x
         })
       }
@@ -110,10 +110,10 @@ hide_colorbar <- function(p) {
   for (i in seq_along(p$x$data)) {
     trace <- p$x$data[[i]]
     if (has_attr(trace$type, "showscale")) {
-      p$x$data[[i]]$showscale <- FALSE
+      p$x$data[[i]]$showscale <- default(FALSE)
     }
     if (has_attr(trace$type, "marker")) {
-      p$x$data[[i]]$marker$showscale <- FALSE
+      p$x$data[[i]]$marker$showscale <- default(FALSE)
     }
   }
   p
@@ -144,7 +144,7 @@ hide_legend <- function(p) {
 #' @examples 
 #' 
 #' # currently no bargl trace type
-#' toWebGL(qplot(1:10))
+#' toWebGL(ggplot() + geom_bar(aes(1:10)))
 #' toWebGL(qplot(1:10, 1:10))
 #' 
 toWebGL <- function(p) {

R/helpers.R

@@ -14,6 +14,7 @@
 #' @importFrom purrr transpose
 #' @importFrom tools file_ext file_path_sans_ext
 #' @importFrom data.table as.data.table setorderv
+#' @importFrom rlang eval_tidy
 NULL