Upload 2 files

depth_interactive_map_alpha.R

@@ -917,12 +917,12 @@ WEB_SPEC <- list(
     list(id = "pop-choro",       type = "fill",   src = "src_pop_mun",
          geom = "polygon",   color = "pop_qstep", value = "pobtot",
          opacity = 0.7,  visible = FALSE),
-    # patp-choro and pobreza-choro are also GRID-ONLY (joined into grid_unified)
-    list(id = "patp-choro",      type = "fill",   src = NULL,
-         geom = "grid_only", color = "patp_qstep", value = "t_part",
+    # patp-choro and pobreza-choro paint in BOTH modes (mun-level + per-cell)
+    list(id = "patp-choro",      type = "fill",   src = "src_patp",
+         geom = "polygon",   color = "patp_qstep", value = "t_part",
          opacity = 0.7,  visible = FALSE, requires = "dim_patp_mun"),
-    list(id = "pobreza-choro",   type = "fill",   src = NULL,
-         geom = "grid_only", color = "pobreza_qstep", value = "pobreza_pct",
+    list(id = "pobreza-choro",   type = "fill",   src = "src_pobreza",
+         geom = "polygon",   color = "pobreza_qstep", value = "pobreza_pct",
          opacity = 0.7,  visible = FALSE, requires = "dim_pobreza_mun"),
     list(id = "fosas-choro",     type = "fill",   src = "src_fosas",
          geom = "polygon", color = "fosas_step",  value = "fosas_total",
@@ -1021,8 +1021,14 @@ WEB_SPEC <- list(
            legend = list(type = "cats", pal = "infra_cats", filterable = "infra")),
       list(kind = "layer", value = "patp-choro",
            label = "PATP-CONEVAL municipal indicators",
-           tooltip = "Multi-dimensional CONEVAL PATP indicators by municipality. Numeric sub-types render as a percentile choropleth; categorical sub-types (rural problem / crime focus) render with a fixed palette. Enable the grid view to see this layer.",
-           legend = list(type = "ramp", pal = "patp", unit = "")),
+           tooltip = "Multi-dimensional CONEVAL PATP indicators. Numeric chips render as percentile choropleths; categorical chips (rural problem / crime focus) render with a fixed palette. Works both at municipal level and on the grid.",
+           legend = list(type = "ramp", pal = "patp", unit = ""),
+           # Variant legends shown when the matching categorical chip is active.
+           # data-variant-key on each wrap is matched by setPATPType in JS.
+           legend_extras = list(
+             pr_pred_loc_rur  = list(type = "cats", pal = "patp_rural"),
+             delitos_fc_b_j_a = list(type = "cats", pal = "patp_delito")
+           )),
       list(kind = "radios", group = "patp"),
       list(kind = "layer", value = "pobreza-choro",
            label = "Poverty (CONEVAL 2020)",
@@ -1353,14 +1359,59 @@ LUCIDE_JS <- tags$head(
       });
       // Sync legend visibility: use class so CSS controls display type per legend shape
       document.querySelectorAll('.acc-item-wrap').forEach(function(wrap) {
-        var input  = wrap.querySelector('.acc-toggle-input');
-        var legend = wrap.querySelector('.acc-legend');
-        if (legend) legend.classList.toggle('legend-visible', !!(input && input.checked));
+        var input    = wrap.querySelector('.acc-toggle-input');
+        var isOn     = !!(input && input.checked);
+        var primary  = wrap.querySelector(':scope > .acc-legend');
+        if (primary) primary.classList.toggle('legend-visible', isOn);
+        // Variant legends (categorical chips) -- gate visibility on toggle ON
+        wrap.querySelectorAll(':scope > .acc-legend-extra').forEach(function(v) {
+          v.classList.toggle('legend-visible', isOn);
+        });
       });
+      // Re-apply the active-variant marker so the right extras stay visible.
+      if (typeof refreshLegendVariants === 'function') refreshLegendVariants();
       if (typeof Shiny !== 'undefined')
         Shiny.setInputValue('active_layers', checked, { priority: 'event' });
     }
 
+    // Selects which legend variant is visible for each layer family. Called
+    // by setPATPType / setPobrezaType after they update window state, and
+    // also by updateActiveLayers when the layer toggle flips.
+    var _activeVariants = { patp: 'numeric', pobreza: 'numeric' };
+    var PATP_NUMERIC    = ['t_part','t_ocup','pr','ind_conec'];
+    var POBREZA_NUMERIC = ['pobreza_pct','pobreza_ext_pct'];
+
+    function _variantKeyFor(group, type) {
+      if (group === 'patp')    return PATP_NUMERIC.indexOf(type)    !== -1 ? 'numeric' : type;
+      if (group === 'pobreza') return POBREZA_NUMERIC.indexOf(type) !== -1 ? 'numeric' : type;
+      return type;
+    }
+
+    function refreshLegendVariants() {
+      ['patp','pobreza'].forEach(function(group) {
+        var key = _activeVariants[group] || 'numeric';
+        // Primary legend stays visible when the active key is 'numeric'.
+        document.querySelectorAll(
+          '.acc-item-wrap > .acc-legend:not(.acc-legend-extra)'
+        ).forEach(function(primary) {
+          var wrap = primary.parentElement;
+          if (!wrap) return;
+          var extras = wrap.querySelectorAll('.acc-legend-extra[data-variant-group=\"' + group + '\"]');
+          if (!extras.length) return;   // Not a variant-bearing layer
+          primary.classList.toggle('acc-legend-hidden-by-variant', key !== 'numeric');
+        });
+        // Each extra is marked is-active-variant only if its key matches.
+        document.querySelectorAll(
+          '.acc-legend-extra[data-variant-group=\"' + group + '\"]'
+        ).forEach(function(extra) {
+          extra.classList.toggle(
+            'is-active-variant',
+            extra.dataset.variantKey === key
+          );
+        });
+      });
+    }
+
     function setCrimeType(type) {
       if (typeof Shiny !== 'undefined')
         Shiny.setInputValue('crime_type', type, { priority: 'event' });
@@ -1399,6 +1450,8 @@ LUCIDE_JS <- tags$head(
       document.querySelectorAll('.patp-radio').forEach(function(r) {
         r.classList.toggle('active', r.dataset.value === type);
       });
+      _activeVariants.patp = _variantKeyFor('patp', type);
+      refreshLegendVariants();
     }
 
     function setPobrezaType(type) {
@@ -1407,6 +1460,8 @@ LUCIDE_JS <- tags$head(
       document.querySelectorAll('.pobreza-radio').forEach(function(r) {
         r.classList.toggle('active', r.dataset.value === type);
       });
+      _activeVariants.pobreza = _variantKeyFor('pobreza', type);
+      refreshLegendVariants();
     }
 
     function toggleStylePicker() {
@@ -1809,7 +1864,8 @@ acc_group <- function(id, label, items_list, open = TRUE) {
   )
 }
 
-acc_layer <- function(value, label, tooltip = NULL, legend = NULL, checked = FALSE) {
+acc_layer <- function(value, label, tooltip = NULL, legend = NULL, checked = FALSE,
+                      legend_extras = NULL) {
   div(class = "acc-item-wrap",
     div(class = "acc-item",
       tags$label(class = "acc-toggle-label",
@@ -1834,10 +1890,29 @@ acc_layer <- function(value, label, tooltip = NULL, legend = NULL, checked = FAL
           HTML('<i data-lucide="info" style="width:12px;height:12px;stroke-width:2.5;color:var(--c-text-mid)"></i>')
         )
     ),
-    if (!is.null(legend)) legend
+    if (!is.null(legend)) legend,
+    if (!is.null(legend_extras)) legend_extras
   )
 }
 
+# Renders zero or more "variant" legends -- shown when a categorical sub-type
+# chip is active. Each wrapper carries data-variant-group (the layer family,
+# e.g. "patp") and data-variant-key (the sub-type identifier). The matching JS
+# setPATPType / setPobrezaType swaps which one is visible.
+acc_legend_extras_from_spec <- function(extras, group) {
+  if (is.null(extras) || length(extras) == 0) return(NULL)
+  tagList(lapply(names(extras), function(key) {
+    inner <- acc_legend_from_spec(extras[[key]])
+    if (is.null(inner)) return(NULL)
+    tags$div(
+      class                = "acc-legend-extra",
+      `data-variant-group` = group,
+      `data-variant-key`   = key,
+      inner
+    )
+  }))
+}
+
 acc_legend_ramp <- function(pal, lo = "Low", hi = "High") {
   stops <- paste(pal, collapse = ", ")
   HTML(paste0(
@@ -2073,9 +2148,12 @@ render_accordion <- function() {
         soon   = acc_soon_item(it$label),
         radios = acc_radios_from_spec(it$group),
         layer  = acc_layer(it$value, it$label,
-                   tooltip = it$tooltip,
-                   legend  = acc_legend_from_spec(it$legend),
-                   checked = isTRUE(it$checked))
+                   tooltip       = it$tooltip,
+                   legend        = acc_legend_from_spec(it$legend),
+                   legend_extras = acc_legend_extras_from_spec(
+                                     it$legend_extras,
+                                     group = sub("-.*", "", it$value %||% "")),
+                   checked       = isTRUE(it$checked))
       )
     })
     acc_group(grp$id, grp$label, tagList(items), open = isTRUE(grp$open))
@@ -2614,7 +2692,7 @@ server <- function(input, output, session) {
     state = FALSE, routes = FALSE, via = FALSE,
     migrants = FALSE, graves = FALSE, infra = FALSE,
     ocved = FALSE, ged = FALSE,
-    pop = FALSE,
+    pop = FALSE, patp = FALSE, pobreza = FALSE,
     grid4 = FALSE, grid5 = FALSE, grid6 = FALSE
   )
 
@@ -2802,9 +2880,8 @@ server <- function(input, output, session) {
       "remesas-choro"  = isTRUE(lazy_added$remesas),
       "pam-choro"      = isTRUE(lazy_added$pam),
       "pop-choro"      = isTRUE(lazy_added$pop),
-      # patp / pobreza remain grid-only -- no mun-level layer to gate.
-      "patp-choro"     = FALSE,
-      "pobreza-choro"  = FALSE,
+      "patp-choro"     = isTRUE(lazy_added$patp),
+      "pobreza-choro"  = isTRUE(lazy_added$pobreza),
       "fosas-choro"    = isTRUE(lazy_added$fosas),
       "envipe-state"   = isTRUE(lazy_added$state),
       "routes-lines"   = isTRUE(lazy_added$routes),
@@ -2863,6 +2940,23 @@ server <- function(input, output, session) {
       )
     }
 
+    # Sync patp fill color when grid is OFF. Mun-level src_patp has all 6
+    # sub-type columns; patp_grid_expr picks step (numeric) or match (cat).
+    if (!grid_on && "patp-choro" %in% active && layer_ready("patp-choro")) {
+      prx <- prx |> set_paint_property(
+        "patp-choro", "fill-color",
+        patp_grid_expr(patp_type)
+      )
+    }
+
+    # Sync pobreza fill color when grid is OFF.
+    if (!grid_on && "pobreza-choro" %in% active && layer_ready("pobreza-choro")) {
+      prx <- prx |> set_paint_property(
+        "pobreza-choro", "fill-color",
+        pobreza_grid_expr(pobreza_type)
+      )
+    }
+
     for (lid in NON_GRID_LAYERS) {
       if (!layer_ready(lid)) next
       prx <- prx |> set_layout_property(
@@ -3524,6 +3618,23 @@ server <- function(input, output, session) {
                            "<br>Total pop (CPV): ", list("to-string", list("get","pobtot")),
                            "<br>Born abroad: ",     list("to-string", list("get","pnacop")),
                            "<br>Resident abroad 2015: ", list("to-string", list("get","presop2015")))))
+      if (!grid_on && "patp-choro"    %in% active && has_patp_tbl)
+        lazy_add_fill("patp",    "src_patp", "patp-choro",       function(prx, d)
+          prx |> add_fill_layer("patp-choro",    source = d,
+            fill_color = patp_grid_expr("t_part"), fill_opacity = 0.7,
+            tooltip = list("concat", "<b>", list("get","municipio"), "</b>",
+                           "<br>Participation: ",   list("to-string", list("get","t_part")), "%",
+                           "<br>Occupation: ",      list("to-string", list("get","t_ocup")), "%",
+                           "<br>Connectivity: ",    list("to-string", list("get","ind_conec")),
+                           "<br>Rural problem: ",   list("get","pr_pred_loc_rur"),
+                           "<br>Crime focus: ",     list("get","delitos_fc_b_j_a"))))
+      if (!grid_on && "pobreza-choro" %in% active && has_pobreza_tbl)
+        lazy_add_fill("pobreza", "src_pobreza", "pobreza-choro", function(prx, d)
+          prx |> add_fill_layer("pobreza-choro", source = d,
+            fill_color = pobreza_grid_expr("pobreza_pct"), fill_opacity = 0.7,
+            tooltip = list("concat", "<b>", list("get","municipio"), "</b>",
+                           "<br>Poverty: ",         list("to-string", list("get","pobreza_pct")), "%",
+                           "<br>Extreme poverty: ", list("to-string", list("get","pobreza_ext_pct")), "%")))
       if (!grid_on && "fosas-choro"   %in% active && has_fosas_tbl)
         lazy_add_fill("fosas",   "src_fosas",   "fosas-choro",   function(prx, d)
           prx |> add_fill_layer("fosas-choro",   source = d,

styles.css

@@ -2432,3 +2432,34 @@ button.mapbox-gl-draw_uncombine { display: none !important; }
 
 /* Tooltip toggle: hide maplibre popups when body.tooltips-off is set */
 body.tooltips-off .maplibregl-popup { display: none !important; }
+
+/* =========================================================================
+   Categorical legend variants (patp: rural problem / crime focus)
+   ========================================================================= */
+
+/* Variant wrappers hidden by default; shown only when the matching chip is
+   active (is-active-variant) AND the layer toggle is on (legend-visible). */
+.acc-legend-extra {
+  display: none;
+  padding: 2px var(--space-3) 6px calc(var(--space-3) + 34px);
+}
+.acc-legend-extra.is-active-variant.legend-visible {
+  display: block;
+}
+.acc-legend-extra.is-active-variant.legend-visible .acc-legend-cats {
+  display: flex;
+}
+/* The inner legend re-renders the standard .acc-legend stack, so override the
+   nested margin/padding it gets from being inside a wrapper. */
+.acc-legend-extra .acc-legend {
+  padding: 0;
+  display: block;
+}
+.acc-legend-extra .acc-legend.acc-legend-cats {
+  display: flex;
+}
+
+/* When an extra is active, hide the primary ramp legend for the same layer. */
+.acc-legend.acc-legend-hidden-by-variant {
+  display: none !important;
+}