VICTORY :gem:

app.R

@@ -22,6 +22,7 @@ ui <- page_sidebar(
     textInput("location", "Location", "California"),
     varSelectInput("rank", NULL, taxa, selected = "scientificName"),
     textInput("taxon", NULL, "Canis lupus"),
+    actionButton("button", "Go")
   ),
   card(
     full_screen = TRUE,
@@ -30,41 +31,28 @@ ui <- page_sidebar(
 )
 
 server <- function(input, output, session) {
-  # output$map <- renderMaplibre({overture:::map(gdf)})
-
-  observeEvent(input$taxon, {
-    aoi <- get_division(input$location)
-
-    message("Computing richness...")
-
-    meta <- richness(inat, aoi, input$rank, input$taxon)
-    jsonlite::write_json(meta, cache, auto_unbox = TRUE)
-
-    message(paste("rendering", meta$url))
-
-    # session$reload()
-  }) |>
-    debounce(millis = 600)
-
   output$map <- renderMaplibre({
     if (file.exists(cache)) {
       meta <- jsonlite::read_json(cache)
       print(meta$url)
     } else {
-      meta <- list(
-        X = -110,
-        Y = 37,
-        zoom = 4,
-        url = paste0(
-          "https://",
-          public_endpoint,
-          "/public-data/inat-tmp-ranges.h3j"
-        )
-      )
+      aoi <- get_division(input$location)
+      meta <- richness(inat, aoi, rank = input$rank, taxon = input$taxon)
     }
     m <- richness_map(meta)
     m
   })
+
+  observeEvent(input$button, {
+    print(input$location)
+    aoi <- get_division(input$location)
+    meta <- richness(inat, aoi, rank = input$rank, taxon = input$taxon)
+
+    jsonlite::write_json(meta, cache, auto_unbox = TRUE)
+    message(paste("rendering", meta$url))
+
+    session$reload()
+  })
 }
 
 shinyApp(ui, server)

inat-ranges.R

@@ -17,21 +17,10 @@ taxa <- open_dataset(
   recursive = FALSE
 )
 
-sci <- duckdbfs::open_dataset(
+taxa <- duckdbfs::open_dataset(
   "s3://public-inat/taxonomy/taxa.parquet",
   recursive = FALSE
 )
-common <- duckdbfs::open_dataset(
-  "s3://public-inat/taxonomy/vernacular/VerqnacularNames-english.csv",
-  format = "csv",
-  recursive = FALSE
-) |>
-  select(id, vernacularName)
-
-taxa <- left_join(sci, common, by = "id") |>
-  rename(taxon_id = id)
-
-common_names <- taxa |> pull(vernacularName)
 
 cache <- tempfile(fileext = ".json")
 
@@ -75,6 +64,8 @@ richness <- function(inat, aoi, rank = NULL, taxon = NULL, zoom = 3) {
   })
 
   center <- c(st_coordinates(st_centroid(st_as_sfc(st_bbox(aoi)))))
+  bounds <- as.vector(st_bbox(aoi))
+
   url <- gsub("s3://", glue("https://{public_endpoint}/"), s3)
 
   meta <- list(
@@ -82,14 +73,17 @@ richness <- function(inat, aoi, rank = NULL, taxon = NULL, zoom = 3) {
     Y = center[2],
     zoom = zoom,
     url = url,
-    time = clock[[2]]
+    time = clock[[2]],
+    bounds = bounds
   )
   return(meta)
 }
 
 richness_map <- function(meta) {
+  print(meta)
+
   m <-
-    maplibre(center = c(meta$X, meta$Y), zoom = meta$zoom) |>
+    maplibre() |>
     add_draw_control() |>
     add_h3j_source("h3j_source", url = meta$url) |>
     add_fill_extrusion_layer(
@@ -107,7 +101,8 @@ richness_map <- function(meta) {
         list("*", 100000, list("get", "height"))
       ),
       fill_extrusion_opacity = 0.7
-    )
+    ) |>
+    fit_bounds(meta$bounds, animate = TRUE)
 
   return(m)
 }

test.qmd

@@ -0,0 +1,34 @@
+
+```{r}
+library(overture)
+source("utils.R")
+source("inat-ranges.R")
+aoi <- get_division("California")
+
+# gdf <- get_h3_aoi(aoi)
+
+#inat <- duckdbfs::open_dataset("s3://public-inat/hex") 
+
+rank <- "class"
+taxon <- "Aves" 
+
+inat <- duckdbfs::open_dataset("s3://public-inat/taxon") |>  filter(.data[[rank]] == taxon)
+
+duckdbfs::open_dataset("s3://public-inat/taxon") |>  dplyr::filter(scientificName == "Canis lupus") |> duckdbfs::to_sf()
+
+class(gdf)
+overture:::map(gdf)
+
+
+   #   filter(.data[[rank]] == taxon) |>
+   #   select(taxon_id) |>
+
+```
+
+```{r}
+
+
+    inat_range <- inat |> filter(rank == !!taxon)
+
+    print(head(inat_range))
+```