Upload 2 files

depth_interactive_map_alpha.R

@@ -209,18 +209,22 @@ PATP_DELITO_LABELS_EN <- c(
   "Libertad personal"                  = "Personal freedom"
 )
 
-# Infrastructure point categories -- grouped from the raw "category" field
-# (Shelter / restaurant / Government / lodging / Legal/NGO / Food / charity /
-#  police / hospital / Religious / embassy / Medical / place-of-worship)
-# into 7 user-meaningful buckets, each with its own muted Spatial colour.
+# Infrastructure point categories -- grouped from the raw `category` field in
+# support_infrastructure. Embassy is split out of Government (consular
+# protection is a distinct service for migrants, not bureaucratic admin), and
+# an Other fallback catches new categories ingested later so they don't get
+# silently lumped into an existing bucket. SQL CASE in
+# WEB_SQL_TEMPLATES$load_infra_pts maps the raw values to these buckets.
 INFRA_CATS <- c(
-  "Shelter"        = "#2D6E54",
-  "Food & Lodging" = "#B89307",
-  "Government"     = "#3A4B5C",
-  "Legal & Aid"    = "#7E4A86",
-  "Police"         = "#9E2A3A",
-  "Health"         = "#0987A8",
-  "Religious"      = "#6B5640"
+  "Shelter"        = "#2D6E54",   # forest green
+  "Food & Lodging" = "#B89307",   # ochre
+  "Government"     = "#3A4B5C",   # slate
+  "Embassy"        = "#1F4A6B",   # deep navy (international protection)
+  "Legal & Aid"    = "#7E4A86",   # mauve
+  "Police"         = "#9E2A3A",   # brick red
+  "Health"         = "#0987A8",   # teal
+  "Religious"      = "#6B5640",   # warm brown
+  "Other"          = "#94a3b8"    # neutral slate (fallback)
 )
 
 CRIME_COLS <- list(
@@ -441,7 +445,8 @@ WEB_SQL_TEMPLATES <- list(
             CASE
               WHEN category = 'Shelter' THEN 'Shelter'
               WHEN LOWER(category) IN ('food','restaurant','lodging') THEN 'Food & Lodging'
-              WHEN LOWER(category) IN ('government','embassy') THEN 'Government'
+              WHEN LOWER(category) = 'government' THEN 'Government'
+              WHEN LOWER(category) = 'embassy' THEN 'Embassy'
               WHEN category = 'Legal/NGO' OR LOWER(category) = 'charity' THEN 'Legal & Aid'
               WHEN LOWER(category) = 'police' THEN 'Police'
               WHEN LOWER(category) IN ('hospital','medical') THEN 'Health'
@@ -593,9 +598,15 @@ WEB_SQL_TEMPLATES <- list(
             wkt
      FROM state_polygons",
 
+  # Main migration routes -- `roads` table holds locality-to-locality segments
+  # for the migration-routes layer (from_name / to_name / length_m / road_tipo /
+  # wkt). The columns drive both the paint expression and the hover tooltip.
   src_routes =
-    "SELECT from_id, to_id, CAST(length_m AS DOUBLE) AS length, road_tipo, wkt
-     FROM roads",
+    "SELECT from_name, to_name, road_tipo,
+            CAST(length_m AS DOUBLE) AS length_m,
+            wkt
+     FROM roads
+     WHERE wkt IS NOT NULL",
 
   src_via = "SELECT tipo, condicion, wkt FROM viaferrea",
 
@@ -656,7 +667,8 @@ WEB_SQL_TEMPLATES <- list(
        CASE
          WHEN category = 'Shelter' THEN 'Shelter'
          WHEN LOWER(category) IN ('food','restaurant','lodging') THEN 'Food & Lodging'
-         WHEN LOWER(category) IN ('government','embassy') THEN 'Government'
+         WHEN LOWER(category) = 'government' THEN 'Government'
+         WHEN LOWER(category) = 'embassy' THEN 'Embassy'
          WHEN category = 'Legal/NGO' OR LOWER(category) = 'charity' THEN 'Legal & Aid'
          WHEN LOWER(category) = 'police' THEN 'Police'
          WHEN LOWER(category) IN ('hospital','medical') THEN 'Health'
@@ -1147,13 +1159,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 paint in BOTH modes (mun-level + per-cell)
+    # patp-choro paints in BOTH modes (mun-level + per-cell). Poverty + extreme
+    # poverty live INSIDE patp-choro as chips now, so the standalone
+    # pobreza-choro layer was removed.
     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 = "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",
          opacity = 0.65, visible = FALSE, requires = "dim_fosas_mun"),
@@ -1290,13 +1301,7 @@ WEB_SPEC <- list(
              delitos_fc_b_j_a = list(type = "cats", pal = "patp_delito",
                                      filterable = "patp_delito")
            )),
-      list(kind = "radios", group = "patp"),
-      list(kind = "layer", value = "pobreza-choro",
-           label = "Poverty",
-           tooltip = "CONEVAL 2020 poverty / extreme poverty share by municipality. Enable the grid view to see this layer.",
-           legend = list(type = "ramp", pal = "pobreza", unit = " %",
-                         labels = "qualitative")),
-      list(kind = "radios", group = "pobreza")
+      list(kind = "radios", group = "patp")
     ))
   ),
 
