Skip to content

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

Merged
CommanderStorm merged 6 commits into
TUM-Dev:mainfrom
CommanderStorm:worktree-streamed-tickling-llama
Jun 13, 2026
Merged

fix(map): fade non-matching toilets under WC sub-filters instead of hiding them#3278
CommanderStorm merged 6 commits into
TUM-Dev:mainfrom
CommanderStorm:worktree-streamed-tickling-llama

Conversation

@CommanderStorm

Copy link
Copy Markdown
Member

The gender/accessibility sub-filters hid non-matching toilet markers outright while their room fills only faded; this drops the hide path so the icons fade to 0.2 like the room fills and stay clickable.

…iding them

The gender/accessibility sub-filters hid non-matching toilet markers
outright via a setFilter on indoor-pois, while their room fills only
faded (TUM-Dev#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>
Copilot AI review requested due to automatic review settings June 13, 2026 18:26

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.

CommanderStorm and others added 5 commits June 13, 2026 21:50
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>
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>
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>
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>
…ickling-llama

# Conflicts:
#	map/martin/Dockerfile
@CommanderStorm
CommanderStorm enabled auto-merge (squash) June 13, 2026 21:18
@CommanderStorm
CommanderStorm disabled auto-merge June 13, 2026 21:19
@CommanderStorm
CommanderStorm merged commit f62095e into TUM-Dev:main Jun 13, 2026
30 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants