:fish:

app.R

@@ -48,16 +48,17 @@ server <- function(input, output, session) {
     # Hacky -- we sidecar the metadata here
     if(file.exists(cache)) {
       meta <- jsonlite::read_json(cache)
+      print(meta$url)
     } else {
-      meta <- list(center = c(-110, 37),
+      meta <- list(X = -110,
+                   Y = 37,
                    zoom = 4,
                    url = paste0("https://minio.carlboettiger.info/",
                                 "public-data/inat-tmp-ranges.h3j"))
     }
-
-    m <- maplibre(center = meta$center, zoom = meta$zoom) |>
-      add_draw_control()
-    richness_map(m, url = meta$url)
+   
+    m <- richness_map(meta)
+    m
 
   })
 
@@ -80,12 +81,9 @@ server <- function(input, output, session) {
     }
 
     message("Computing richness...")
-    url <- richness(inat, aoi, rank, taxon)
-
-    center <- st_coordinates(st_centroid(st_as_sfc(st_bbox(aoi))))
-    zoom <- input$map_zoom
-    jsonlite::write_json(list(center = c(center), zoom = zoom, url = url), cache)
-
+    meta <- richness(inat, aoi, rank, taxon, zoom = input$map_zoom)
+    jsonlite::write_json(meta, cache, auto_unbox = TRUE)
+    message(paste("rendering", meta$url))
     session$reload()
 
   # UGH not sure why this fails, we manually reload instead!

inat-ranges.R

@@ -4,7 +4,7 @@ library(mapgl)
 
 # Also requires get_h3_aoi() from utils.R
 
-richness <- function(inat, aoi, rank = NULL, taxon = NULL) {
+richness <- function(inat, aoi, rank = NULL, taxon = NULL, zoom = 3) {
 
   hash <- digest::digest(list(aoi, rank, taxon))
   s3 <- paste0("s3://public-data/cache/inat/", hash, ".h3j")
@@ -36,18 +36,25 @@ richness <- function(inat, aoi, rank = NULL, taxon = NULL) {
   #  write_dataset("s3://public-data/inat-tmp-ranges.parquet")
   })
 
+
+  center <- c(st_coordinates(st_centroid(st_as_sfc(st_bbox(aoi)))))
   url <- gsub("s3://", "https://minio.carlboettiger.info/", s3)
-  return(url)
+
+  meta <- list(X = center[1], 
+               Y = center[2],
+               zoom = zoom, 
+               url = url, 
+               time = clock[[2]])
+  return(meta)
 }
 
-richness_map <- function(
-  m = maplibre(),
-  url = "https://minio.carlboettiger.info/public-data/inat-tmp-ranges.h3j"
-  ) {
-  
-  m <- m |>
+richness_map <- function(meta) {
+
+  m <- 
+    maplibre(center = c(meta$X, meta$Y), zoom = meta$zoom) |>
+    add_draw_control() |>
     add_h3j_source("h3j_source",
-                  url = url
+                  url = meta$url
     ) |>
     add_fill_extrusion_layer(
       id = "h3j_layer",
@@ -59,8 +66,7 @@ richness_map <- function(
         list("linear"),
         list("zoom"),
         0,
-        0,
-        1,
+        0, 1,
         list("*", 100000, list("get", "height"))
       ),
       fill_extrusion_opacity = 0.7

test.R

@@ -6,6 +6,7 @@ library(duckdbfs)
 library(ggplot2)
 library(mapgl)
 library(glue)
+library(jsonlite)
 load_h3()
 load_spatial()
 
@@ -17,12 +18,14 @@ duckdbfs::duckdb_secrets()
 inat <- open_dataset("s3://public-inat/hex")
 
 aoi <- spData::us_states
-aoi <- spData::world
+#aoi <- spData::world
 
 # publish richness at the aoi (bbox or poly)
-url <- richness(inat, aoi)
-m <- maplibre() |> add_draw_control()
-m <- richness_map(url = url)
+meta <- richness(inat, aoi)
+
+toJSON(meta, auto_unbox = TRUE) |> fromJSON(meta)
+
+m <- richness_map(meta)
 m
 library(htmlwidgets)
 htmlwidgets::saveWidget(m, "total-richness.html")
@@ -34,8 +37,8 @@ m <- richness_map(url = url)
 htmlwidgets::saveWidget(m, "aves-richness.html")
 
 # publish richness at the aoi (bbox or poly)
-richness(inat, aoi, rank = "class", taxon = "Mammalia")
-m <- richness_map()
+url <- richness(inat, aoi, rank = "class", taxon = "Mammalia")
+m <- richness_map(url = url)
 htmlwidgets::saveWidget(m, "mammals-richness.html")
 
 
@@ -116,3 +119,24 @@ out <- ca |>
 
 #  mutate(height = n / max(n)) |>
 
+url = "https://minio.carlboettiger.info/public-data/cache/inat/cec4b3087f0b6c41ecc384da2521f97c.h3j"
+ maplibre() |>
+    add_draw_control() |>
+    add_h3j_source("h3j_source",
+                  url = url
+    ) |>
+    add_fill_extrusion_layer(
+      id = "h3j_layer",
+      source = "h3j_source",
+      tooltip = "n",
+      fill_extrusion_color = viridis_pal("height"),
+      fill_extrusion_height = list(
+        "interpolate",
+        list("linear"),
+        list("zoom"),
+        0,
+        0, 1,
+        list("*", 100000, list("get", "height"))
+      ),
+      fill_extrusion_opacity = 0.7
+    )