fix(map): fade non-matching toilets under WC sub-filters instead of hiding them (#3278)

* fix(map): fade non-matching toilets under WC sub-filters instead of hiding them

The gender/accessibility sub-filters hid non-matching toilet markers
outright via a setFilter on indoor-pois, while their room fills only
faded (#3241). Drop the hide path and let applyFilterDim own the fade,
so non-matching icons dim to 0.2 like the room fills and stay clickable.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

* fix(map): treat male+female toilets as unisex; drop slop comments

A toilet flagged both male and female is all-gender in practice, but the
unisex sub-filter only matched the explicit `is_unisex_toilet` flag and so
skipped them. The unisex selection now matches
`is_unisex_toilet OR (is_male_toilet AND is_female_toilet)`, covering both
the icon and room-fill layers.

Also trims the verbose comment blocks added in this PR and removes the
remaining test comment.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

* refactor(map): drop is_unisex_toilet, encode unisex as male AND female

A unisex/all-gender toilet is usable by everyone, so there is no need for a
flag of its own: it is now encoded as both is_male_toilet and is_female_toilet.
This removes the is_unisex_toilet column from pois and rooms, and the unisex
sub-filter, popup label, and POI sprite all derive the all-gender case from the
male/female pair.

- osm2pgsql: a `toilet_flags` helper folds `unisex=yes` into male+female once
  (also fixing the multipolygon-relation path that stored the raw tag string
  instead of a boolean).
- migration: backfill existing explicitly-unisex rows into the male/female pair,
  then drop the column and re-emit the indoor_pois/indoor_rooms tiles without it.
- basemap: a male+female toilet now gets the generic toilet sprite.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

* refactor(map): fold is_unisex_toilet removal into its source migrations

Rather than add-then-drop the column across two migrations, remove it at the
source: the Jun-11 WC migrations are not yet in prod, and a full OSM re-import
recreates pois/rooms from the (unisex-free) lua schema, so no DROP COLUMN or
backfill is needed.

- 20260611140000: indoor_pois no longer selects is_unisex_toilet.
- 20260611160000: drops the rooms is_unisex_toilet column add and the
  indoor_rooms reference.
- removes the standalone drop-migration added earlier.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

* fix(map): base martin image on :main so the docker build works

ghcr.io/maplibre/martin:latest was reslimmed to a package-manager-less image,
so `apt-get install unzip` fails (exit 127) and the build is red on main. The
:main tag is Alpine and already ships wget + unzip, so drop the apt-get step and
use busybox-safe flags (-q, -p).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Author: CommanderStorm

map/martin/Dockerfile

@@ -1,17 +1,13 @@
 FROM ghcr.io/maplibre/martin:main
 
-RUN apt-get update && \
-    apt-get install --no-install-recommends --yes unzip && \
-    rm -rf /var/lib/apt/lists/*
-
 # -- fonts --
-RUN  wget --quiet -O /tmp/roboto-android.zip https://github.com/googlefonts/roboto/releases/download/v2.138/roboto-android.zip && \
+RUN wget -q -O /tmp/roboto-android.zip https://github.com/googlefonts/roboto/releases/download/v2.138/roboto-android.zip && \
     unzip -q /tmp/roboto-android.zip -d "$(dirname "$0")/fonts/" && \
     rm /tmp/roboto-android.zip
 
 # -- sprites --
-RUN  wget --quiet -O /tmp/sprites_maki.zip https://github.com/mapbox/maki/zipball/main && \
-    mkdir --parents "$(dirname "$0")/sprites/maki/" && \
+RUN wget -q -O /tmp/sprites_maki.zip https://github.com/mapbox/maki/zipball/main && \
+    mkdir -p "$(dirname "$0")/sprites/maki/" && \
     unzip -q /tmp/sprites_maki.zip -d /tmp/sprites && \
     rm /tmp/sprites_maki.zip && \
     mv /tmp/sprites/mapbox-maki-*/icons/* "$(dirname "$0")/sprites/maki/" && \

map/martin/styles/navigatum-basemap.json

@@ -5445,12 +5445,12 @@
             "elevator"
           ],
           "elevator",
+          ["all", ["get", "is_male_toilet"], ["get", "is_female_toilet"]],
+          "toilet",
           ["get", "is_male_toilet"],
           "toilet_male",
           ["get", "is_female_toilet"],
           "toilet_female",
-          ["get", "is_unisex_toilet"],
-          "toilet",
           ["==", ["get", "indoor"], "shower"],
           "noun-shower-51",
           ""

map/osm2pgsql/style.lua

@@ -39,7 +39,6 @@ tables.rooms =
         -- non-matching toilet rooms the same way the icon filter hides their POIs.
         { column = "is_male_toilet",       type = "boolean",  not_null = true },
         { column = "is_female_toilet",     type = "boolean",  not_null = true },
-        { column = "is_unisex_toilet",     type = "boolean",  not_null = true },
         { column = "is_wheelchair_toilet", type = "boolean",  not_null = true },
         { column = "level_min",            type = "real",     not_null = true },
         { column = "level_max",            type = "real",     not_null = true },
@@ -62,7 +61,6 @@ tables.pois =
           { column = "students_have_access", type = "boolean", not_null = true },
           { column = "is_male_toilet",       type = "boolean", not_null = true },
           { column = "is_female_toilet",     type = "boolean", not_null = true },
-          { column = "is_unisex_toilet",     type = "boolean", not_null = true },
           { column = "is_wheelchair_toilet", type = "boolean", not_null = true },
           { column = "area",                 type = "real",    not_null = true },
           { column = "level_min",            type = "real",    not_null = true },
@@ -272,6 +270,19 @@ local function clean_tags_indoor(tags)
   return next(tags) == nil
 end
 
+-- The typed toilet attribute booleans for a feature's tags. A unisex/all-gender toilet is usable
+-- by everyone; with no separate unisex flag it is encoded as both male and female. The flags only
+-- apply to `indoor == "toilet"`.
+local function toilet_flags(tags)
+  local is_toilet = tags.indoor == "toilet"
+  local unisex = tags.unisex == "yes"
+  return {
+    male = is_toilet and (tags.male == "yes" or unisex),
+    female = is_toilet and (tags.female == "yes" or unisex),
+    wheelchair = is_toilet and tags.wheelchair == "yes",
+  }
+end
+
 -- Called for every node in the input. The `object` argument contains all the
 -- attributes of the node like `id`, `version`, etc. as well as all tags as a
 -- Lua table (`object.tags`).
@@ -322,15 +333,15 @@ function osm2pgsql.process_node(object)
   elseif object.tags.indoor == "toilet" or object.tags.indoor == "shower" then
     -- Point geometry has no area, so synthesize `area = 0` (the icon does not use it). No
     -- name/ref: these render as icons only.
+    local wc = toilet_flags(object.tags)
     for _, level in ipairs(SantiseLevel(object.tags.level)) do
       tables.pois:insert(
         {
           indoor = object.tags.indoor,
           students_have_access = object.tags.access ~= "private" and object.tags.access ~= "no",
-          is_male_toilet = object.tags.indoor == "toilet" and object.tags.male == "yes",
-          is_female_toilet = object.tags.indoor == "toilet" and object.tags.female == "yes",
-          is_unisex_toilet = object.tags.indoor == "toilet" and object.tags.unisex == "yes",
-          is_wheelchair_toilet = object.tags.indoor == "toilet" and object.tags.wheelchair == "yes",
+          is_male_toilet = wc.male,
+          is_female_toilet = wc.female,
+          is_wheelchair_toilet = wc.wheelchair,
           area = 0,
           level_min = level.min,
           level_max = level.max,
@@ -378,6 +389,7 @@ function osm2pgsql.process_way(object)
   for _, level in ipairs(SantiseLevel(object.tags.level)) do
     object.tags.level_min = level.min
     object.tags.level_max = level.max
+    local wc = toilet_flags(object.tags)
     -- Very simple check to decide whether a way is a polygon or not, in a
     -- real stylesheet we'd have to also look at the tags...
     if object.is_closed then
@@ -388,10 +400,9 @@ function osm2pgsql.process_way(object)
             indoor = object.tags.indoor,
             ref_tum = object.tags["ref:tum"],
             students_have_access = object.tags.access ~= "private" and object.tags.access ~= "no",
-            is_male_toilet = object.tags.indoor == "toilet" and object.tags.male == "yes",
-            is_female_toilet = object.tags.indoor == "toilet" and object.tags.female == "yes",
-            is_unisex_toilet = object.tags.indoor == "toilet" and object.tags.unisex == "yes",
-            is_wheelchair_toilet = object.tags.indoor == "toilet" and object.tags.wheelchair == "yes",
+            is_male_toilet = wc.male,
+            is_female_toilet = wc.female,
+            is_wheelchair_toilet = wc.wheelchair,
             level_min = level.min,
             level_max = level.max,
             geom = geom
@@ -413,10 +424,9 @@ function osm2pgsql.process_way(object)
             name = object.tags.name,
             ref = object.tags.ref,
             students_have_access = object.tags.access ~= "private" and object.tags.access ~= "no",
-            is_male_toilet = object.tags.indoor == "toilet" and object.tags.male == "yes",
-            is_female_toilet = object.tags.indoor == "toilet" and object.tags.female == "yes",
-            is_unisex_toilet = object.tags.indoor == "toilet" and object.tags.unisex == "yes",
-            is_wheelchair_toilet = object.tags.indoor == "toilet" and object.tags.wheelchair == "yes",
+            is_male_toilet = wc.male,
+            is_female_toilet = wc.female,
+            is_wheelchair_toilet = wc.wheelchair,
             area = geom:spherical_area(),
             level_min = level.min,
             level_max = level.max,
@@ -452,17 +462,17 @@ function osm2pgsql.process_relation(object)
   if object.tags.type == "multipolygon" or
       object.tags.type == "boundary" then
     local geom = object:as_multipolygon()
+    local wc = toilet_flags(object.tags)
     for _, level in ipairs(SantiseLevel(object.tags.level)) do
       if object.tags.indoor ~= "stairs" then
         tables.rooms:insert(
           {
             indoor = object.tags.indoor,
             ref_tum = object.tags["ref:tum"],
             students_have_access = object.tags.access ~= "private" and object.tags.access ~= "no",
-            is_male_toilet = object.tags.indoor == "toilet" and object.tags.male == "yes",
-            is_female_toilet = object.tags.indoor == "toilet" and object.tags.female == "yes",
-            is_unisex_toilet = object.tags.indoor == "toilet" and object.tags.unisex == "yes",
-            is_wheelchair_toilet = object.tags.indoor == "toilet" and object.tags.wheelchair == "yes",
+            is_male_toilet = wc.male,
+            is_female_toilet = wc.female,
+            is_wheelchair_toilet = wc.wheelchair,
             level_min = level.min,
             level_max = level.max,
             geom = geom
@@ -487,10 +497,9 @@ function osm2pgsql.process_relation(object)
               indoor = object.tags.indoor,
               ref = object.tags.ref,
               students_have_access = object.tags.access ~= "private" and object.tags.access ~= "no",
-              is_male_toilet = object.tags.indoor == "toilet" and object.tags.male,
-              is_female_toilet = object.tags.indoor == "toilet" and object.tags.female,
-              is_unisex_toilet = object.tags.indoor == "toilet" and object.tags.unisex,
-              is_wheelchair_toilet = object.tags.indoor == "toilet" and object.tags.wheelchair == "yes",
+              is_male_toilet = wc.male,
+              is_female_toilet = wc.female,
+              is_wheelchair_toilet = wc.wheelchair,
               area = g:area(),
               level_min = level.min,
               level_max = level.max,

server/migrations/20260611140000_drop_pois_is_shower.sql

@@ -27,7 +27,6 @@ BEGIN
       students_have_access,
       is_male_toilet,
       is_female_toilet,
-      is_unisex_toilet,
       is_wheelchair_toilet,
       area
     FROM pois
@@ -56,7 +55,6 @@ DO $do$ BEGIN
                     "students_have_access": "Boolean",
                     "is_male_toilet": "Boolean",
                     "is_female_toilet": "Boolean",
-                    "is_unisex_toilet": "Boolean",
                     "is_wheelchair_toilet": "Boolean",
                     "area": "Real"
                 },

server/migrations/20260611160000_rooms_wc_attrs.sql

@@ -10,7 +10,6 @@
 ALTER TABLE IF EXISTS rooms
     ADD COLUMN IF NOT EXISTS is_male_toilet       boolean NOT NULL DEFAULT false,
     ADD COLUMN IF NOT EXISTS is_female_toilet     boolean NOT NULL DEFAULT false,
-    ADD COLUMN IF NOT EXISTS is_unisex_toilet     boolean NOT NULL DEFAULT false,
     ADD COLUMN IF NOT EXISTS is_wheelchair_toilet boolean NOT NULL DEFAULT false;
 
 CREATE OR REPLACE
@@ -31,7 +30,6 @@ BEGIN
       students_have_access,
       is_male_toilet,
       is_female_toilet,
-      is_unisex_toilet,
       is_wheelchair_toilet
     FROM rooms
     WHERE geom && ST_TileEnvelope(z, x, y) AND
@@ -58,7 +56,6 @@ DO $do$ BEGIN
                     "students_have_access": "Boolean",
                     "is_male_toilet": "Boolean",
                     "is_female_toilet": "Boolean",
-                    "is_unisex_toilet": "Boolean",
                     "is_wheelchair_toilet": "Boolean"
                 },
                 "maxzoom": 30,

tests/specs/map.ui.spec.ts

@@ -16,7 +16,6 @@ function styleWithToilet(flags: Record<string, boolean>) {
   const allFlags = {
     is_male_toilet: false,
     is_female_toilet: false,
-    is_unisex_toilet: false,
     is_wheelchair_toilet: false,
     is_shower: false,
     ...flags,
@@ -285,31 +284,23 @@ test.describe("Browse map (/map)", () => {
     await expect(page.getByRole("checkbox", { name: "Nur rollstuhlgerecht" })).toBeHidden();
   });
 
-  test("the wheelchair-only filter hides non-accessible toilets", async ({ page }) => {
+  test("a non-matching toilet stays clickable under the wheelchair-only filter", async ({
+    page,
+  }) => {
     await stubBasemap(page, styleWithToilet({ is_male_toilet: true }));
 
-    await page.goto("/map?filter=wcs", { waitUntil: "networkidle" });
-    await expect(page.getByRole("region", { name: "Map" })).toBeVisible();
-    await page.locator("#map-browse canvas").first().click();
-    await expect(page.locator(".maplibregl-popup-content")).toContainText("Toilette");
-
     await page.goto("/map?filter=wcs&wcs_wheelchair=true", { waitUntil: "networkidle" });
     await expect(page.getByRole("region", { name: "Map" })).toBeVisible();
     await page.locator("#map-browse canvas").first().click();
-    await expect(page.locator(".maplibregl-popup-content")).toHaveCount(0);
+    await expect(page.locator(".maplibregl-popup-content")).toContainText("Toilette");
   });
 
-  test("the gender filter shows only matching toilets", async ({ page }) => {
+  test("a non-matching toilet stays clickable under the gender filter", async ({ page }) => {
     await stubBasemap(page, styleWithToilet({ is_female_toilet: true }));
 
     await page.goto("/map?filter=wcs&wcs_gender=male", { waitUntil: "networkidle" });
     await expect(page.getByRole("region", { name: "Map" })).toBeVisible();
     await page.locator("#map-browse canvas").first().click();
-    await expect(page.locator(".maplibregl-popup-content")).toHaveCount(0);
-
-    await page.goto("/map?filter=wcs&wcs_gender=female", { waitUntil: "networkidle" });
-    await expect(page.getByRole("region", { name: "Map" })).toBeVisible();
-    await page.locator("#map-browse canvas").first().click();
     await expect(page.locator(".maplibregl-popup-content")).toContainText("Damen");
   });
 

webclient/app/composables/mapLayers.ts

@@ -219,12 +219,21 @@ export const WCS_GENDER_QUERY_PARAM = "wcs_gender";
 export const WCS_GENDERS = ["male", "female", "unisex"] as const;
 export type WcsGender = (typeof WCS_GENDERS)[number];
 
-/** The tile property carrying each gender's flag. */
+/** The tile property carrying each single-gender flag. Unisex has no flag of its own. */
 const WCS_GENDER_FLAG = {
   male: "is_male_toilet",
   female: "is_female_toilet",
-  unisex: "is_unisex_toilet",
-} as const satisfies Record<WcsGender, string>;
+} as const satisfies Record<Exclude<WcsGender, "unisex">, string>;
+
+/**
+ * Per-feature predicate selecting a gender. A unisex/all-gender toilet has no flag of its own; it
+ * is encoded as both male and female, so the unisex selection matches that pair.
+ */
+function wcsGenderCondition(gender: WcsGender): JsonExpression {
+  if (gender === "unisex")
+    return ["all", ["get", "is_male_toilet"], ["get", "is_female_toilet"]];
+  return ["get", WCS_GENDER_FLAG[gender]];
+}
 
 /** Parse a `?wcs_gender=` value, or `null` when absent or not a known gender. */
 export function parseWcsGender(param: string | null | undefined): WcsGender | null {
@@ -246,38 +255,17 @@ export type JsonExpression = readonly (string | number | boolean | JsonExpressio
 /**
  * Per-feature `["get", flag]` predicates for each WC attribute the user selected. A WC feature
  * "matches" when every returned predicate is truthy on it. Empty when nothing is selected.
- * Shared between the POI hide-filter and the room background dim so the two stay in lockstep.
  */
 export function wcsAttributeConditions(opts: {
   wheelchair: boolean;
   gender: WcsGender | null;
 }): JsonExpression[] {
   const conditions: JsonExpression[] = [];
   if (opts.wheelchair) conditions.push(["get", "is_wheelchair_toilet"]);
-  if (opts.gender) conditions.push(["get", WCS_GENDER_FLAG[opts.gender]]);
+  if (opts.gender) conditions.push(wcsGenderCondition(opts.gender));
   return conditions;
 }
 
-/**
- * Style filter for the shared indoor-POI layer hiding the WC markers that do not match the
- * selected attributes. Non-WC features (elevators etc.) pass unconditionally; WC features must
- * carry every selected flag. Showers carry no gender or wheelchair flag, so any active attribute
- * filter hides them with the non-matching toilets. Returns `null` when no attribute is selected,
- * signalling the caller to restore the layer's own filter.
- */
-export function wcsAttributeFilter(opts: {
-  wheelchair: boolean;
-  gender: WcsGender | null;
-}): JsonExpression | null {
-  const conditions = wcsAttributeConditions(opts);
-  if (conditions.length === 0) return null;
-  return [
-    "any",
-    ["!", ["in", ["get", "indoor"], ["literal", [...WCS_INDOOR_VALUES]]]],
-    ["all", ...conditions],
-  ];
-}
-
 /** Parse a `?level=` value into a known integer floor, or `null` when absent or invalid. */
 export function parseLevel(param: string | null | undefined): number | null {
   if (param === null || param === undefined || param.trim() === "") return null;

webclient/app/pages/map.vue

@@ -35,7 +35,6 @@ import {
   WCS_WHEELCHAIR_QUERY_PARAM,
   type WcsGender,
   wcsAttributeConditions,
-  wcsAttributeFilter,
 } from "~/composables/mapLayers";
 import { useEventPopup } from "~/composables/useEventMarkers";
 import { useWebglGuard } from "~/composables/webglSupport";
@@ -103,9 +102,6 @@ const { activeEvent, markerScreenPos, closeActiveEvent } = useEventPopup(map, EV
 
 // Original paint values captured before the first dim, so toggling a filter off restores them.
 const originalPaint = new Map<string, OpacityValue | undefined>();
-// The POI layer's own style filter, captured before the first attribute filter so clearing the
-// attributes restores it. `undefined` = not captured yet; `null` = the layer had no filter.
-let originalPoiFilter: FilterSpecification | null | undefined;
 
 /** Read a query value as a single string, distinguishing "absent" (null) from "present but empty" (""). */
 function queryString(key: string): string | null {
@@ -204,20 +200,6 @@ function applyEventsFilter(): void {
   m.setFilter(EVENTS_STYLE_LAYER, filter as FilterSpecification);
 }
 
-/**
- * Hide the WC markers not matching the selected attributes while the WCs filter is active;
- * restore the layer's own filter when it is not (or when no attribute is selected).
- */
-function applyWcsAttributeFilter(): void {
-  const m = map.value;
-  if (!m?.getLayer(POI_LAYER)) return;
-  if (originalPoiFilter === undefined) originalPoiFilter = m.getFilter(POI_LAYER) ?? null;
-  const expr = activeFilters.value.has(WCS_FILTER_ID)
-    ? wcsAttributeFilter({ wheelchair: wcsWheelchair.value, gender: wcsGender.value })
-    : null;
-  m.setFilter(POI_LAYER, (expr as FilterSpecification | null) ?? originalPoiFilter);
-}
-
 function toggleFilter(id: string): void {
   const next = new Set(activeFilters.value);
   if (next.has(id)) next.delete(id);
@@ -232,7 +214,6 @@ watch(activeFilters, (filters) => {
   setQueryParam(FILTER_QUERY_PARAM, serialized || null);
   applyFilterDim();
   applyOverlayVisibility();
-  applyWcsAttributeFilter();
   // The popup belongs to the events layer; it must not outlive the layer being switched off.
   if (!filters.has(EVENTS_FILTER_ID)) closeActiveEvent();
 });
@@ -248,7 +229,6 @@ watch([wcsWheelchair, wcsGender], ([wheelchair, gender]) => {
   // Drop each param at its "no condition" default, so a bare /map URL stays clean.
   setQueryParam(WCS_WHEELCHAIR_QUERY_PARAM, wheelchair ? "true" : null);
   setQueryParam(WCS_GENDER_QUERY_PARAM, gender);
-  applyWcsAttributeFilter();
   applyFilterDim();
 });
 
@@ -284,10 +264,15 @@ function buildPopupContent(feature: MapGeoJSONFeature, lng: number, lat: number)
   };
 
   if (!isShower) {
+    const male = truthy(props.is_male_toilet);
+    const female = truthy(props.is_female_toilet);
+    // A toilet serving both is all-gender; show it as unisex rather than "male, female".
     const genders: string[] = [];
-    if (truthy(props.is_unisex_toilet)) genders.push(t("gender.unisex"));
-    if (truthy(props.is_male_toilet)) genders.push(t("gender.male"));
-    if (truthy(props.is_female_toilet)) genders.push(t("gender.female"));
+    if (male && female) genders.push(t("gender.unisex"));
+    else {
+      if (male) genders.push(t("gender.male"));
+      if (female) genders.push(t("gender.female"));
+    }
     if (genders.length) addRow(`${t("gender.label")}: ${genders.join(", ")}`);
     if (truthy(props.is_wheelchair_toilet)) addRow(t("wheelchair_accessible"));
   }
@@ -372,7 +357,6 @@ function initMap(): MapLibreMap {
     applyFilterDim();
     applyOverlayVisibility();
     applyEventsFilter();
-    applyWcsAttributeFilter();
 
     m.on("click", POI_LAYER, openPoiPopup);
     m.on("mouseenter", POI_LAYER, () => {