From e50962e1ced0d75131300ba8aa165029f4306d40 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Sun, 6 Apr 2025 15:26:08 +0200 Subject: [PATCH] Themes(toilet): don't show some items if wheelchair=designated, fix #2371 --- assets/layers/toilet/toilet.json | 38 +++++++++++++++----------------- langs/layers/ca.json | 4 ---- langs/layers/cs.json | 4 ---- langs/layers/da.json | 4 ---- langs/layers/de.json | 4 ---- langs/layers/en.json | 7 +++--- langs/layers/es.json | 4 ---- langs/layers/fr.json | 4 ---- langs/layers/nl.json | 7 +++--- langs/layers/sl.json | 4 ---- 10 files changed, 24 insertions(+), 56 deletions(-) diff --git a/assets/layers/toilet/toilet.json b/assets/layers/toilet/toilet.json index 3364dbf004..054f41d2d5 100644 --- a/assets/layers/toilet/toilet.json +++ b/assets/layers/toilet/toilet.json @@ -783,10 +783,6 @@ ] }, { - "labels": [ - "relevant-questions", - "no-prefix" - ], "labels": [ "relevant-questions", "no-prefix" @@ -933,10 +929,6 @@ }, { "id": "toilet-has-paper", - "labels": [ - "relevant-questions", - "prefixed" - ], "labels": [ "relevant-questions" ], @@ -986,9 +978,6 @@ } }, { - "labels": [ - "relevant-questions" - ], "labels": [ "relevant-questions", "prefixed" @@ -1170,11 +1159,10 @@ "condition": { "and": [ { + "#": "NOT on designated", "or": [ "wheelchair=yes", - "wheelchair=designated", - "toilets:wheelchair=yes", - "toilets:wheelchair=designated" + "toilets:wheelchair=yes" ] } ] @@ -1197,11 +1185,10 @@ "condition": { "and": [ { + "#": "NOT on designated", "or": [ "wheelchair=yes", - "wheelchair=designated", - "toilets:wheelchair=yes", - "toilets:wheelchair=designated" + "toilets:wheelchair=yes" ] } ] @@ -1236,6 +1223,18 @@ }, "icon": "./assets/layers/toilet/wheelchair.svg", "mappings": [ + { + "if": { + "or": [ + "wheelchair:designated", + "toilets:wheelchair=designated" + ] + }, + "then": { + "en": "No wheelchair accessible toilet", + "nl": "Geen rolstoeltoegankelijke toilet" + } + }, { "if": { "or": [ @@ -1259,11 +1258,10 @@ "condition": { "and": [ { + "#": "NOT on designated", "or": [ "wheelchair=yes", - "wheelchair=designated", - "toilets:wheelchair=yes", - "toilets:wheelchair=designated" + "toilets:wheelchair=yes" ] }, { diff --git a/langs/layers/ca.json b/langs/layers/ca.json index 859f50b577..397f30f9e4 100644 --- a/langs/layers/ca.json +++ b/langs/layers/ca.json @@ -12184,10 +12184,6 @@ } }, "question": "Hi ha un lavabo específic per a usuaris amb cadira de rodes?" - }, - "wheelchair-door-width": { - "question": "Quina és l'amplada de la porta del lavabo accessible per a cadira de rodes?", - "render": "La porta del vàter accessible amb cadira de rodes és {canonical(toilets:door:width)} d'ample" } }, "title": { diff --git a/langs/layers/cs.json b/langs/layers/cs.json index d9db3aed68..4f0ebe9cb0 100644 --- a/langs/layers/cs.json +++ b/langs/layers/cs.json @@ -10844,10 +10844,6 @@ } }, "question": "Existuje vyhrazená toaleta pro vozíčkáře?" - }, - "wheelchair-door-width": { - "question": "Jaká je šířka dveří na bezbariérovou toaletu?", - "render": "Dveře na toaletu pro vozíčkáře jsou {canonical(toilets:door:width)} široké" } }, "title": { diff --git a/langs/layers/da.json b/langs/layers/da.json index 7e43b9a687..ff92eddadf 100644 --- a/langs/layers/da.json +++ b/langs/layers/da.json @@ -2378,10 +2378,6 @@ } }, "question": "Er der et særligt toilet til kørestolsbrugere?" - }, - "wheelchair-door-width": { - "question": "Hvad er bredden på døren til det kørestolsvenlige toilet?", - "render": "Døren til det kørestolsvenlige toilet er {canonical(toilets:door:width)} bred" } } }, diff --git a/langs/layers/de.json b/langs/layers/de.json index a2b6074285..da90aaf6d6 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -12125,10 +12125,6 @@ } }, "question": "Können Rollstuhlfahrer die Toilette benutzen?" - }, - "wheelchair-door-width": { - "question": "Wie breit ist die Tür zur rollstuhlgerechten Toilette?", - "render": "Die Tür zur rollstuhlgerechten Toilette ist {canonical(toilets:door:width)} breit" } }, "title": { diff --git a/langs/layers/en.json b/langs/layers/en.json index 0371dbd366..8f33809e10 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -12393,6 +12393,9 @@ "mappings": { "0": { "then": "No wheelchair accessible toilet" + }, + "1": { + "then": "No wheelchair accessible toilet" } }, "render": "Wheelchair accessible toilet" @@ -12476,10 +12479,6 @@ } }, "question": "Is there a dedicated toilet for wheelchair users?" - }, - "wheelchair-door-width": { - "question": "What is the width of the door to the wheelchair accessible toilet?", - "render": "The door to the wheelchair-accessible toilet is {canonical(toilets:door:width)} wide" } }, "title": { diff --git a/langs/layers/es.json b/langs/layers/es.json index 7dccd28cd9..dba026357b 100644 --- a/langs/layers/es.json +++ b/langs/layers/es.json @@ -11043,10 +11043,6 @@ } }, "question": "¿Hay un baño dedicado para usuarios de sillas de ruedas?" - }, - "wheelchair-door-width": { - "question": "¿Cuál es el ancho de la puerta del baño accesible para sillas de ruedas?", - "render": "La puerta del baño accesible para sillas de ruedas tiene {canonical(toilets:door:width)} de ancho" } }, "title": { diff --git a/langs/layers/fr.json b/langs/layers/fr.json index c1000a3811..fae2dae4cc 100644 --- a/langs/layers/fr.json +++ b/langs/layers/fr.json @@ -6794,10 +6794,6 @@ } }, "question": "Y a-t-il des toilettes réservées aux personnes en fauteuil roulant ?" - }, - "wheelchair-door-width": { - "question": "Quelle est la largeur de la porte des toilettes accessibles aux fauteuils roulants ?", - "render": "La porte des toilettes accessibles aux fauteuils roulants a une large de {canonical(toilets:door:width)}" } } }, diff --git a/langs/layers/nl.json b/langs/layers/nl.json index 2b090bec3c..092bbb6181 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -9958,6 +9958,9 @@ "mappings": { "0": { "then": "Geen rolstoeltoegankelijke toilet" + }, + "1": { + "then": "Geen rolstoeltoegankelijke toilet" } }, "render": "Rolstoeltoegankelijke toilet" @@ -10036,10 +10039,6 @@ } }, "question": "Is er een rolstoeltoegankelijke toilet voorzien?" - }, - "wheelchair-door-width": { - "question": "Hoe breed is de deur van de rolstoeltoegankelijke toilet?", - "render": "De deur naar de rolstoeltoegankelijke toilet is {canonical(toilets:door:width)} wide" } }, "title": { diff --git a/langs/layers/sl.json b/langs/layers/sl.json index 7a86fc5766..3e497d7be8 100644 --- a/langs/layers/sl.json +++ b/langs/layers/sl.json @@ -489,10 +489,6 @@ } }, "question": "Ali je tu stranišče namenjeno invalidom na vozičku?" - }, - "wheelchair-door-width": { - "question": "Koliko so široka vrata v stranišče za invalide na vozičku?", - "render": "Vrata v stranišče za invalide na vozičku so široka {canonical(toilets:door:width)}" } }, "title": {