Upload depth_interactive_map_alpha.R

depth_interactive_map_alpha.R

@@ -183,6 +183,8 @@ GRID_LAYER_CFG <- list(
   "pam-choro"     = "pam",
   "envipe-state"  = "envipe",   # ENVIPE now also paints per grid cell
   "pop-choro"     = "pop",
+  "patp-choro"    = "patp",
+  "pobreza-choro" = "pobreza",
   "migrants-pts"  = "migrants",
   "graves-pts"    = "graves",
   "infra-pts"     = "infra",
@@ -202,6 +204,43 @@ FOSAS_COLS <- list(
   "cuerpos" = list(col = "cuerpos_total", breaks = c(1, 10, 30, 80, 200))
 )
 
+# CPV 2020 population sub-types -- per grid cell (codigo + nivel).
+# Breaks chosen on observed niv=4..8 ranges; map at any nivel is readable.
+POP_COLS <- list(
+  "POBTOT"     = list(col = "pobtot",     label = "Total population",
+                      breaks = c(100, 1000, 5000, 25000, 100000, 500000)),
+  "PNACOP"     = list(col = "pnacop",     label = "Born abroad",
+                      breaks = c(5, 25, 100, 500, 2500, 10000)),
+  "PRESOP2015" = list(col = "presop2015", label = "Resident abroad (2015)",
+                      breaks = c(2, 10, 50, 250, 1000, 5000))
+)
+
+# PATP sub-types (kind controls paint family: "num" = step, "cat" = match).
+PATP_COLS <- list(
+  "t_part"     = list(col = "t_part",     kind = "num", label = "Participation rate",
+                      breaks = c(35, 45, 50, 55, 60, 70)),
+  "t_ocup"     = list(col = "t_ocup",     kind = "num", label = "Occupation rate",
+                      breaks = c(92, 95, 97, 98, 99, 99.5)),
+  "pr"         = list(col = "pr",         kind = "num", label = "PR indicator",
+                      breaks = c(0.5, 2, 5, 10, 25, 50)),
+  "ind_conec"  = list(col = "ind_conec",  kind = "num", label = "Connectivity index",
+                      breaks = c(0.15, 0.25, 0.35, 0.45, 0.6, 0.75)),
+  "pr_pred_loc_rur"  = list(col = "pr_pred_loc_rur",  kind = "cat",
+                            label = "Predominant rural problem",
+                            palette = "patp_rural"),
+  "delitos_fc_b_j_a" = list(col = "delitos_fc_b_j_a", kind = "cat",
+                            label = "Common-jurisdiction crime focus",
+                            palette = "patp_delito")
+)
+
+# Pobreza (CONEVAL) -- only the 2 the user asked for in this round.
+POBREZA_COLS <- list(
+  "pobreza_pct"     = list(col = "pobreza_pct",     label = "Poverty (%)",
+                           breaks = c(20, 35, 50, 65, 80, 90)),
+  "pobreza_ext_pct" = list(col = "pobreza_ext_pct", label = "Extreme poverty (%)",
+                           breaks = c(2, 5, 10, 20, 35, 55))
+)
+
 #######################################################################################
 # WEB_SQL -- canonical query templates (single source for Shiny + docs converter)
 #   Static templates use {placeholder} tokens substituted by web_sql().
@@ -335,13 +374,6 @@ 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 =
@@ -576,24 +608,41 @@ 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,
+              -- CPV 2020 per-cell population (joined by codigo + nivel); -6 is
+              -- INEGI's confidentiality suppression marker, normalised to NULL.
+              CASE WHEN cpv.pobtot     < 0 THEN NULL ELSE CAST(cpv.pobtot     AS DOUBLE) END AS pobtot,
+              CASE WHEN cpv.pnacop     < 0 THEN NULL ELSE CAST(cpv.pnacop     AS DOUBLE) END AS pnacop,
+              CASE WHEN cpv.presop2015 < 0 THEN NULL ELSE CAST(cpv.presop2015 AS DOUBLE) END AS presop2015,
               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,
+              -- patp_mun (numeric-as-VARCHAR -> TRY_CAST; categorical kept as string)
+              TRY_CAST(patp.t_part   AS DOUBLE) AS t_part,
+              TRY_CAST(patp.t_ocup   AS DOUBLE) AS t_ocup,
+              TRY_CAST(patp.pr       AS DOUBLE) AS pr,
+              CAST(patp.ind_conec    AS DOUBLE) AS ind_conec,
+              patp.pr_pred_loc_rur                          AS pr_pred_loc_rur,
+              patp.delitos_fc_b_j_a                         AS delitos_fc_b_j_a,
+              -- pobreza_mun (CONEVAL 2020)
+              CAST(pob.pobreza_pct     AS DOUBLE) AS pobreza_pct,
+              CAST(pob.pobreza_ext_pct AS DOUBLE) AS pobreza_ext_pct,
               COALESCE(pts.migrants_n, 0)                 AS migrants_n,
               COALESCE(pts.graves_n,   0)                 AS graves_n,
               COALESCE(pts.ocved_n,    0)                 AS ocved_n,
               COALESCE(pts.ged_n,      0)                 AS ged_n,
               COALESCE(pts.infra_n,    0)                 AS infra_n
        FROM grid_nivel{niv} g
-       LEFT JOIN crime_mun       c   ON g.CVEGEO = c.CVEGEO
-       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}"
+       LEFT JOIN crime_mun       c    ON g.CVEGEO = c.CVEGEO
+       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 dim_pop_cpv_grid cpv ON cpv.codigo = g.codigo AND cpv.nivel = {niv}
+       LEFT JOIN dim_patp_mun    patp ON patp.CVEGEO = g.CVEGEO
+       LEFT JOIN dim_pobreza_mun pob  ON pob.CVEGEO = g.CVEGEO
+       LEFT JOIN pts_src         pts  ON g.codigo = pts.codigo{limit_clause}"
   )
 }
 
