Osmwithspace/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Themes(toilet_at_amenity): add grab_rail questions to toilet_at_amenity (by adding more labels in toilets.json), make sure "add image" shows up, include toilet_at_amenity in more layers

Browse source
This commit is contained in:
Pieter Vander Vennet 2025-06-06 18:18:10 +02:00
parent f88fade35b
commit afc93d8973
6 changed files with 98 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
assets/layers/doctors/doctors.json
View file

@ -197,7 +197,8 @@
}
}
]
}
},
"toilet_at_amenity_lib.all"
],
"filter": [
"open_now",

3
assets/layers/ice_cream/ice_cream.json
View file

@ -137,7 +137,8 @@
"contact",
"diets",
"payment-options",
"wheelchair-access"
"wheelchair-access",
"toilet_at_amenity_lib.all"
],
"allowMove": true,
"credits": [

3
assets/layers/pharmacy/pharmacy.json
View file

@ -161,7 +161,8 @@
"contact",
"address.address",
"payment-options",
"wheelchair"
"wheelchair",
"toilet_at_amenity_lib.all"
],
"filter": [
{

101
assets/layers/toilet/toilet.json
View file

@ -1264,7 +1264,13 @@
{
"#": "NOT on designated",
"or": [
"wheelchair=yes",
{
"#": "Only trigger this if it is a proper toilet, not a toilet_at_amenity",
"and": [
"wheelchair=yes",
"amenity=toilets"
]
},
"toilets:wheelchair=yes"
]
}
@ -1291,7 +1297,13 @@
{
"#": "NOT on designated",
"or": [
"wheelchair=yes",
{
"#": "Only trigger this if it is a proper toilet, not a toilet_at_amenity",
"and": [
"wheelchair=yes",
"amenity=toilets"
]
},
"toilets:wheelchair=yes"
]
}
@ -1370,7 +1382,13 @@
"and": [
{
"or": [
"wheelchair=yes",
{
"#": "Only trigger this if it is a proper toilet, not a toilet_at_amenity",
"and": [
"wheelchair=yes",
"amenity=toilets"
]
},
"toilets:wheelchair=yes"
]
},
@ -1466,14 +1484,33 @@
"builtin": "grab_rail.has_grab_rail_lr",
"override": {
"labels+": [
"wheelchair"
"wheelchair",
"relevant-questions",
"prefixed",
"amenity-prefixed"
],
"questionHint": {
"en": "Left and right are interpreted as when <b>sitting</b> on the toilet",
"nl": "Links en rechts zijn zoals wanneer je <b>zit</b> op de toilet",
"it": "Sinistra e destra sono interpretate come quando si è <b>seduti</b> sul WC"
},
"condition": "wheelchair=yes"
"condition": {
"and+": [
{
"#": "NOT on designated",
"or": [
{
"#": "Only trigger this if it is a proper toilet, not a toilet_at_amenity",
"and": [
"wheelchair=yes",
"amenity=toilets"
]
},
"toilets:wheelchair=yes"
]
}
]
}
},
"prefix": "toilets:wheelchair"
},
@ -1481,9 +1518,28 @@
"builtin": "grab_rail.has_grab_rail_behind",
"override": {
"labels+": [
"wheelchair"
"wheelchair",
"relevant-questions",
"prefixed",
"amenity-prefixed"
],
"condition": "wheelchair=yes"
"condition": {
"and+": [
{
"#": "NOT on designated",
"or": [
{
"#": "Only trigger this if it is a proper toilet, not a toilet_at_amenity",
"and": [
"wheelchair=yes",
"amenity=toilets"
]
},
"toilets:wheelchair=yes"
]
}
]
}
},
"prefix": "toilets:wheelchair"
},
@ -1491,11 +1547,26 @@
"builtin": "grab_rail.generic_questions",
"override": {
"labels+": [
"wheelchair"
"wheelchair",
"relevant-questions",
"prefixed",
"amenity-prefixed"
],
"condition": {
"and+": [
"wheelchair=yes"
{
"#": "NOT on designated",
"or": [
{
"#": "Only trigger this if it is a proper toilet, not a toilet_at_amenity",
"and": [
"wheelchair=yes",
"amenity=toilets"
]
},
"toilets:wheelchair=yes"
]
}
]
}
},
@ -1507,9 +1578,12 @@
"and": [
{
"or": [
"wheelchair=yes",
"wheelchair=designated",
"toilets:wheelchair=yes",
{
"and": [
"amenity=toilet",
"wheelchair~yes|designated"
]
},
"toilets:wheelchair=designated"
]
}
@ -1519,7 +1593,8 @@
"relevant-questions",
"wheelchair",
"hidden",
"prefixed"
"prefixed",
"amenity-prefixed"
],
"question": {
"en": "What is the width of the door to the wheelchair accessible toilet?",

3
assets/layers/toilet_at_amenity/toilet_at_amenity.json
View file

@ -145,7 +145,8 @@
"lineRendering": [],
"tagRenderings": [
{
"id": "images",
"id": "images_toilet",
"labels": ["relevant_questions"],
"render": {
"special": {
"before": "{image_carousel(toilets:panoramax;toilets:mapillary;toilets:images)}",

3
assets/layers/toilet_at_amenity_lib/toilet_at_amenity_lib.json
View file

@ -88,7 +88,8 @@
"render": {
"special": {
"type": "questions",
"labels": "toilet-questions"
"labels": "toilet-questions",
"blacklisted-labels": "wheelchair;adult-changing-table;hidden"
}
}
}