Themes(toilets): improve tagging of wheelchair accessible toilets, various fixes to make this possible

This commit is contained in:
Pieter Vander Vennet 2025-04-05 04:01:19 +02:00
parent 1e84c2cc4d
commit 089017b136
19 changed files with 617 additions and 223 deletions

View file

@ -121,7 +121,9 @@
"if": {
"or": [
"wheelchair=yes",
"wheelchair=designated"
"wheelchair=designated",
"toilets:wheelchair=yes",
"toilets:wheelchair=designated"
]
},
"then": "./assets/layers/toilet/wheelchair.svg"
@ -453,7 +455,8 @@
]
},
"=labels": [
"relevant-questions"
"relevant-questions",
"no-prefix"
],
"question": {
"en": "When are these toilets opened?",
@ -467,110 +470,11 @@
}
}
},
{
"id": "toilets-wheelchair",
"labels": [
"relevant-questions"
],
"question": {
"en": "Is there a dedicated toilet for wheelchair users?",
"de": "Können Rollstuhlfahrer die Toilette benutzen?",
"fr": "Y a-t-il des toilettes réservées aux personnes en fauteuil roulant ?",
"nl": "Is er een rolstoeltoegankelijke toilet voorzien?",
"it": "C'è un WC riservato alle persone in sedia a rotelle?",
"da": "Er der et særligt toilet til kørestolsbrugere?",
"ca": "Hi ha un lavabo específic per a usuaris amb cadira de rodes?",
"cs": "Je zde vyhrazená toaleta pro vozíčkáře?",
"es": "¿Hay un baño dedicado para usuarios de sillas de ruedas?"
},
"mappings": [
{
"then": {
"en": "There is a dedicated toilet for wheelchair users",
"de": "Rollstuhlfahrer können die Toilette benutzen",
"fr": "Il y a des toilettes réservées pour les personnes à mobilité réduite",
"nl": "Er is een toilet voor rolstoelgebruikers",
"it": "C'è un WC riservato alle persone in sedia a rotelle",
"es": "Hay un baño dedicado para usuarios de sillas de ruedas",
"da": "Der er et særligt toilet til kørestolsbrugere",
"ca": "Hi ha un lavabo dedicat per a usuaris amb cadira de rodes",
"cs": "K dispozici je speciální toaleta pro vozíčkáře"
},
"if": "wheelchair=yes"
},
{
"if": "wheelchair=no",
"then": {
"en": "No wheelchair access",
"de": "Rollstuhlfahrer können die Toilette nicht benutzen",
"fr": "Non accessible aux personnes à mobilité réduite",
"nl": "Niet toegankelijk voor rolstoelgebruikers",
"it": "Non accessibile in sedia a rotelle",
"ru": "Недоступно пользователям кресел-колясок",
"es": "Sin acceso para sillas de ruedas",
"da": "Ingen kørestolsadgang",
"ca": "Sense accés per a cadires de rodes",
"cs": "Žádný bezbariérový přístup"
}
},
{
"if": "wheelchair=designated",
"then": {
"en": "There is only a dedicated toilet for wheelchair users",
"nl": "Er is alleen een toilet voor rolstoelgebruikers",
"de": "Es gibt nur eine barrierefreie Toilette für Rollstuhlfahrer",
"da": "Der er kun et særligt toilet til kørestolsbrugere",
"ca": "És només un lavabo per a usuaris amb cadira de rodes",
"cs": "K dispozici je pouze vyhrazená toaleta pro vozíčkáře",
"es": "Solo hay un baño dedicado para usuarios de sillas de ruedas"
}
}
]
},
{
"id": "wheelchair-door-width",
"condition": {
"and": [
{
"or": [
"wheelchair=yes",
"wheelchair=designated"
]
}
]
},
"labels": [
"relevant-questions"
],
"question": {
"en": "What is the width of the door to the wheelchair accessible toilet?",
"nl": "Hoe breed is de deur van de rolstoeltoegankelijke toilet?",
"fr": "Quelle est la largeur de la porte des toilettes accessibles aux fauteuils roulants ?",
"de": "Wie breit ist die Tür zur rollstuhlgerechten Toilette?",
"da": "Hvad er bredden på døren til det kørestolsvenlige toilet?",
"ca": "Quina és l'amplada de la porta per al lavabo accéssible?",
"cs": "Jaká je šířka dveří na bezbariérovou toaletu?",
"es": "¿Cuál es el ancho de la puerta del baño accesible para sillas de ruedas?"
},
"render": {
"en": "The door to the wheelchair-accessible toilet is {canonical(door:width)} wide",
"nl": "De deur naar de rolstoeltoegankelijke toilet is {canonical(door:width)} wide",
"fr": "La porte des toilettes accessibles aux fauteuils roulants a une large de {canonical(door:width)}",
"de": "Die Tür zur rollstuhlgerechten Toilette ist {canonical(door:width)} breit",
"da": "Døren til det kørestolsvenlige toilet er {canonical(door:width)} bred",
"ca": "La porta del vàter accessible amb cadira de rodes té {canonical(door:width)} d'ample",
"cs": "Dveře na bezbariérovou toaletu mají šířku {canonical(door:width)}",
"es": "La puerta del baño accesible para sillas de ruedas tiene {canonical(door:width)} de ancho"
},
"freeform": {
"key": "door:width",
"type": "pfloat"
}
},
{
"id": "toilets-type",
"labels": [
"relevant-questions"
"relevant-questions",
"prefixed"
],
"question": {
"en": "Which kind of toilets are these?",
@ -643,8 +547,16 @@
]
},
{
"condition": "toilets:position!=urinal",
"condition": {
"and": [
"toilets:position!=urinal"
]
},
"id": "gender_segregated",
"labels": [
"relevant-questions",
"no-prefix"
],
"question": {
"en": "Are these toilets gender-segregated?",
"nl": "Zijn deze toiletten gescheiden op basis van geslacht?",
@ -688,6 +600,10 @@
},
{
"id": "menstrual_products",
"labels": [
"relevant-questions",
"prefixed"
],
"question": {
"en": "Are free, menstrual products distributed here?",
"nl": "Zijn er gratis menstruatieproducten beschikbaar?",
@ -747,6 +663,10 @@
},
{
"id": "menstrual_products_location",
"labels": [
"relevant-questions",
"prefixed"
],
"question": {
"en": "Where are the free menstrual products located?",
"nl": "Waar bevinden de gratis menstruatieproducten zich?",
@ -756,9 +676,13 @@
"ca": "On estan ubicats els productes menstruals gratuïts?"
},
"condition": {
"or": [
"toilets:menstrual_products=limited",
"toilets:menstrual_products:location~*"
"and": [
{
"or": [
"toilets:menstrual_products=limited",
"toilets:menstrual_products:location~*"
]
}
]
},
"render": {
@ -812,7 +736,8 @@
{
"id": "toilets-changing-table",
"labels": [
"relevant-questions"
"relevant-questions",
"no-prefix"
],
"question": {
"en": "Is a changing table (to change diapers) available?",
@ -859,7 +784,12 @@
},
{
"labels": [
"relevant-questions"
"relevant-questions",
"no-prefix"
],
"labels": [
"relevant-questions",
"no-prefix"
],
"question": {
"en": "Where is the changing table located?",
@ -955,6 +885,10 @@
},
{
"id": "toilet-supervised",
"labels": [
"relevant-questions",
"no-prefix"
],
"question": {
"en": "Is this toilets supervised by a person?",
"nl": "Is er toezicht op deze toilet?"
@ -999,6 +933,10 @@
},
{
"id": "toilet-has-paper",
"labels": [
"relevant-questions",
"prefixed"
],
"labels": [
"relevant-questions"
],
@ -1051,6 +989,10 @@
"labels": [
"relevant-questions"
],
"labels": [
"relevant-questions",
"prefixed"
],
"id": "toilet-handwashing",
"question": {
"en": "Do these toilets have a sink to wash your hands?",
@ -1093,6 +1035,10 @@
},
{
"id": "toilet-drying",
"labels": [
"relevant-questions",
"prefixed"
],
"question": {
"en": "Do these toilets have a device to dry your hands?",
"nl": "Hebben deze toiletten een apparaat om je handen te drogen?"
@ -1135,9 +1081,285 @@
}
}
],
"condition": "toilets:handwashing=yes"
"condition": {
"and": [
"toilets:handwashing=yes"
]
}
},
"description"
"description",
{
"id": "wheelchair-group",
"labels": [
"relevant-questions",
"prefixed"
],
"render": {
"special": {
"type": "group",
"header": "wheelchair-title",
"labels": "wheelchair"
}
}
},
{
"id": "toilets-wheelchair",
"labels": [
"relevant-questions",
"wheelchair",
"hidden",
"no-prefix"
],
"question": {
"en": "Is there a dedicated toilet for wheelchair users?",
"de": "Können Rollstuhlfahrer die Toilette benutzen?",
"fr": "Y a-t-il des toilettes réservées aux personnes en fauteuil roulant ?",
"nl": "Is er een rolstoeltoegankelijke toilet voorzien?",
"it": "C'è un WC riservato alle persone in sedia a rotelle?",
"da": "Er der et særligt toilet til kørestolsbrugere?",
"ca": "Hi ha un lavabo específic per a usuaris amb cadira de rodes?",
"cs": "Je zde vyhrazená toaleta pro vozíčkáře?",
"es": "¿Hay un baño dedicado para usuarios de sillas de ruedas?"
},
"mappings": [
{
"then": {
"en": "There is a dedicated toilet for wheelchair users",
"de": "Rollstuhlfahrer können die Toilette benutzen",
"fr": "Il y a des toilettes réservées pour les personnes à mobilité réduite",
"nl": "Er is een toilet voor rolstoelgebruikers",
"it": "C'è un WC riservato alle persone in sedia a rotelle",
"es": "Hay un baño dedicado para usuarios de sillas de ruedas",
"da": "Der er et særligt toilet til kørestolsbrugere",
"ca": "Hi ha un lavabo dedicat per a usuaris amb cadira de rodes",
"cs": "K dispozici je speciální toaleta pro vozíčkáře"
},
"if": "wheelchair=yes"
},
{
"if": "wheelchair=no",
"then": {
"en": "No wheelchair access",
"de": "Rollstuhlfahrer können die Toilette nicht benutzen",
"fr": "Non accessible aux personnes à mobilité réduite",
"nl": "Niet toegankelijk voor rolstoelgebruikers",
"it": "Non accessibile in sedia a rotelle",
"ru": "Недоступно пользователям кресел-колясок",
"es": "Sin acceso para sillas de ruedas",
"da": "Ingen kørestolsadgang",
"ca": "Sense accés per a cadires de rodes",
"cs": "Žádný bezbariérový přístup"
}
},
{
"if": "wheelchair=designated",
"then": {
"en": "There is only a dedicated toilet for wheelchair users",
"nl": "Er is alleen een toilet voor rolstoelgebruikers",
"de": "Es gibt nur eine barrierefreie Toilette für Rollstuhlfahrer",
"da": "Der er kun et særligt toilet til kørestolsbrugere",
"ca": "És només un lavabo per a usuaris amb cadira de rodes",
"cs": "K dispozici je pouze vyhrazená toaleta pro vozíčkáře",
"es": "Solo hay un baño dedicado para usuarios de sillas de ruedas"
}
}
]
},
{
"id": "wheelchair-picture-carousel",
"condition": {
"and": [
{
"or": [
"wheelchair=yes",
"wheelchair=designated",
"toilets:wheelchair=yes",
"toilets:wheelchair=designated"
]
}
]
},
"labels": [
"wheelchair",
"hidden",
"relevant-questions",
"prefixed"
],
"render": {
"special": {
"type": "image_carousel",
"image_key": "toilets:wheelchair:panoramax;toilets:wheelchair:image;toilets:wheelchair:mapillary"
}
}
},
{
"id": "wheelchair-picture",
"condition": {
"and": [
{
"or": [
"wheelchair=yes",
"wheelchair=designated",
"toilets:wheelchair=yes",
"toilets:wheelchair=designated"
]
}
]
},
"labels": [
"wheelchair",
"hidden",
"relevant-questions",
"prefixed"
],
"render": {
"special": {
"type": "image_upload",
"image_key": "toilets:wheelchair:panoramax",
"label": {
"en": "Add a picture of the wheelchair accessible toilet",
"nl": "Voeg een foto van de rolstoeltoegankelijke toilet toe"
}
}
}
},
{
"id": "wheelchair-title",
"labels": [
"hidden",
"relevant-questions",
"prefixed"
],
"render": {
"en": "Wheelchair accessible toilet",
"nl": "Rolstoeltoegankelijke toilet"
},
"icon": "./assets/layers/toilet/wheelchair.svg",
"mappings": [
{
"if": {
"or": [
"wheelchair=no",
"toilets:wheelchair=no"
]
},
"then": {
"en": "No wheelchair accessible toilet",
"nl": "Geen rolstoeltoegankelijke toilet"
}
}
]
},
{
"id": "wheelchair-access",
"question": {
"en": "Is the wheelchair-accessible toilet locked?",
"nl": "Is de rolstoeltoegankelijke toilet op slot?"
},
"condition": {
"and": [
{
"or": [
"wheelchair=yes",
"wheelchair=designated",
"toilets:wheelchair=yes",
"toilets:wheelchair=designated"
]
},
{
"or": [
"access=yes",
"access=public",
"access=customers"
]
}
]
},
"labels": [
"hidden",
"wheelchair",
"relevant-questions",
"prefixed"
],
"mappings": [
{
"if": "toilets:wheelchair:access=yes",
"alsoShowIf": "toilets:wheelchair:access=",
"then": {
"en": "The wheelchair accessible toilets are freely accessible",
"nl": "De rolstoeltoegankelijke toilet is vrij toegankelijk"
}
},
{
"if": "toilets:wheelchair:access=key",
"icon": "key",
"then": {
"en": "One needs to ask permission to access wheelchair-accessible toilet, e.g. by asking a key",
"nl": "Men moet toestemming vragen om de rolstoeltoegankelijke toilet te gebruiken, bv. door een sleutel te vragen"
}
}
]
},
{
"id": "wheelchair-door-width",
"condition": {
"and": [
{
"or": [
"wheelchair=yes",
"wheelchair=designated",
"toilets:wheelchair=yes",
"toilets:wheelchair=designated"
]
}
]
},
"labels": [
"relevant-questions",
"wheelchair",
"hidden",
"prefixed"
],
"question": {
"en": "What is the width of the door to the wheelchair accessible toilet?",
"nl": "Hoe breed is de deur van de rolstoeltoegankelijke toilet?",
"fr": "Quelle est la largeur de la porte des toilettes accessibles aux fauteuils roulants ?",
"de": "Wie breit ist die Tür zur rollstuhlgerechten Toilette?",
"da": "Hvad er bredden på døren til det kørestolsvenlige toilet?",
"ca": "Quina és l'amplada de la porta per al lavabo accéssible?",
"cs": "Jaká je šířka dveří na bezbariérovou toaletu?",
"es": "¿Cuál es el ancho de la puerta del baño accesible para sillas de ruedas?"
},
"render": {
"en": "The door to the wheelchair-accessible toilet is {canonical(door:width)} wide",
"nl": "De deur naar de rolstoeltoegankelijke toilet is {canonical(door:width)} wide",
"fr": "La porte des toilettes accessibles aux fauteuils roulants a une large de {canonical(door:width)}",
"de": "Die Tür zur rollstuhlgerechten Toilette ist {canonical(door:width)} breit",
"da": "Døren til det kørestolsvenlige toilet er {canonical(door:width)} bred",
"ca": "La porta del vàter accessible amb cadira de rodes té {canonical(door:width)} d'ample",
"cs": "Dveře na bezbariérovou toaletu mají šířku {canonical(door:width)}",
"es": "La puerta del baño accesible para sillas de ruedas tiene {canonical(door:width)} de ancho"
},
"freeform": {
"key": "door:width",
"type": "pfloat"
}
},
{
"id": "questions-wheelchair",
"labels": [
"wheelchair",
"hidden",
"relevant-questions"
],
"render": {
"special": {
"type": "questions",
"show_all": "yes",
"labels": "wheelchair"
}
}
}
],
"filter": [
{
@ -1159,7 +1381,9 @@
"osmTags": {
"or": [
"wheelchair=yes",
"wheelchair=designated"
"wheelchair=designated",
"toilets:wheelchair=yes",
"toilets:wheelchair=designated"
]
}
}

View file

@ -349,6 +349,10 @@
},
{
"id": "toilets-wheelchair",
"labels": [
"wheelchair",
"hidden"
],
"question": {
"en": "Is there a dedicated toilet for wheelchair users?",
"de": "Können Rollstuhlfahrer die Toilette benutzen?",
@ -406,48 +410,21 @@
}
]
},
"toilet.prefixed",
{
"id": "wheelchair-door-width",
"condition": {
"or": [
"toilets:wheelchair=yes",
"toilets:wheelchair=designated"
]
},
"question": {
"en": "What is the width of the door to the wheelchair accessible toilet?",
"nl": "Hoe breed is de deur van de rolstoeltoegankelijke toilet?",
"fr": "Quelle est la largeur de la porte des toilettes accessibles aux fauteuils roulants ?",
"de": "Wie breit ist die Tür zur rollstuhlgerechten Toilette?",
"da": "Hvad er bredden på døren til det kørestolsvenlige toilet?",
"ca": "Quina és l'amplada de la porta del lavabo accessible per a cadira de rodes?",
"cs": "Jaká je šířka dveří na bezbariérovou toaletu?",
"sl": "Koliko so široka vrata v stranišče za invalide na vozičku?",
"es": "¿Cuál es el ancho de la puerta del baño accesible para sillas de ruedas?"
},
"id": "questions-wheelchair",
"labels": [
"wheelchair",
"hidden"
],
"render": {
"en": "The door to the wheelchair-accessible toilet is {canonical(toilets:door:width)} wide",
"nl": "De deur naar de rolstoeltoegankelijke toilet is {canonical(toilets:door:width)} wide",
"fr": "La porte des toilettes accessibles aux fauteuils roulants a une large de {canonical(toilets:door:width)}",
"de": "Die Tür zur rollstuhlgerechten Toilette ist {canonical(toilets:door:width)} breit",
"da": "Døren til det kørestolsvenlige toilet er {canonical(toilets:door:width)} bred",
"ca": "La porta del vàter accessible amb cadira de rodes és {canonical(toilets:door:width)} d'ample",
"cs": "Dveře na toaletu pro vozíčkáře jsou {canonical(toilets:door:width)} široké",
"sl": "Vrata v stranišče za invalide na vozičku so široka {canonical(toilets:door:width)}",
"es": "La puerta del baño accesible para sillas de ruedas tiene {canonical(toilets:door:width)} de ancho"
},
"freeform": {
"key": "toilets:door:width",
"type": "pfloat"
"special": {
"type": "questions",
"labels": "wheelchair",
"show_all": "yes"
}
}
},
"toilet.toilets-type",
"toilet.toilets-changing-table",
"toilet.toilet-changing_table:location",
"toilet.toilet-handwashing",
"toilet.toilet-has-paper",
"toilet.menstrual_products",
"toilet.menstrual_products_location",
{
"builtin": "description",
"override": {

View file

@ -858,21 +858,24 @@
{
"question": {
"en": "All platforms",
"cs": "Všechny platformy"
"cs": "Všechny platformy",
"de": "Alle Plattformen"
},
"quesiton": "All platforms"
},
{
"question": {
"en": "Made with Android",
"cs": "Vytvořeno s Androidem"
"cs": "Vytvořeno s Androidem",
"de": "Mit Android erstellt"
},
"osmTags": "android=yes"
},
{
"question": {
"en": "Made on the web",
"cs": "Vytvořeno na webu"
"cs": "Vytvořeno na webu",
"de": "Im Internet erstellt"
},
"osmTags": "android="
}