supply defaults for geo

Author: cpsievert

R/subplots.R

@@ -98,11 +98,20 @@ subplot <- function(..., nrows = 1, widths = NULL, heights = NULL, margin = 0.02
     x$annotations[!axes]
   })
   # collect axis objects (note a _single_ geo object counts a both an x and y)
+  geoDomainDefault <- list(x = c(0, 1), y = c(0, 1))
   xAxes <- lapply(layouts, function(lay) {
-    lay[grepl("^xaxis|^geo", names(lay))] %||% list(xaxis = list(domain = c(0, 1)))
+    keys <- grep("^geo|^xaxis", names(lay), value = TRUE) %||% "xaxis"
+    for (k in keys) {
+      lay[[k]]$domain <- lay[[k]]$domain %||% if (grepl("^geo", k)) geoDomainDefault else c(0, 1)
+    }
+    lay[keys]
   })
   yAxes <- lapply(layouts, function(lay) {
-    lay[grepl("^yaxis|^geo", names(lay))] %||% list(yaxis = list(domain = c(0, 1)))
+    keys <- grep("^geo|^yaxis", names(lay), value = TRUE) %||% "yaxis"
+    for (k in keys) {
+      lay[[k]]$domain <- lay[[k]]$domain %||% if (grepl("^geo", k)) geoDomainDefault else c(0, 1)
+    }
+    lay[keys]
   })
   if (!titleX) {
     xAxes <- lapply(xAxes, function(ax) lapply(ax, function(y) { y$title <- NULL; y }))

tests/testthat/test-plotly-subplot.R

@@ -136,3 +136,35 @@ test_that("ggplotly understands ggmatrix", {
   L <- save_outputs(GGally::ggpairs(iris), "plotly-subplot-ggmatrix")
 })
 
+test_that("geo+cartesian behaves", {
+  # specify some map projection/options
+  g <- list(
+    scope = 'usa',
+    projection = list(type = 'albers usa'),
+    lakecolor = toRGB('white')
+  )
+  # create a map of population density
+  density <- state.x77[, "Population"] / state.x77[, "Area"]
+  map <- plot_ly(
+    z = density, 
+    text = state.name, locations = state.abb,
+    type = 'choropleth', locationmode = 'USA-states', geo = "geo"
+  ) %>% layout(geo = g)
+  # create a bunch of horizontal bar charts 
+  vars <- colnames(state.x77)
+  barcharts <- lapply(vars, function(var) {
+    plot_ly(x = state.x77[, var], y = state.name, type = "bar", 
+            orientation = "h", name = var) %>%
+      layout(showlegend = FALSE, hovermode = "y",
+             yaxis = list(showticklabels = FALSE))
+  })
+  s <- subplot(
+    subplot(barcharts, margin = 0.01), map, 
+    nrows = 2, heights = c(0.3, 0.7)
+  )
+  l <- expect_traces(s, 9, "geo-cartesian")
+  geoDom <- l$layout[[grep("^geo", names(l$layout))]]$domain
+  expect_equal(geoDom$x, c(0, 1))
+  expect_equal(geoDom$y, c(0, 0.68))
+})
+