plot_mapbox() shouldn't force a scattermapbox trace type, closes plotly#1608

cpsievert · cpsievert · commit 8108b2021673 · 2019-11-06T14:18:42.000-06:00
diff --git a/R/plotly_build.R b/R/plotly_build.R
@@ -112,7 +112,7 @@ plotly_build.plotly <- function(p, registerFrames = TRUE) {
       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_mapbox(p)) tr[["type"]] <- tr[["type"]] %||% "scattermapbox"
       if (is_geo(p)) {
         tr[["type"]] <- if (!is.null(tr[["z"]])) "choropleth" else "scattergeo"
       }

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ plotly_build.plotly <- function(p, registerFrames = TRUE) {`
`112`	`112`	`if (!grepl("scatter\|choropleth", tr[["type"]] %\|\|% "scatter")) {`
`113`	`113`	`stop("Cant add a '", tr[["type"]], "' trace to a map object", call. = FALSE)`
`114`	`114`	`}`
`115`		`- if (is_mapbox(p)) tr[["type"]] <- "scattermapbox"`
	`115`	`+ if (is_mapbox(p)) tr[["type"]] <- tr[["type"]] %\|\|% "scattermapbox"`
`116`	`116`	`if (is_geo(p)) {`
`117`	`117`	`tr[["type"]] <- if (!is.null(tr[["z"]])) "choropleth" else "scattergeo"`
`118`	`118`	`}`