plot_mapbox()/plot_geo() should not be calling add_trace() directly

Author: cpsievert

R/add.R

@@ -82,20 +82,6 @@ add_trace <- function(p, ..., color, symbol, size, linetype,
     attrs <- modify_list(p$x$attrs[[1]], attrs)
   }
 
-  if (is_mapbox(p) || is_geo(p)) {
-    attrs[["x"]] <- attrs[["x"]] %||% attrs[["lat"]]
-    attrs[["y"]] <- attrs[["y"]] %||% attrs[["lon"]]
-    if (!grepl("scatter|choropleth", attrs[["type"]] %||% "scatter")) {
-      stop("Cant add a '", attrs[["type"]], "' trace to a map object", call. = FALSE)
-    }
-    if (is_mapbox(p)) {
-      attrs[["type"]] <- "scattermapbox"
-    }
-    if (is_geo(p)) {
-      attrs[["type"]] <- if (!is.null(attrs[["z"]])) "choropleth" else "scattergeo"
-    }
-  }
-  
   p$x$attrs <- c(
     p$x$attrs %||% list(), 
     setNames(list(attrs), p$x$cur_data)

R/plotly.R

@@ -166,7 +166,7 @@ plot_ly <- function(data = data.frame(), ..., type = NULL,
 #' 
 #' map_data("world", "canada") %>%
 #'   group_by(group) %>%
-#'   plot_mapbox(x = ~lat, y = ~long) %>%
+#'   plot_mapbox(x = ~long, y = ~lat) %>%
 #'   add_polygons() %>%
 #'   layout(
 #'     mapbox = list(
@@ -176,11 +176,11 @@ plot_ly <- function(data = data.frame(), ..., type = NULL,
 #' }
 #' 
 plot_mapbox <- function(data = data.frame(), ...) {
-  p <- config(plot_ly(data), mapboxAccessToken = mapbox_token())
+  p <- config(plot_ly(data, ...), mapboxAccessToken = mapbox_token())
   # not only do we use this for is_mapbox(), but also setting the layout attr
   # https://plot.ly/r/reference/#layout-mapbox
   p$x$layout$mapType <- "mapbox"
-  add_trace(p, ...)
+  p
 }
 
 #' Initiate a plotly-geo object
@@ -198,15 +198,15 @@ plot_mapbox <- function(data = data.frame(), ...) {
 #' 
 #' map_data("world", "canada") %>%
 #'   group_by(group) %>%
-#'   plot_geo(x = ~lat, y = ~long) %>%
-#'   add_polygons()
+#'   plot_geo(x = ~long, y = ~lat) %>%
+#'   add_markers(size = I(1))
 #' 
 plot_geo <- function(data = data.frame(), ...) {
-  p <- plot_ly(data)
+  p <- plot_ly(data, ...)
   # not only do we use this for is_geo(), but also setting the layout attr
   # https://plot.ly/r/reference/#layout-geo
   p$x$layout$mapType <- "geo"
-  add_trace(p, ...)
+  p
 }
 
 

R/plotly_build.R

@@ -26,7 +26,8 @@ plotly_build.list <- function(p) {
 
 #' @export
 plotly_build.gg <- function(p) {
-  ggplotly(p)
+  p <- ggplotly(p)
+  supply_defaults(p)
 }
 
 #' @export
@@ -71,6 +72,24 @@ plotly_build.plotly <- function(p) {
       p$x$attrs[[1]] <- NULL
     }
   }
+  
+  # trace type checking and renaming for plot objects
+  if (is_mapbox(p) || is_geo(p)) {
+    p$x$attrs <- lapply(p$x$attrs, function(tr) {
+      tr[["x"]] <- tr[["x"]] %||% tr[["lat"]]
+      tr[["y"]] <- tr[["y"]] %||% tr[["lon"]]
+      if (!grepl("scatter|choropleth", tr[["type"]] %||% "scatter")) {
+        stop("Cant add a '", tr[["type"]], "' trace to a map object", call. = FALSE)
+      }
+      if (is_mapbox(p)) {
+        tr[["type"]] <- "scattermapbox"
+      }
+      if (is_geo(p)) {
+        tr[["type"]] <- if (!is.null(tr[["z"]])) "choropleth" else "scattergeo"
+      }
+      tr
+    })
+  }
 
   dats <- Map(function(x, y) {
 
@@ -270,16 +289,18 @@ plotly_build.plotly <- function(p) {
     }
   }
 
-  # attribute naming correction for "geo-like" traces
-  if (is_geo(p) || is_mapbox(p)) {
-    p$x$layout[grepl("^[x-y]axis", names(p$x$layout))] <- NULL
-    p$x$data <- lapply(p$x$data, function(tr) {
+  # supply trace anchor and domain information  
+  p <- supply_defaults(p)
+  
+  # attribute naming corrections for "geo-like" traces
+  p$x$data <- lapply(p$x$data, function(tr) {
+    if (isTRUE(tr[["type"]] %in% c("scattermapbox", "scattergeo"))) {
       tr[["lat"]] <- tr[["lat"]] %||% tr[["y"]]
       tr[["lon"]] <- tr[["lon"]] %||% tr[["x"]]
       tr[c("x", "y")] <- NULL
-      tr
-    })
-  }
+    }
+    tr
+  })
 
   # polar charts don't like null width/height keys 
   if (is.null(p$x$layout[["height"]])) p$x$layout[["height"]] <- NULL