@@ -770,12 +819,19 @@ WEB_SPEC <- list(
     ocved    = OCVED_PAL,      ged = GED_PAL,
     giim     = GIIM_COLORS,    bar_ramp = BAR_RAMP,
     infra_cats = INFRA_CATS,
-    pop      = POP_PAL
+    pop       = POP_PAL,
+    patp      = PATP_PAL,
+    pobreza   = POBREZA_PAL,
+    patp_rural  = PATP_RURAL_PROBLEM_PAL,
+    patp_delito = PATP_DELITO_PAL
   ),
 
-  crime_cols  = CRIME_COLS,
-  fosas_cols  = FOSAS_COLS,
-  envipe_cols = ENVIPE_COLS,
+  crime_cols   = CRIME_COLS,
+  fosas_cols   = FOSAS_COLS,
+  envipe_cols  = ENVIPE_COLS,
+  pop_cols     = POP_COLS,
+  patp_cols    = PATP_COLS,
+  pobreza_cols = POBREZA_COLS,
   map_styles  = MAP_STYLES,
   grid_layer_cfg  = GRID_LAYER_CFG,
   non_grid_layers = NON_GRID_LAYERS,
@@ -803,9 +859,19 @@ 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",
+    # pop-choro is GRID-ONLY: data lives in dim_pop_cpv_grid keyed by (codigo,
+    # nivel). The fill is painted directly on grid cells via add_typed_grid_layers,
+    # there is no mun-level fallback layer.
+    list(id = "pop-choro",       type = "fill",   src = NULL,
+         geom = "grid_only", 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",
+         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",
+         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",
          opacity = 0.65, visible = FALSE, requires = "dim_fosas_mun"),
@@ -891,18 +957,26 @@ WEB_SPEC <- list(
            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 = "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.",
+           label = "Population per grid cell (CPV 2020)",
+           tooltip = "Census 2020 population counts joined to each rHEALPix grid cell at the active nivel. Enable the grid view to see this layer. Select sub-type: total population, born abroad, or resident abroad in 2015.",
            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(kind = "radios", group = "pop")
     )),
     list(id = "vulnerability", label = "Vulnerability", open = FALSE, items = list(
       list(kind = "layer", value = "infra-pts",
            label = "Migrant shelters and support centres",
            tooltip = "Shelters, food, health, government, legal and religious assistance points along migrant routes. Click a swatch in the legend to filter.",
-           legend = list(type = "cats", pal = "infra_cats", filterable = "infra"))
+           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 = "")),
+      list(kind = "radios", group = "patp"),
+      list(kind = "layer", value = "pobreza-choro",
+           label = "Poverty (CONEVAL 2020)",
+           tooltip = "CONEVAL 2020 poverty / extreme poverty share by municipality. Enable the grid view to see this layer.",
+           legend = list(type = "ramp", pal = "pobreza", unit = " %")),
+      list(kind = "radios", group = "pobreza")
     ))
   ),
 
@@ -921,6 +995,23 @@ WEB_SPEC <- list(
     fosas = list(
       list(label = "Clandestine graves", value = "fosas"),
       list(label = "Bodies (cuerpos)",   value = "cuerpos")
+    ),
+    pop = list(
+      list(label = "Total population",        value = "POBTOT"),
+      list(label = "Born abroad",             value = "PNACOP"),
+      list(label = "Resident abroad (2015)",  value = "PRESOP2015")
+    ),
+    patp = list(
+      list(label = "Participation rate",          value = "t_part"),
+      list(label = "Occupation rate",             value = "t_ocup"),
+      list(label = "PR indicator",                value = "pr"),
+      list(label = "Connectivity index",          value = "ind_conec"),
+      list(label = "Predominant rural problem",   value = "pr_pred_loc_rur"),
+      list(label = "Common-jurisdiction crime",   value = "delitos_fc_b_j_a")
+    ),
+    pobreza = list(
+      list(label = "Poverty (%)",         value = "pobreza_pct"),
+      list(label = "Extreme poverty (%)", value = "pobreza_ext_pct")
     )
   ),
 
