Upload depth_interactive_map_alpha.R

depth_interactive_map_alpha.R

@@ -340,14 +340,14 @@ WEB_SQL_TEMPLATES <- list(
 
   temporal_pam_all =
     "SELECT CAST(date_part('year', date) AS INTEGER) AS yr,
-            COALESCE(SUM(pam_n), 0) AS n
+            COALESCE(SUM(pam_presentados_n), 0) AS n
      FROM dim_pam_mun
      WHERE date IS NOT NULL
      GROUP BY yr HAVING yr > 2000 AND yr <= 2030 ORDER BY yr",
 
   temporal_pam_sel =
     "SELECT CAST(date_part('year', date) AS INTEGER) AS yr,
-            COALESCE(SUM(pam_n), 0) AS n
+            COALESCE(SUM(pam_presentados_n), 0) AS n
      FROM dim_pam_mun
      WHERE date IS NOT NULL
        AND CVEGEO IN ({cvegeo_list})
@@ -745,12 +745,12 @@ WEB_SPEC <- list(
            tooltip = "Each dot marks a location where migrants went missing or died, recorded by the International Organization for Migration.",
            legend = list(type = "dot", color = COL_YEL, label = "Incident location")),
       list(kind = "layer", value = "desap-choro",
-           label = "Enforced disappearances per 100k (RNPDNO)",
-           tooltip = "People officially reported as forcibly disappeared in each municipality, shown per 100,000 residents.",
+           label = "Missing and no located persons per 100k (RNPDNO)",
+           tooltip = "People officially reported as disappeared and no located in each municipality, shown per 100,000 residents.",
            legend = list(type = "ramp", pal = "desap", unit = " /100k")),
       list(kind = "layer", value = "fosas-choro",
-           label = "Clandestine burial pits by municipality",
-           tooltip = "Number of clandestine burial pits (fosas) and bodies found per municipality. Source: Plataforma Fosas Clandestinas.",
+           label = "Clandestine graves by municipality",
+           tooltip = "Number of clandestine graves and bodies found per municipality. Source: Plataforma Ciudadana de Fosas (2006-2024)",
            legend = list(type = "ramp", pal = "fosas", unit = " pits")),
       list(kind = "radios", group = "fosas"),
       list(kind = "layer", value = "graves-pts",
@@ -788,7 +788,7 @@ WEB_SPEC <- list(
       list(kind = "layer", value = "viaferrea-lines",
            label = "Railway network",
            tooltip = "Railway lines used by migrants, including freight routes known as 'La Bestia'.",
-           legend = list(type = "line", color = "#94a3b8", label = "Railway", dashed = TRUE)),
+           legend = list(type = "line", color = "#9E2A3A", label = "Railway", dashed = TRUE)),
       list(kind = "soon", label = "Foreign population")
     )),
     list(id = "vulnerability", label = "Vulnerability", open = FALSE, items = list(
@@ -819,8 +819,8 @@ WEB_SPEC <- list(
 
   # Analysis panel (converter -> docs/js/panels.js; Shiny renders this too)
   panel = list(
-    title = "Transit Migration Risk Index",
-    subtitle = "Multi-variable analysis of components of vulnerability for migrants across Mexico.",
+    title = "Layer aggregations",
+    subtitle = "Summary of main indicators for migrants across Mexico.",
     groups = list(
       list(id = "hazards", label = "Hazards", open = TRUE, cards = list(
         list(title = "Missing Migrants Incidents (IOM)", kind = "stat", chart = "temporal_plot",
@@ -828,15 +828,15 @@ WEB_SPEC <- list(
                list(id = "n_incidents",  label = "Recorded incidents", color = COL_YEL),
                list(id = "n_fatalities", label = "Confirmed dead",     color = COL_RED)
              )),
-        list(title = "Enforced Disappearances (RNPDNO)", kind = "stat",
-             stats = list(list(id = "n_desap", label = "Registered disappearances", color = COL_RISK))),
+        list(title = "Missing persons and not located (RNPDNO)", kind = "stat",
+             stats = list(list(id = "n_desap", label = "Disappearances & no located", color = COL_RISK))),
         # Side-by-side burial pair: graves (points) + fosas (municipality sums)
-        list(title = "Burial Sites", kind = "stat", half = TRUE,
-             stats = list(list(id = "n_graves", label = "Clandestine burial sites", color = COL_RED))),
-        list(title = "Burial Pits (Fosas)", kind = "stat", half = TRUE,
+        list(title = "Clandestine graves (Vera, 2023)", kind = "stat", half = TRUE,
+             stats = list(list(id = "n_graves", label = "Clandestine graves", color = COL_RED))),
+        list(title = "Clandestine graves (PCF)", kind = "stat", half = TRUE,
              stats = list(
-               list(id = "n_fosas",   label = "Clandestine pits",  color = COL_RED),
-               list(id = "n_cuerpos", label = "Bodies recovered",  color = COL_AMBER)
+               list(id = "n_fosas",   label = "Clandestine graves",  color = COL_RED),
+               list(id = "n_cuerpos", label = "Bodies identified",  color = COL_AMBER)
              )),
         list(title = "Organised Crime Violence (OCVED 2.0)", kind = "stat", chart = "temporal_ocved",
              stats = list(list(id = "ocved_n", label = "Recorded violence events", color = COL_AMBER))),
@@ -865,7 +865,12 @@ WEB_SPEC <- list(
 LUCIDE_JS <- tags$head(
   tags$script(src = "https://unpkg.com/lucide@latest/dist/umd/lucide.min.js"),
   tags$script(HTML("
-    var gridOn = false;
+    // gridMenuOpen = is the N4-N8 resolution menu visible (purely visual);
+    // gridActive   = is the grid overlay currently shown on the map.
+    // These are independent: opening the menu must NOT change the grid.
+    var gridMenuOpen = false;
+    var gridActive   = false;
+    var gridNivel    = '6';
 
     document.addEventListener('DOMContentLoaded', function() {
       setTimeout(function() {
@@ -925,11 +930,8 @@ LUCIDE_JS <- tags$head(
           if (picker) picker.style.display = 'none';
         }
         var gridWrap = document.querySelector('.grid-btn-wrap');
-        if (gridWrap && !gridWrap.contains(e.target) && gridOn) {
-          gridOn = false;
-          closeGridPanel();
-          var gridBtn = document.getElementById('grid-icon-btn');
-          if (gridBtn) gridBtn.classList.remove('active');
+        if (gridWrap && !gridWrap.contains(e.target) && gridMenuOpen) {
+          closeGridPanel();   // close the menu only; grid state is untouched
         }
         var statePanel = document.getElementById('state-picker-panel');
         var stateBtn   = document.getElementById('btn_state_filter');
@@ -1051,39 +1053,46 @@ LUCIDE_JS <- tags$head(
       var panel = document.getElementById('grid-panel');
       if (!panel) return;
       panel.classList.remove('open');
-      setTimeout(function() { if (!panel.classList.contains('open')) panel.style.display = 'none'; }, 160);
+      gridMenuOpen = false;
+      setTimeout(function() {
+        if (!panel.classList.contains('open')) panel.style.display = 'none';
+      }, 160);
     }
 
+    // Grid trigger button: opens/closes the resolution menu ONLY.
+    // It never changes the grid overlay -- that happens on resolution click.
     function toggleGridPanel() {
       var panel = document.getElementById('grid-panel');
       if (!panel) return;
-      gridOn = !gridOn;
-      if (gridOn) {
+      if (gridMenuOpen) {
+        closeGridPanel();
+      } else {
+        gridMenuOpen = true;
         panel.style.display = 'flex';
         requestAnimationFrame(function() { panel.classList.add('open'); });
-      } else {
-        closeGridPanel();
       }
-      var btn = document.getElementById('grid-icon-btn');
-      if (btn) btn.classList.toggle('active', gridOn);
-      if (typeof Shiny !== 'undefined')
-        Shiny.setInputValue('grid_icon_click', Date.now(), { priority: 'event' });
     }
 
+    // Resolution click: applies the grid at that nivel. Clicking the nivel
+    // that is already active toggles the grid OFF.
     function setGridNivel(nivel) {
-      if (typeof Shiny !== 'undefined')
-        Shiny.setInputValue('grid_nivel', nivel, { priority: 'event' });
+      var turnOff = (gridActive && nivel === gridNivel);
+      gridActive = !turnOff;
+      gridNivel  = nivel;
+      if (typeof Shiny !== 'undefined') {
+        Shiny.setInputValue('grid_nivel',   nivel,      { priority: 'event' });
+        Shiny.setInputValue('grid_enabled', gridActive, { priority: 'event' });
+      }
+      // Highlight the active resolution only while the grid is on
       document.querySelectorAll('.grid-nivel-item').forEach(function(btn) {
-        btn.classList.toggle('active', btn.dataset.nivel === nivel);
+        btn.classList.toggle('active', gridActive && btn.dataset.nivel === nivel);
       });
-      // Update the trigger button's badge to reflect current nivel
+      // Trigger badge + button reflect the GRID state, not the menu state
       var trigBadge = document.getElementById('grid-trig-label');
-      if (trigBadge) trigBadge.textContent = 'N' + nivel;
-      // Auto-collapse grid panel after selection
-      closeGridPanel();
+      if (trigBadge) trigBadge.textContent = gridActive ? ('N' + nivel) : 'Off';
       var iconBtn = document.getElementById('grid-icon-btn');
-      if (iconBtn) iconBtn.classList.remove('active');
-      gridOn = false;
+      if (iconBtn) iconBtn.classList.toggle('active', gridActive);
+      closeGridPanel();
     }
 
     // -- Legend filter: click a categorical swatch to toggle that category --
@@ -1823,7 +1832,7 @@ ui <- page_fillable(
       div(class = "grid-btn-wrap",
         tags$span(
           class = "acc-info-wrap grid-info-btn",
-          `data-tooltip` = "Overlay a spatial grid on the map. Select resolution: N4 (~500 km2, national overview) to N7 (~4 km2, local detail). Grid colours follow the active layer.",
+          `data-tooltip` = "Overlay a spatial grid on the map. Select resolution: N4 (~114 km cell length, national overview) to N7 (~4 km cell length, local detail). Grid colours follow the active layer.",
           style = "display:none;",
           HTML('<i data-lucide="info" style="width:11px;height:11px;stroke-width:2.5;color:var(--c-text-mid)"></i>')
         ),
@@ -1835,22 +1844,22 @@ ui <- page_fillable(
           `aria-label` = "Toggle spatial grid overlay",
           title   = "Toggle grid resolution",
           HTML('<i data-lucide="grid-3x3" style="width:16px;height:16px;stroke-width:2" aria-hidden="true"></i>'),
-          tags$span(id = "grid-trig-label", class = "nav-btn-badge", "N6")
+          tags$span(id = "grid-trig-label", class = "nav-btn-badge", "Off")
         ),
         div(id = "grid-panel", class = "grid-panel grid-panel--rich", style = "display:none;",
             div(class = "grid-panel-current", "Grid resolution"),
             local({
               nivel_info <- list(
-                "4" = list(name = "Nivel 4", size = "~500 km", desc = "National overview"),
-                "5" = list(name = "Nivel 5", size = "~100 km", desc = "Regional"),
-                "6" = list(name = "Nivel 6", size = "~20 km",  desc = "Municipality"),
-                "7" = list(name = "Nivel 7", size = "~4 km",   desc = "Local detail")
+                "4" = list(name = "Nivel 4", size = "~144 km cell length", desc = "National overview"),
+                "5" = list(name = "Nivel 5", size = "~38 km cell length", desc = "Regional"),
+                "6" = list(name = "Nivel 6", size = "~13 km cell length",  desc = "Municipality"),
+                "7" = list(name = "Nivel 7", size = "~4 km cell length",   desc = "Local detail")
               )
               lapply(WEB_SPEC$niveles, function(nv) {
                 info <- nivel_info[[nv]]
                 tags$button(
                   type         = "button",
-                  class        = paste0("grid-nivel-item", if (nv == "6") " active" else ""),
+                  class        = "grid-nivel-item",
                   `data-nivel` = nv,
                   onclick      = paste0("setGridNivel('", nv, "')"),
                   `aria-label` = paste0("Set grid to ", info$name, ", ", info$size, " squared, ", info$desc),
@@ -2109,7 +2118,7 @@ ui <- page_fillable(
                     `aria-label`    = "Toggle Transit Migration Risk Index",
                     onclick = "togglePanel('tmri')",
                     HTML('<i data-lucide="sigma" style="width:18px;height:18px;stroke-width:2" aria-hidden="true"></i>'),
-                    tags$span(class = "side-rail-tab-label", "Summary")),
+                    tags$span(class = "side-rail-tab-label", "Agg")),
         tags$button(class = "side-rail-tab",
                     id = "tab-risk",
                     type = "button",
@@ -2119,8 +2128,8 @@ ui <- page_fillable(
                     `aria-selected` = "false",
                     `aria-label`    = "Toggle Risk Index Adjustments",
                     onclick = "togglePanel('risk')",
-                    HTML('<i data-lucide="network" style="width:18px;height:18px;stroke-width:2" aria-hidden="true"></i>'),
-                    tags$span(class = "side-rail-tab-label", "Adjust")),
+                    HTML('<i data-lucide="combine" style="width:18px;height:18px;stroke-width:2" aria-hidden="true"></i>'),
+                    tags$span(class = "side-rail-tab-label", "Risk")),
         tags$button(class = "side-rail-tab",
                     id = "tab-assist",
                     type = "button",
@@ -2763,7 +2772,7 @@ server <- function(input, output, session) {
           fill_color   = fosas_step_expr("fosas"),
           fill_opacity = 0.65, visibility = "none",
           tooltip      = list("concat", "<b>", g("municipio"), "</b>",
-                              "<br>Burial pits (fosas): ", ts("fosas_total"),
+                              "<br>Clandestine graves (PCF): ", ts("fosas_total"),
                               "<br>Bodies (cuerpos): ", ts("cuerpos_total"))
         )
     }
@@ -3033,9 +3042,10 @@ server <- function(input, output, session) {
     }
   }, once = TRUE)
 
-  observeEvent(input$grid_icon_click, {
-    new_on <- !is_grid_on()
-    is_grid_on(new_on)
+  # Grid overlay on/off is driven explicitly by resolution clicks in the menu
+  # (input$grid_enabled), never by opening the menu.
+  observeEvent(input$grid_enabled, {
+    is_grid_on(isTRUE(input$grid_enabled))
   }, ignoreNULL = TRUE, ignoreInit = TRUE)
 
   observeEvent(
@@ -3209,10 +3219,10 @@ server <- function(input, output, session) {
   output$mun_section_lbl <- renderText({
     lbl <- tolower(input$crime_type %||% "homicide rate")
     if (isTRUE(rv$is_national)) {
-      glue("Top 5 municipalities -- {lbl} (all Mexico)")
+      glue("Top 5 municipalities: {lbl} (all Mexico)")
     } else {
       n <- if (!is.null(rv$mun_df)) nrow(rv$mun_df) else 0
-      glue("Top 5 municipalities -- {lbl} ({n} in selection)")
+      glue("Top 5 municipalities: {lbl} ({n} in selection)")
     }
   })
 
@@ -3446,38 +3456,76 @@ server <- function(input, output, session) {
                     total_label = "Total facilities")
   })
 
-  # Keep all plots/UIs computing even when their parent group is collapsed so
-  # they're ready the moment the user expands the group (no "blank on first
-  # expand"). Cost: a single extra render per session.
-  outputOptions(output, "temporal_pam",    suspendWhenHidden = FALSE)
-  outputOptions(output, "temporal_plot",   suspendWhenHidden = FALSE)
-  outputOptions(output, "temporal_ocved",  suspendWhenHidden = FALSE)
-  outputOptions(output, "temporal_ged",    suspendWhenHidden = FALSE)
-  outputOptions(output, "breakdown_giim",  suspendWhenHidden = FALSE)
-  outputOptions(output, "breakdown_infra", suspendWhenHidden = FALSE)
+  # Keep all panel outputs computing even when their parent accordion group is
+  # collapsed, so they show real values the moment the group is expanded
+  # (otherwise hidden outputs stay suspended and read "---"). Cost: one extra
+  # render per output per session -- negligible (cached strings + small plots).
+  for (.oid in c(
+    "temporal_pam", "temporal_plot", "temporal_ocved", "temporal_ged",
+    "breakdown_giim", "breakdown_infra",
+    "n_incidents", "n_fatalities", "n_graves", "n_facilities", "n_events",
+    "ocved_n", "n_ged", "n_mun", "n_desap", "n_pam", "n_fosas", "n_cuerpos",
+    "sub_incidents", "sub_fatalities", "panel_subtitle", "mun_section_lbl",
+    "mun_list"
+  )) {
+    outputOptions(output, .oid, suspendWhenHidden = FALSE)
+  }
 
   output$dl_xlsx <- downloadHandler(
     filename = function()
       glue("depth_selection_{format(Sys.time(), '%Y%m%d_%H%M%S')}.xlsx"),
+    contentType =
+      "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
     content  = function(file) {
-      if (is.null(rv$dl_list)) {
-        writexl::write_xlsx(list(note = data.frame(note = "No selection made.")),
-                            path = file)
-        return()
+      # writexl only accepts plain atomic-column data frames. A query result
+      # can carry a geometry / WKB blob or a list column, which makes
+      # write_xlsx() throw -- Shiny then serves its HTML error page and the
+      # browser saves that with the .xlsx name. Sanitise every sheet and never
+      # let the content function throw, so the download is always valid xlsx.
+      flatten_df <- function(df) {
+        if (is.null(df)) return(NULL)
+        df <- tryCatch(as.data.frame(df), error = function(e) NULL)
+        if (is.null(df) || nrow(df) == 0) return(NULL)
+        keep <- vapply(df, function(col)
+          is.atomic(col) && !is.list(col), logical(1))
+        df <- df[, keep, drop = FALSE]
+        if (ncol(df) == 0) return(NULL)
+        df
+      }
+      sheets <- tryCatch({
+        if (is.null(rv$dl_list)) {
+          list(note = data.frame(
+            note = "No selection made -- draw an area on the map first."))
+        } else {
+          dl   <- rv$dl_list
+          cand <- list(
+            migrants             = flatten_df(dl$migrants),
+            graves               = flatten_df(dl$graves),
+            support_infra        = flatten_df(dl$infra),
+            violence_ocved       = flatten_df(dl$ocved),
+            conflict_ged         = flatten_df(dl$ged),
+            municipalities_crime = flatten_df(dl$mun)
+          )
+          s <- Filter(function(x) !is.null(x) && nrow(x) > 0, cand)
+          if (length(s) == 0)
+            list(note = data.frame(note = "No features in the selection."))
+          else s
+        }
+      }, error = function(e)
+        list(error = data.frame(
+          error = paste("Could not assemble export:", conditionMessage(e)))))
+
+      ok <- tryCatch({ writexl::write_xlsx(sheets, path = file); TRUE },
+                     error = function(e) {
+                       message("[dl_xlsx] ", conditionMessage(e)); FALSE
+                     })
+      if (!ok) {
+        # Last-resort: a guaranteed-valid one-sheet workbook.
+        writexl::write_xlsx(
+          list(error = data.frame(
+            error = "Export failed -- please retry or report this.")),
+          path = file)
       }
-      dl   <- rv$dl_list
-      keep <- list(
-        migrants             = dl$migrants,
-        graves               = dl$graves,
-        support_infra        = dl$infra,
-        violence_ocved       = dl$ocved,
-        conflict_ged         = dl$ged,
-        municipalities_crime = dl$mun
-      )
-      sheets <- Filter(function(x) !is.null(x) && nrow(x) > 0, keep)
-      if (length(sheets) == 0)
-        sheets <- list(note = data.frame(note = "No features in selection."))
-      writexl::write_xlsx(sheets, path = file)
     }
   )
 }