@@ -1330,10 +1335,6 @@ WEB_SPEC <- list(
       list(label = "Road 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")
     )
   ),
 
@@ -3382,19 +3383,20 @@ server <- function(input, output, session) {
     dist_infra  = NULL
   )
 
-  # Normalise the raw 13 `category` strings into 7 user-meaningful buckets
-  # (mirrors the SQL CASE in WEB_SQL_TEMPLATES$load_infra_pts).
+  # Normalise the raw `category` strings into the INFRA_CATS buckets used by
+  # the legend (mirrors the SQL CASE in WEB_SQL_TEMPLATES$load_infra_pts).
   normalize_infra_cat <- function(category) {
     if (length(category) == 0) return(character(0))
     c_low <- tolower(category)
     out <- ifelse(category == "Shelter",                                "Shelter",
           ifelse(c_low %in% c("food","restaurant","lodging"),           "Food & Lodging",
-          ifelse(c_low %in% c("government","embassy"),                  "Government",
+          ifelse(c_low == "government",                                 "Government",
+          ifelse(c_low == "embassy",                                    "Embassy",
           ifelse(category == "Legal/NGO" | c_low == "charity",          "Legal & Aid",
           ifelse(c_low == "police",                                     "Police",
           ifelse(c_low %in% c("hospital","medical"),                    "Health",
           ifelse(c_low %in% c("religious","place-of-worship"),          "Religious",
-                                                                        "Other")))))))
+                                                                        "Other"))))))))
     out
   }
 
@@ -4353,8 +4355,18 @@ server <- function(input, output, session) {
         lazy_add_fill("routes",  "src_routes",  "routes-lines",  function(prx, d)
           prx |> add_line_layer("routes-lines",   source = d,
             line_color = COL_AMBER,
-            line_width = list("interpolate", list("linear"), list("zoom"), 5, 0.5, 10, 2.0),
-            line_opacity = 0.1))
+            # Zoom-interpolated width so the network reads at a national view
+            # without bloating into a solid mass when zoomed in on a city.
+            line_width = list("interpolate", list("linear"), list("zoom"),
+                              4, 0.6, 8, 1.4, 12, 2.5),
+            line_opacity = 0.55,
+            # Tooltip names the connected localities + road quality. road_tipo
+            # is Spanish in the source (Pavimentada / Vía sencilla / Terraceria
+            # / Vía doble) -- left as-is to match the data the user maintains.
+            tooltip = list("concat",
+              "<b>", list("get", "from_name"),
+              "  to  ", list("get", "to_name"), "</b>",
+              "<br>", list("get", "road_tipo"))))
       if ("viaferrea-lines" %in% active)
         lazy_add_fill("via",     "src_via",     "viaferrea-lines", function(prx, d)
           prx |> add_line_layer("viaferrea-lines", source = d,

styles.css

@@ -2194,9 +2194,13 @@ button.mapbox-gl-draw_uncombine { display: none !important; }
 
 #grid-icon-btn { position: relative; }
 
-/* ---- Filterable categorical legend (click swatch to toggle) ---- */
+/* ---- Filterable categorical legend (click swatch to toggle) ---------------
+   Layout for the visible state lives here, but visibility itself is owned by
+   the parent rule `.acc-legend.legend-visible { display: block; }` / the
+   per-shape `.legend-visible` rules above. Using `display: flex !important`
+   here used to force the legend on even when the layer was toggled off; the
+   layout-only properties below now apply whenever the parent flips visible. */
 .acc-legend-cats--filter {
-  display: flex !important;
   flex-direction: column;
   gap: 3px;
   align-items: stretch;