plot_mapbox() should default to scattermapbox unless z is present, fixes plotly#1707

cpsievert · cpsievert · commit 1e243ba8cd94 · 2020-02-24T09:43:12.000-06:00
diff --git a/R/plotly_build.R b/R/plotly_build.R
@@ -109,10 +109,13 @@ plotly_build.plotly <- function(p, registerFrames = TRUE) {
   if (is_mapbox(p) || is_geo(p)) {
     p <- geo2cartesian(p)
     attrsToEval <- lapply(attrsToEval, function(tr) {
-      if (!grepl("scatter|choropleth", tr[["type"]] %||% "scatter")) {
-        stop("Cant add a '", tr[["type"]], "' trace to a map object", call. = FALSE)
+      type <- tr[["type"]] %||% "scatter"
+      if (!grepl("scatter|choropleth", type)) {
+        warning("Can't add a '", type, "' trace to a map object", call. = FALSE)
+      }
+      if (is_mapbox(p)) {
+        tr[["type"]] <- if (!is.null(tr[["z"]])) "choroplethmapbox" else "scattermapbox"
       }
-      if (is_mapbox(p)) tr[["type"]] <- tr[["type"]] %||% "scattermapbox"
       if (is_geo(p)) {
         tr[["type"]] <- if (!is.null(tr[["z"]])) "choropleth" else "scattergeo"
       }