@@ -1019,6 +1110,9 @@ LUCIDE_JS <- tags$head(
           Shiny.setInputValue('crime_type',  'Homicide rate', { priority: 'event' });
           Shiny.setInputValue('envipe_type', 'insecurity',    { priority: 'event' });
           Shiny.setInputValue('fosas_type',  'fosas',         { priority: 'event' });
+          Shiny.setInputValue('pop_type',    'POBTOT',        { priority: 'event' });
+          Shiny.setInputValue('patp_type',   't_part',        { priority: 'event' });
+          Shiny.setInputValue('pobreza_type','pobreza_pct',   { priority: 'event' });
           Shiny.setInputValue('grid_nivel',  '6',             { priority: 'event' });
         }, 300);
 
@@ -1239,6 +1333,30 @@ LUCIDE_JS <- tags$head(
       });
     }
 
+    function setPopType(type) {
+      if (typeof Shiny !== 'undefined')
+        Shiny.setInputValue('pop_type', type, { priority: 'event' });
+      document.querySelectorAll('.pop-radio').forEach(function(r) {
+        r.classList.toggle('active', r.dataset.value === type);
+      });
+    }
+
+    function setPATPType(type) {
+      if (typeof Shiny !== 'undefined')
+        Shiny.setInputValue('patp_type', type, { priority: 'event' });
+      document.querySelectorAll('.patp-radio').forEach(function(r) {
+        r.classList.toggle('active', r.dataset.value === type);
+      });
+    }
+
+    function setPobrezaType(type) {
+      if (typeof Shiny !== 'undefined')
+        Shiny.setInputValue('pobreza_type', type, { priority: 'event' });
+      document.querySelectorAll('.pobreza-radio').forEach(function(r) {
+        r.classList.toggle('active', r.dataset.value === type);
+      });
+    }
+
     function toggleStylePicker() {
       var picker = document.getElementById('style-picker');
       if (!picker) return;
@@ -1879,7 +1997,9 @@ acc_radios_from_spec <- function(group) {
   opts <- WEB_SPEC$radios[[group]]
   cls  <- paste0(group, "-radio")
   setter <- switch(group, crime = "setCrimeType",
-                   envipe = "setEnvipeType", fosas = "setFosasType")
+                   envipe = "setEnvipeType", fosas = "setFosasType",
+                   pop = "setPopType", patp = "setPATPType",
+                   pobreza = "setPobrezaType")
   default <- opts[[1]]$value
   div(class = "acc-radios",
     lapply(opts, function(op) {
@@ -2544,9 +2664,12 @@ 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)
+  # CPV 2020 per-cell population. The sub-type (POBTOT / PNACOP / PRESOP2015)
+  # determines which column + break set drives the step paint. NULL cells
+  # (INEGI confidentiality suppression) fall to the lightest palette stop.
+  pop_grid_expr <- function(pop_type = "POBTOT") {
+    info <- POP_COLS[[pop_type]] %||% POP_COLS[["POBTOT"]]
+    step_expr(info$col, info$breaks, POP_PAL)
   }
 
   # Envipe on the GRID: each grid cell carries its containing state's
@@ -2557,16 +2680,45 @@ server <- function(input, output, session) {
     step_expr(info$col, info$breaks, ENVIPE_PAL)
   }
 
+  # PATP-CONEVAL on the GRID. Each sub-type is either "num" (step paint via
+  # TRY_CAST'd column) or "cat" (match paint over a fixed Spanish-label palette).
+  patp_grid_expr <- function(patp_type = "t_part") {
+    info <- PATP_COLS[[patp_type]] %||% PATP_COLS[["t_part"]]
+    if (identical(info$kind, "cat")) {
+      pal <- if (identical(info$palette, "patp_rural")) PATP_RURAL_PROBLEM_PAL
+             else if (identical(info$palette, "patp_delito")) PATP_DELITO_PAL
+             else PATP_RURAL_PROBLEM_PAL
+      pairs <- unlist(
+        lapply(names(pal), function(nm) list(nm, unname(pal[[nm]]))),
+        recursive = FALSE
+      )
+      c(list("match", list("get", info$col)), pairs, list("#bdbdbd"))
+    } else {
+      step_expr(info$col, info$breaks, PATP_PAL)
+    }
+  }
+
+  # Pobreza (CONEVAL 2020). Two numeric sub-types only.
+  pobreza_grid_expr <- function(pobreza_type = "pobreza_pct") {
+    info <- POBREZA_COLS[[pobreza_type]] %||% POBREZA_COLS[["pobreza_pct"]]
+    step_expr(info$col, info$breaks, POBREZA_PAL)
+  }
+
   # Return the fill-color expression for a given original layer ID
   grid_color_expr <- function(orig_lid, crime_type, fosas_type = "fosas",
-                              envipe_type = "insecurity") {
+                              envipe_type = "insecurity",
+                              pop_type    = "POBTOT",
+                              patp_type   = "t_part",
+                              pobreza_type = "pobreza_pct") {
     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(),
+      "pop-choro"     = pop_grid_expr(pop_type),
+      "patp-choro"    = patp_grid_expr(patp_type),
+      "pobreza-choro" = pobreza_grid_expr(pobreza_type),
       "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),
@@ -2585,7 +2737,10 @@ 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),
+      # pop / patp / pobreza are grid-only -- no mun-level layer to gate.
+      "pop-choro"      = FALSE,
+      "patp-choro"     = FALSE,
+      "pobreza-choro"  = FALSE,
       "fosas-choro"    = isTRUE(lazy_added$fosas),
       "envipe-state"   = isTRUE(lazy_added$state),
       "routes-lines"   = isTRUE(lazy_added$routes),
@@ -2600,7 +2755,11 @@ server <- function(input, output, session) {
   }
 
   # Central visibility updater
-  apply_visibility <- function(active, grid_on, crime_type, nivel, envipe_type, fosas_type = "fosas") {
+  apply_visibility <- function(active, grid_on, crime_type, nivel, envipe_type,
+                               fosas_type = "fosas",
+                               pop_type = "POBTOT",
+                               patp_type = "t_part",
+                               pobreza_type = "pobreza_pct") {
     prx <- maplibre_proxy("map")
 
     for (orig_lid in names(GRID_LAYER_CFG)) {
@@ -2664,7 +2823,8 @@ 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, envipe_type)
+          expr <- grid_color_expr(orig_lid, crime_type, fosas_type, envipe_type,
+                                  pop_type, patp_type, pobreza_type)
           if (!is.null(expr))
             prx <- prx |> set_paint_property(grid_id, "fill-color", expr)
         }
@@ -2910,9 +3070,17 @@ server <- function(input, output, session) {
       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
+      # CPV 2020 population per grid cell -- default sub-type POBTOT
       add_fill_layer(id = paste0("grid-pop-n",      niv), source = src,
-        fill_color = pop_qstep_expr(),
+        fill_color = pop_grid_expr("POBTOT"),
+        fill_opacity = 0, tooltip = grid_tooltip) |>
+      # PATP indicators (numeric default = t_part)
+      add_fill_layer(id = paste0("grid-patp-n",     niv), source = src,
+        fill_color = patp_grid_expr("t_part"),
+        fill_opacity = 0, tooltip = grid_tooltip) |>
+      # CONEVAL pobreza (default = poverty %)
+      add_fill_layer(id = paste0("grid-pobreza-n",  niv), source = src,
+        fill_color = pobreza_grid_expr("pobreza_pct"),
         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).
@@ -3259,12 +3427,7 @@ 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")))))
+      # pop-choro is GRID-ONLY (CPV 2020 per cell). No mun-level fallback.
       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,
@@ -3356,16 +3519,20 @@ server <- function(input, output, session) {
   observeEvent(
     eventExpr = list(
       input$active_layers, is_grid_on(),
-      input$crime_type, input$grid_nivel, input$envipe_type, input$fosas_type
+      input$crime_type, input$grid_nivel, input$envipe_type, input$fosas_type,
+      input$pop_type, input$patp_type, input$pobreza_type
     ),
     handlerExpr = {
       apply_visibility(
-        active      = input$active_layers %||% character(0),
-        grid_on     = is_grid_on(),
-        crime_type  = input$crime_type  %||% "Homicide rate",
-        nivel       = input$grid_nivel  %||% "6",
-        envipe_type = input$envipe_type %||% "insecurity",
-        fosas_type  = input$fosas_type  %||% "fosas"
+        active       = input$active_layers %||% character(0),
+        grid_on      = is_grid_on(),
+        crime_type   = input$crime_type   %||% "Homicide rate",
+        nivel        = input$grid_nivel   %||% "6",
+        envipe_type  = input$envipe_type  %||% "insecurity",
+        fosas_type   = input$fosas_type   %||% "fosas",
+        pop_type     = input$pop_type     %||% "POBTOT",
+        patp_type    = input$patp_type    %||% "t_part",
+        pobreza_type = input$pobreza_type %||% "pobreza_pct"
       )
     },
     ignoreInit = TRUE