Upload depth_interactive_map_alpha.R

depth_interactive_map_alpha.R

@@ -454,14 +454,9 @@ WEB_SQL_TEMPLATES <- list(
   load_infra_pts =
     "SELECT row_number() OVER () AS row_id, lon, lat,
             CASE
-              WHEN category = 'Shelter' THEN 'Shelter'
-              WHEN LOWER(category) IN ('food','restaurant','lodging') THEN 'Food & Lodging'
-              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'
-              WHEN LOWER(category) IN ('religious','place-of-worship') THEN 'Religious'
+              WHEN category IN ('Shelter', 'Support (NGO)', 'Support (GOV)',
+                                'Migration office', 'Embassy / Consulate')
+                THEN category
               ELSE 'Other'
             END AS cat
      FROM support_infrastructure
@@ -676,14 +671,9 @@ WEB_SQL_TEMPLATES <- list(
   donut_infra =
     "SELECT
        CASE
-         WHEN category = 'Shelter' THEN 'Shelter'
-         WHEN LOWER(category) IN ('food','restaurant','lodging') THEN 'Food & Lodging'
-         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'
-         WHEN LOWER(category) IN ('religious','place-of-worship') THEN 'Religious'
+         WHEN category IN ('Shelter', 'Support (NGO)', 'Support (GOV)',
+                           'Migration office', 'Embassy / Consulate')
+           THEN category
          ELSE 'Other'
        END AS cat,
        COUNT(*) AS n
@@ -3410,17 +3400,9 @@ server <- function(input, output, session) {
   # 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 == "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"))))))))
-    out
+    known <- c("Shelter", "Support (NGO)", "Support (GOV)",
+               "Migration office", "Embassy / Consulate")
+    ifelse(category %in% known, category, "Other")
   }
 
   # Quantile-break cache: pre-populated from the app-level cache (loaded at startup).