Upload 2 files

depth_interactive_map_alpha.R

@@ -107,12 +107,44 @@ GRAVES_PAL   <- c("#fee5d9", "#fcae91", "#fb6a4a",
                   "#de2d26", "#a50f15", "#67000d")                # Reds 6
 INFRA_PAL    <- c("#ffffe5", "#f7fcb9", "#d9f0a3",
                   "#addd8e", "#78c679", "#238443")                # YlGn 6
-OCVED_PAL    <- c("#feedde", "#fdbe85", "#fd8d3c",
-                  "#e6550d", "#a63603", "#7f2704")                # Oranges 6
+OCVED_PAL    <- c("#f1eef6", "#d0d1e6", "#a6bddb",
+                  "#67a9cf", "#2b8cbe", "#045a8d")                # PuBu 6
 GED_PAL      <- c("#f1eef6", "#d0d1e6", "#a6bddb",
                   "#67a9cf", "#2b8cbe", "#045a8d")                # PuBu 6
 FOSAS_PAL    <- c("#ffffd4", "#fee391", "#fec44f",
                   "#fe9929", "#d95f0e", "#993404")                # YlOrBr 6
+POP_PAL      <- c("#f7fcf0", "#e0f3db", "#ccebc5",
+                  "#a8ddb5", "#7bccc4", "#4eb3d3",
+                  "#2b8cbe")                                       # GnBu 7 (Exposure)
+PATP_PAL     <- c("#fff7f3", "#fde0dd", "#fcc5c0",
+                  "#fa9fb5", "#f768a1", "#c51b8a")                # RdPu 6 (Vulnerability)
+POBREZA_PAL  <- c("#feebe2", "#fbb4b9", "#f768a1",
+                  "#c51b8a", "#7a0177", "#49006a")                # RdPu 6 (deep, poverty)
+
+# Categorical palettes for the two non-numeric patp sub-types. Stable colour-blind
+# safe Set2-style hues; keys must match the truncated label list in setPATPType().
+PATP_RURAL_PROBLEM_PAL <- c(
+  "Sociales y económicos"                                       = "#66c2a5",
+  "Carencia o deficiencia en servicios básicos"                 = "#fc8d62",
+  "Caminos, transportes y telecomunicaciones"                        = "#8da0cb",
+  "Inseguridad, delincuencia y adicciones"                           = "#e78ac3",
+  "Carencia o deficiencia en la infraestructura educativa y de salud"= "#a6d854",
+  "Municipios sin localidades objetivo"                              = "#ffd92f",
+  "Sin problema"                                                     = "#e5c494",
+  "Falta de información / Otro problema"                        = "#b3b3b3",
+  "Riesgos ambientales"                                              = "#1f78b4",
+  "Problema no definido"                                             = "#cab2d6"
+)
+PATP_DELITO_PAL <- c(
+  "El patrimonio"                      = "#e41a1c",
+  "otros bienes"                       = "#377eb8",
+  "La vida y la Integridad corporal"   = "#4daf4a",
+  "múltiples bienes"               = "#984ea3",
+  "La familia"                         = "#ff7f00",
+  "Sin delito"                         = "#a6cee3",
+  "La libertad y la seguridad sexual"  = "#b15928",
+  "Libertad personal"                  = "#6a3d9a"
+)
 
 # Infrastructure point categories -- grouped from the raw "category" field
 # (Shelter / restaurant / Government / lodging / Legal/NGO / Food / charity /
@@ -149,13 +181,16 @@ GRID_LAYER_CFG <- list(
   "fosas-choro"   = "fosas",
   "remesas-choro" = "remesas",
   "pam-choro"     = "pam",
+  "envipe-state"  = "envipe",   # ENVIPE now also paints per grid cell
+  "pop-choro"     = "pop",
   "migrants-pts"  = "migrants",
   "graves-pts"    = "graves",
   "infra-pts"     = "infra",
   "ocved-pts"     = "ocved",
   "ged-pts"       = "ged"
 )
-NON_GRID_LAYERS <- c("envipe-state", "routes-lines", "viaferrea-lines")
+# envipe-state is no longer a NON_GRID_LAYER -- it now appears on the grid too.
+NON_GRID_LAYERS <- c("routes-lines", "viaferrea-lines")
 
 ENVIPE_COLS <- list(
   "insecurity"   = list(col = "insecurity_perc",   breaks = c(40, 55, 65, 75, 85)),
@@ -300,6 +335,49 @@ WEB_SQL_TEMPLATES <- list(
                 FROM dim_pam_mun GROUP BY CVEGEO) p
        ON c.CVEGEO = p.CVEGEO",
 
+  src_population =
+    "SELECT municipio, entidad, CVEGEO,
+            CAST(poblacion AS DOUBLE) AS poblacion,
+            wkt
+     FROM crime_mun
+     WHERE poblacion IS NOT NULL",
+
+  # patp: dim_patp_mun stores numeric values as VARCHAR; TRY_CAST converts
+  # the 'n.d.' sentinels (and other non-numeric strings) to NULL.
+  src_patp =
+    "SELECT c.municipio, c.entidad, c.CVEGEO,
+            TRY_CAST(p.t_part AS DOUBLE) AS t_part,
+            TRY_CAST(p.t_ocup AS DOUBLE) AS t_ocup,
+            TRY_CAST(p.pr     AS DOUBLE) AS pr,
+            CAST(p.ind_conec  AS DOUBLE) AS ind_conec,
+            p.pr_pred_loc_rur,
+            p.delitos_fc_b_j_a,
+            c.wkt
+     FROM crime_mun c
+     LEFT JOIN dim_patp_mun p ON c.CVEGEO = p.CVEGEO",
+
+  src_pobreza =
+    "SELECT c.municipio, c.entidad, c.CVEGEO,
+            CAST(pob.pobreza_pct            AS DOUBLE) AS pobreza_pct,
+            CAST(pob.pobreza_ext_pct        AS DOUBLE) AS pobreza_ext_pct,
+            CAST(pob.pobreza_mod_pct        AS DOUBLE) AS pobreza_mod_pct,
+            CAST(pob.vul_carencia_pct       AS DOUBLE) AS vul_carencia_pct,
+            CAST(pob.vul_ingreso_pct        AS DOUBLE) AS vul_ingreso_pct,
+            CAST(pob.no_pobre_no_vul_pct    AS DOUBLE) AS no_pobre_no_vul_pct,
+            CAST(pob.rezago_edu_pct         AS DOUBLE) AS rezago_edu_pct,
+            CAST(pob.caren_salud_pct        AS DOUBLE) AS caren_salud_pct,
+            CAST(pob.caren_seg_social_pct   AS DOUBLE) AS caren_seg_social_pct,
+            CAST(pob.caren_vivienda_pct     AS DOUBLE) AS caren_vivienda_pct,
+            CAST(pob.caren_serv_basicos_pct AS DOUBLE) AS caren_serv_basicos_pct,
+            CAST(pob.caren_alimentacion_pct AS DOUBLE) AS caren_alimentacion_pct,
+            CAST(pob.min_1_carencia_pct     AS DOUBLE) AS min_1_carencia_pct,
+            CAST(pob.min_3_carencias_pct    AS DOUBLE) AS min_3_carencias_pct,
+            CAST(pob.ing_inf_lp_pct         AS DOUBLE) AS ing_inf_lp_pct,
+            CAST(pob.ing_inf_lpe_pct        AS DOUBLE) AS ing_inf_lpe_pct,
+            c.wkt
+     FROM crime_mun c
+     LEFT JOIN dim_pobreza_mun pob ON c.CVEGEO = pob.CVEGEO",
+
   src_fosas =
     "SELECT c.municipio, c.entidad, c.CVEGEO,
             COALESCE(CAST(f.fosas_total   AS INTEGER), 0) AS fosas_total,
@@ -498,9 +576,12 @@ web_sql_grid_unified <- function(niv, has_fosas, limit = NULL, simplify_tol = 0.
               CAST(c.secuestro       AS DOUBLE) AS secuestro,
               CAST(c.trafico_menores AS DOUBLE) AS trafico_menores,
               CAST(c.trata_personas  AS DOUBLE) AS trata_personas,
+              CAST(c.poblacion       AS DOUBLE) AS poblacion,
               COALESCE(CAST(d.desap_rate AS DOUBLE), 0) AS desap_per_100k{fosas_cols},
               COALESCE(r.giim_mun, 'No aplica')           AS giim_mun,
               COALESCE(CAST(p.pam_total AS INTEGER), 0)   AS pam_n,
+              CAST(s.perception_insecurity_perc AS DOUBLE) AS insecurity_perc,
+              CAST(s.dark_figures_perc          AS DOUBLE) AS dark_figures_perc,
               COALESCE(pts.migrants_n, 0)                 AS migrants_n,
               COALESCE(pts.graves_n,   0)                 AS graves_n,
               COALESCE(pts.ocved_n,    0)                 AS ocved_n,
@@ -511,6 +592,7 @@ web_sql_grid_unified <- function(niv, has_fosas, limit = NULL, simplify_tol = 0.
        LEFT JOIN {desap_sub}     d   ON g.CVEGEO = d.CVEGEO{fosas_join}
        LEFT JOIN dim_remesas_mun r   ON g.CVEGEO = r.CVEGEO
        LEFT JOIN {pam_sub}       p   ON g.CVEGEO = p.CVEGEO
+       LEFT JOIN state_polygons  s   ON s.CVE_ENT = SUBSTR(g.CVEGEO, 1, 2)
        LEFT JOIN pts_src         pts ON g.codigo = pts.codigo{limit_clause}"
   )
 }
@@ -580,7 +662,8 @@ ddb_minmax <- function(con, tbl, col, filter_zero = TRUE) {
       crime = lapply(CRIME_COLS, function(info)
         qbq("crime_mun", info$col, length(CRIME_STEP_PAL))),
       desap = qbq("dim_desap_mun", "final_desap_nl_per_100k", length(DESAP_PAL)),
-      pam   = qbq("dim_pam_mun",   "pam_n",                   length(PAM_PAL))
+      pam   = qbq("dim_pam_mun",   "pam_n",                   length(PAM_PAL)),
+      pop   = qbq("crime_mun",     "poblacion",               length(POP_PAL))
     ),
     # Actual min/max per layer's primary column -- powers the legend labels.
     # Dynamic sub-types (crime/envipe/fosas) cache the DEFAULT sub-type only;
@@ -589,6 +672,7 @@ ddb_minmax <- function(con, tbl, col, filter_zero = TRUE) {
       crime  = ddb_minmax(con, "crime_mun",      "homicidio",                  TRUE),
       desap  = ddb_minmax(con, "dim_desap_mun",  "final_desap_nl_per_100k",    TRUE),
       pam    = ddb_minmax(con, "dim_pam_mun",    "pam_n",                      TRUE),
+      pop    = ddb_minmax(con, "crime_mun",      "poblacion",                  TRUE),
       fosas  = ddb_minmax(con, "dim_fosas_mun",  "fosas_total",                TRUE),
       envipe = ddb_minmax(con, "state_polygons", "perception_insecurity_perc", FALSE)
     )
@@ -685,7 +769,8 @@ WEB_SPEC <- list(
     migrants = MIGRANTS_PAL,   graves = GRAVES_PAL, infra = INFRA_PAL,
     ocved    = OCVED_PAL,      ged = GED_PAL,
     giim     = GIIM_COLORS,    bar_ramp = BAR_RAMP,
-    infra_cats = INFRA_CATS
+    infra_cats = INFRA_CATS,
+    pop      = POP_PAL
   ),
 
   crime_cols  = CRIME_COLS,
@@ -718,6 +803,9 @@ WEB_SPEC <- list(
     list(id = "pam-choro",       type = "fill",   src = "src_pam",
          geom = "polygon", color = "pam_qstep",   value = "pam_n",
          opacity = 0.7,  visible = FALSE),
+    list(id = "pop-choro",       type = "fill",   src = "src_population",
+         geom = "polygon", color = "pop_qstep",   value = "poblacion",
+         opacity = 0.7,  visible = FALSE),
     list(id = "fosas-choro",     type = "fill",   src = "src_fosas",
          geom = "polygon", color = "fosas_step",  value = "fosas_total",
          opacity = 0.65, visible = FALSE, requires = "dim_fosas_mun"),
@@ -802,7 +890,13 @@ WEB_SPEC <- list(
            label = "Railway network",
            tooltip = "Railway lines used by migrants, including freight routes known as 'La Bestia'.",
            legend = list(type = "line", color = "#9E2A3A", label = "Railway", dashed = TRUE)),
-      list(kind = "soon", label = "Foreign population")
+      list(kind = "layer", value = "pop-choro",
+           label = "Municipal population (CONAPO 2020)",
+           tooltip = "Estimated total population per municipality (CONAPO 2020 projection). Higher values shown in deeper blue-green.",
+           legend = list(type = "ramp", pal = "pop", unit = " people")),
+      list(kind = "soon", label = "Foreign population"),
+      list(kind = "soon", label = "PATP indicators (t_ocup, t_part, pr, ind_conec, pr_pred_loc_rur, delitos_fc_b_j_a)"),
+      list(kind = "soon", label = "CONEVAL pobreza indicators (16 %-cols)")
     )),
     list(id = "vulnerability", label = "Vulnerability", open = FALSE, items = list(
       list(kind = "layer", value = "infra-pts",
@@ -1233,6 +1327,29 @@ LUCIDE_JS <- tags$head(
       }
     }
 
+    // -- Map hover-tooltip on/off ----------------------------------------------
+    // Hides the maplibre popup that mapgl attaches to layers with tooltip = ...
+    // Visual-only: layers stay interactive (click, draw, etc.); only the hover
+    // text is suppressed via CSS when 'tooltips-off' is set on <body>.
+    function toggleMapTooltips() {
+      var on = !document.body.classList.contains('tooltips-off');
+      document.body.classList.toggle('tooltips-off', on);
+      var btn = document.getElementById('tooltip-toggle-btn');
+      if (btn) {
+        btn.classList.toggle('active', !on);
+        btn.setAttribute('aria-pressed', String(!on));
+        btn.setAttribute('title', on ? 'Tooltips off (click to enable)' : 'Tooltips on (click to disable)');
+        var icon = btn.querySelector('i');
+        if (icon) icon.setAttribute('data-lucide', on ? 'message-square-off' : 'message-square');
+        if (window.lucide) lucide.createIcons();
+      }
+      // Force-hide any popup that's currently open
+      document.querySelectorAll('.maplibregl-popup').forEach(function(p) {
+        if (on) p.style.display = 'none';
+        else    p.style.display = '';
+      });
+    }
+
     // -- Side panel toggle (sigma / network / sparkles tab rail) ---------------
     function togglePanel(name) {
       var panel = document.getElementById('panel-' + name);
@@ -2027,6 +2144,15 @@ ui <- page_fillable(
                    title        = "Toggle 2D / 3D",
                    HTML('<i data-lucide="box" style="width:16px;height:16px;stroke-width:2"></i>')),
 
+      # Tooltip on/off toggle -- hides the map hover popup when disabled
+      tags$button(id = "tooltip-toggle-btn", class = "nav-btn active",
+                  type = "button",
+                  onclick      = "toggleMapTooltips()",
+                  `aria-label` = "Toggle map hover tooltips",
+                  `aria-pressed` = "true",
+                  title        = "Tooltips on (click to disable)",
+                  HTML('<i data-lucide="message-square" style="width:16px;height:16px;stroke-width:2" aria-hidden="true"></i>')),
+
       # Guided tour replay
       tags$button(class = "nav-btn", type = "button",
                   onclick      = "startTour()",
@@ -2305,6 +2431,7 @@ server <- function(input, output, session) {
     state = FALSE, routes = FALSE, via = FALSE,
     migrants = FALSE, graves = FALSE, infra = FALSE,
     ocved = FALSE, ged = FALSE,
+    pop = FALSE,
     grid4 = FALSE, grid5 = FALSE, grid6 = FALSE
   )
 
@@ -2417,14 +2544,30 @@ server <- function(input, output, session) {
     count_step_expr("pam_n", breaks, PAM_PAL)
   }
 
+  pop_qstep_expr <- function() {
+    breaks <- qb$pop %||% c(5000, 25000, 100000, 250000, 500000, 1000000)
+    step_expr("poblacion", breaks, POP_PAL)
+  }
+
+  # Envipe on the GRID: each grid cell carries its containing state's
+  # insecurity_perc / dark_figures_perc (joined via SUBSTR(CVEGEO, 1, 2) on the
+  # grid query). The sub-type radio swaps the column the step expression reads.
+  envipe_grid_expr <- function(envipe_type = "insecurity") {
+    info <- ENVIPE_COLS[[envipe_type]] %||% ENVIPE_COLS[["insecurity"]]
+    step_expr(info$col, info$breaks, ENVIPE_PAL)
+  }
+
   # Return the fill-color expression for a given original layer ID
-  grid_color_expr <- function(orig_lid, crime_type, fosas_type = "fosas") {
+  grid_color_expr <- function(orig_lid, crime_type, fosas_type = "fosas",
+                              envipe_type = "insecurity") {
     switch(orig_lid,
       "crime-choro"   = crime_qstep_expr(crime_type),
       "desap-choro"   = desap_qstep_expr(),
       "fosas-choro"   = fosas_step_expr(fosas_type),
       "remesas-choro" = giim_match_expr(),
       "pam-choro"     = pam_qstep_expr(),
+      "pop-choro"     = pop_qstep_expr(),
+      "envipe-state"  = envipe_grid_expr(envipe_type),
       "migrants-pts"  = count_step_expr("migrants_n", c(1, 5, 20, 50, 100),  MIGRANTS_PAL),
       "graves-pts"    = count_step_expr("graves_n",   c(1, 2, 5, 15, 30),    GRAVES_PAL),
       "infra-pts"     = count_step_expr("infra_n",    c(1, 3, 8, 20, 50),    INFRA_PAL),
@@ -2442,6 +2585,7 @@ server <- function(input, output, session) {
       "desap-choro"    = isTRUE(lazy_added$desap),
       "remesas-choro"  = isTRUE(lazy_added$remesas),
       "pam-choro"      = isTRUE(lazy_added$pam),
+      "pop-choro"      = isTRUE(lazy_added$pop),
       "fosas-choro"    = isTRUE(lazy_added$fosas),
       "envipe-state"   = isTRUE(lazy_added$state),
       "routes-lines"   = isTRUE(lazy_added$routes),
@@ -2520,7 +2664,7 @@ server <- function(input, output, session) {
         show    <- grid_on && orig_lid %in% active && niv == nivel
         prx     <- prx |> set_paint_property(grid_id, "fill-opacity", if (show) 0.65 else 0)
         if (show) {
-          expr <- grid_color_expr(orig_lid, crime_type, fosas_type)
+          expr <- grid_color_expr(orig_lid, crime_type, fosas_type, envipe_type)
           if (!is.null(expr))
             prx <- prx |> set_paint_property(grid_id, "fill-color", expr)
         }
@@ -2765,6 +2909,15 @@ server <- function(input, output, session) {
         fill_opacity = 0, tooltip = grid_tooltip) |>
       add_fill_layer(id = paste0("grid-ged-n",      niv), source = src,
         fill_color = count_step_expr("ged_n",      c(1, 3, 10, 30, 80),   GED_PAL),
+        fill_opacity = 0, tooltip = grid_tooltip) |>
+      # Population per grid cell -- breaks come from cached crime_mun.poblacion quantiles
+      add_fill_layer(id = paste0("grid-pop-n",      niv), source = src,
+        fill_color = pop_qstep_expr(),
+        fill_opacity = 0, tooltip = grid_tooltip) |>
+      # ENVIPE on grid -- each cell carries its state's insecurity_perc (from
+      # the JOIN on state_polygons by CVE_ENT in web_sql_grid_unified).
+      add_fill_layer(id = paste0("grid-envipe-n",   niv), source = src,
+        fill_color = envipe_grid_expr("insecurity"),
         fill_opacity = 0, tooltip = grid_tooltip)
     m
   }
@@ -3106,6 +3259,12 @@ server <- function(input, output, session) {
             fill_color = pam_qstep_expr(), fill_opacity = 0.7,
             tooltip = list("concat", "<b>", list("get","municipio"), "</b>",
                            "<br>Irregular migration events: ", list("to-string", list("get","pam_n")))))
+      if (!grid_on && "pop-choro"     %in% active)
+        lazy_add_fill("pop",     "src_population", "pop-choro",  function(prx, d)
+          prx |> add_fill_layer("pop-choro",     source = d,
+            fill_color = pop_qstep_expr(), fill_opacity = 0.7,
+            tooltip = list("concat", "<b>", list("get","municipio"), "</b>",
+                           "<br>Population: ", list("to-string", list("get","poblacion")))))
       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,
@@ -3117,7 +3276,7 @@ server <- function(input, output, session) {
         lazy_add_fill("state",   "src_state",   "envipe-state",  function(prx, d)
           prx |> add_fill_layer("envipe-state",  source = d,
             fill_color = step_expr("insecurity_perc", c(40,55,65,75,85), ENVIPE_PAL),
-            fill_opacity = 0.6,
+            fill_opacity = 0.5,
             tooltip = list("concat", "<b>", list("get","desc_entidad"), "</b>",
                            "<br>Insecurity: ", list("to-string", list("get","insecurity_perc")), "%",
                            "<br>Dark figures: ", list("to-string", list("get","dark_figures_perc")), "%")))

styles.css

@@ -2429,3 +2429,6 @@ button.mapbox-gl-draw_uncombine { display: none !important; }
 .driver-popover .driver-popover-close-btn {
   color: var(--c-text-dim);
 }
+
+/* Tooltip toggle: hide maplibre popups when body.tooltips-off is set */
+body.tooltips-off .maplibregl-popup { display: none !important; }