From cfeabe4d22b2273e4345dd721312519979092e20 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Tue, 8 Apr 2025 02:49:31 +0200 Subject: [PATCH] Themes(toilets): add a ton of accessibility questions --- assets/layers/toilet/MLAK.svg | 43 ++++++ assets/layers/toilet/MLAK.svg.license | 2 + assets/layers/toilet/eurokey.svg | 70 +++++++++ assets/layers/toilet/eurokey.svg.license | 2 + assets/layers/toilet/license_info.json | 18 +++ assets/layers/toilet/toilet.json | 173 +++++++++++++++++++++++ langs/layers/en.json | 57 ++++++++ langs/layers/nl.json | 72 ++++++++++ 8 files changed, 437 insertions(+) create mode 100644 assets/layers/toilet/MLAK.svg create mode 100644 assets/layers/toilet/MLAK.svg.license create mode 100644 assets/layers/toilet/eurokey.svg create mode 100644 assets/layers/toilet/eurokey.svg.license diff --git a/assets/layers/toilet/MLAK.svg b/assets/layers/toilet/MLAK.svg new file mode 100644 index 0000000000..2c6a5ce0b3 --- /dev/null +++ b/assets/layers/toilet/MLAK.svg @@ -0,0 +1,43 @@ + + + + diff --git a/assets/layers/toilet/MLAK.svg.license b/assets/layers/toilet/MLAK.svg.license new file mode 100644 index 0000000000..ed02883002 --- /dev/null +++ b/assets/layers/toilet/MLAK.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/toilet/eurokey.svg b/assets/layers/toilet/eurokey.svg new file mode 100644 index 0000000000..3b387ccf54 --- /dev/null +++ b/assets/layers/toilet/eurokey.svg @@ -0,0 +1,70 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/assets/layers/toilet/eurokey.svg.license b/assets/layers/toilet/eurokey.svg.license new file mode 100644 index 0000000000..14f1c26e79 --- /dev/null +++ b/assets/layers/toilet/eurokey.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Herzi Pinki,Marajozkee +SPDX-License-Identifier: CC-BY-SA 4.0 \ No newline at end of file diff --git a/assets/layers/toilet/license_info.json b/assets/layers/toilet/license_info.json index af127dea4a..21959ec703 100644 --- a/assets/layers/toilet/license_info.json +++ b/assets/layers/toilet/license_info.json @@ -1,4 +1,12 @@ [ + { + "path": "MLAK.svg", + "license": "CC0-1.0", + "authors": [ + "Pieter Vander Vennet" + ], + "sources": [] + }, { "path": "baby.svg", "license": "CC0-1.0", @@ -9,6 +17,16 @@ "https://commons.wikimedia.org/wiki/File:Baby_(75158)_-_The_Noun_Project.svg" ] }, + { + "path": "eurokey.svg", + "license": "CC-BY-SA 4.0", + "authors": [ + "Herzi Pinki,Marajozkee" + ], + "sources": [ + "https://commons.wikimedia.org/wiki/File:Eurokey_sign,_Palace_of_Sch%C3%B6nbrunn_(cropped).svg" + ] + }, { "path": "toilets.svg", "license": "CC0-1.0", diff --git a/assets/layers/toilet/toilet.json b/assets/layers/toilet/toilet.json index 457846c30d..cf6ed429e1 100644 --- a/assets/layers/toilet/toilet.json +++ b/assets/layers/toilet/toilet.json @@ -546,6 +546,40 @@ } ] }, + { + "id": "toilets-disposal", + "labels": [ + "relevant-questions", + "prefixed" + ], + "question": { + "en": "How is the waste handled?", + "nl": "Hoe worden de afvalproducten behandeld?" + }, + "mappings": [ + { + "if": "toilets:disposal=flush", + "then": { + "en": "The waste is moved away by flushing the toilet with water", + "nl": "Het afval wordt afgevoerd door met water te spoelen" + } + }, + { + "if": "toilets:disposal=pitlatrine", + "then": { + "en": "The waste falls into a pit", + "nl": "Het afval valt in een put" + } + }, + { + "if": "toilets:disposal=bucket", + "then": { + "en": "The waste is collected in a bucket or similar container, which is regularly removed", + "nl": "Het afval valt in een emmer of andere opvangbak die regelmatig geleegd wordt" + } + } + ] + }, { "condition": { "and": [ @@ -1283,6 +1317,9 @@ { "if": "toilets:wheelchair:access=yes", "alsoShowIf": "toilets:wheelchair:access=", + "addExtraTags": [ + "centralkey=" + ], "then": { "en": "The wheelchair accessible toilets are freely accessible", "nl": "De rolstoeltoegankelijke toilet is vrij toegankelijk" @@ -1290,11 +1327,52 @@ }, { "if": "toilets:wheelchair:access=key", + "addExtraTags": [ + "centralkey=" + ], "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" } + }, + { + "if": "centralkey=mlak", + "alsoShowIf": "centralkey~i~MLAK", + "icon": "./assets/layers/toilet/MLAK.svg", + "addExtraTags": [ + "toilets:wheelchair:access=centralkey" + ], + "hideInAnswer": "_country!=au", + "then": { + "en": "One can use a Master Locksmiths Access Key (MLAK) to access this bathroom", + "nl": "Men kan met een Master Locksmiths Access Key (MLAK-sleutel) deze toiletten te gebruiken." + } + }, + { + "if": "centralkey=nks", + "alsoShowIf": "centralkey~i~nks", + "hideInAnswer": "_country!=uk", + "addExtraTags": [ + "toilets:wheelchair:access=centralkey" + ], + "then": { + "en": "One can use a RADAR Key to access this bathroom", + "nl": "Men kan met een RADAR-sleutel deze toiletten te gebruiken." + } + }, + { + "if": "centralkey=eurokey", + "alsoShowIf": "centralkey~i~eurokey", + "icon": "./assets/layers/toilet/eurokey.svg", + "hideInAnswer": "_country!=uk", + "addExtraTags": [ + "toilets:wheelchair:access=centralkey" + ], + "then": { + "en": "One can use a EuroKey to access this bathroom", + "nl": "Men kan met een Eurosleutel deze toiletten te gebruiken." + } } ] }, @@ -1343,6 +1421,83 @@ "type": "pfloat" } }, + { + "id": "adult-changing-table-title", + "labels": [ + "hidden", + "prefixed", + "wheelchair" + ], + "render": { + "en": "

Adult changing table

", + "nl": "

Verzorgingstafel voor volwassenen

" + }, + "condition": "changing_table:adult=yes" + }, + { + "id": "adult-changing-table", + "labels": [ + "wheelchair", + "prefixed", + "hidden", + "relevant-questions" + ], + "question": { + "en": "Does this toilet have an adult changing table?", + "nl": "Heeft deze toilet een verzorgingstafel voor volwassenen?" + }, + "mappings": [ + { + "if": "changing_table:adult=yes", + "then": { + "en": "Has a changing table for adults", + "nl": "Heeft een verzorgingstafel voor volwassenen" + } + }, + { + "if": "changing_table:adult=no", + "alsoShowIf": "changing_table:adult=", + "then": { + "en": "No changing table for adults", + "nl": "Geen verzorgingstafel voor volwassenen" + } + } + ] + }, + { + "id": "adult-changing-table-height", + "labels": [ + "hidden", + "prefixed", + "wheelchair" + ], + "question": { + "en": "What is the height of the adult changing table?", + "nl": "Hoe hoog is de verzorgingstafel voor volwassenen?" + }, + "questionHint": { + "en": "This is measured between the floor and the top of the changing table", + "nl": "Dit wordt gemeten van de vloer tot de bovenkant van de verzorgingstafel" + }, + "mappings": [ + { + "if": "changing_table:adult:height=adjustable", + "then": { + "en": "The changing table is adjustable in height", + "nl": "De verzorgingstafel is in hoogte verstelbaar" + } + } + ], + "freeform": { + "key": "changing_table:adult:height", + "type": "distance" + }, + "render": { + "en": "The changing table is {canonical(changing_table:adult:height)} high", + "nl": "De verzorgingstafel is {canonical(changing_table:adult:height)} hoog" + }, + "condition": "changing_table:adult=yes" + }, { "id": "questions-wheelchair", "labels": [ @@ -1357,6 +1512,24 @@ "labels": "wheelchair" } } + }, + { + "builtin": "phone", + "override": { + "question": { + "en": "What number can one call in case of troubles or questions?", + "nl": "Naar welk telefoonnummer kan men bellen voor vragen of om problemen te melden?" + } + } + }, + { + "builtin": "email", + "override": { + "question": { + "en": "What is the email address one can send to in case of troubles or questions?", + "nl": "Naar welk email address kan men sturen voor vragen of om problemen te melden?" + } + } } ], "filter": [ diff --git a/langs/layers/en.json b/langs/layers/en.json index 2d7de409b1..5f0020367a 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -12157,6 +12157,35 @@ } }, "tagRenderings": { + "adult-changing-table": { + "mappings": { + "0": { + "then": "Has a changing table for adults" + }, + "1": { + "then": "No changing table for adults" + } + }, + "question": "Does this toilet have an adult changing table?" + }, + "adult-changing-table-height": { + "mappings": { + "0": { + "then": "The changing table is adjustable in height" + } + }, + "question": "What is the height of the adult changing table?", + "questionHint": "This is measured between the floor and the top of the changing table", + "render": "The changing table is {canonical(changing_table:adult:height)} high" + }, + "adult-changing-table-title": { + "render": "

Adult changing table

" + }, + "email": { + "override": { + "question": "What is the email address one can send to in case of troubles or questions?" + } + }, "gender_segregated": { "mappings": { "0": { @@ -12204,6 +12233,11 @@ "question": "When are these toilets opened?" } }, + "phone": { + "override": { + "question": "What number can one call in case of troubles or questions?" + } + }, "toilet-access": { "mappings": { "0": { @@ -12325,6 +12359,20 @@ }, "question": "Is a changing table (to change diapers) available?" }, + "toilets-disposal": { + "mappings": { + "0": { + "then": "The waste is moved away by flushing the toilet with water" + }, + "1": { + "then": "The waste falls into a pit" + }, + "2": { + "then": "The waste is collected in a bucket or similar container, which is regularly removed" + } + }, + "question": "How is the waste handled?" + }, "toilets-fee": { "mappings": { "0": { @@ -12374,6 +12422,15 @@ }, "1": { "then": "One needs to ask permission to access wheelchair-accessible toilet, e.g. by asking a key" + }, + "2": { + "then": "One can use a Master Locksmiths Access Key (MLAK) to access this bathroom" + }, + "3": { + "then": "One can use a RADAR Key to access this bathroom" + }, + "4": { + "then": "One can use a EuroKey to access this bathroom" } }, "question": "Is the wheelchair-accessible toilet locked?" diff --git a/langs/layers/nl.json b/langs/layers/nl.json index 94f988eca6..b1f6966f9e 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -6536,8 +6536,23 @@ } } }, + "memorial-wikidata": { + "question": "Wat is het Wikipedia-artikel over dit gedenkteken?", + "questionHint": "Dit gaat over het gedenkteken zelf, niet over de persoon of de gebeurtenis die herdacht worden. Indien dit gedenkteken geen Wikipedia-artikel heeft, sla deze vraag dan over.", + "render": { + "before": "

Wikipediapagina over het gedenkteken

" + } + }, "start_date": { + "question": "Wanneer werd dit gedenkteken geplaatst?", "render": "Geplaatst op {start_date}" + }, + "subject-wikidata": { + "question": "Wat is het Wikipedia-artikel over de persoon of de gebeurtenis die herdacht wordt?", + "questionHint": "Indien deze persoon of gebeurtenis geen Wikipedia-artikel heeft, sla deze vraag dan over", + "render": { + "before": "

Wikipedia-artikel over de herdachte gebeurtenis of persoon

" + } } } }, @@ -9722,6 +9737,35 @@ } }, "tagRenderings": { + "adult-changing-table": { + "mappings": { + "0": { + "then": "Heeft een verzorgingstafel voor volwassenen" + }, + "1": { + "then": "Geen verzorgingstafel voor volwassenen" + } + }, + "question": "Heeft deze toilet een verzorgingstafel voor volwassenen?" + }, + "adult-changing-table-height": { + "mappings": { + "0": { + "then": "De verzorgingstafel is in hoogte verstelbaar" + } + }, + "question": "Hoe hoog is de verzorgingstafel voor volwassenen?", + "questionHint": "Dit wordt gemeten van de vloer tot de bovenkant van de verzorgingstafel", + "render": "De verzorgingstafel is {canonical(changing_table:adult:height)} hoog" + }, + "adult-changing-table-title": { + "render": "

Verzorgingstafel voor volwassenen

" + }, + "email": { + "override": { + "question": "Naar welk email address kan men sturen voor vragen of om problemen te melden?" + } + }, "gender_segregated": { "mappings": { "0": { @@ -9769,6 +9813,11 @@ "question": "Wanneer zijn deze toiletten open?" } }, + "phone": { + "override": { + "question": "Naar welk telefoonnummer kan men bellen voor vragen of om problemen te melden?" + } + }, "toilet-access": { "mappings": { "0": { @@ -9890,6 +9939,20 @@ }, "question": "Is er een luiertafel beschikbaar?" }, + "toilets-disposal": { + "mappings": { + "0": { + "then": "Het afval wordt afgevoerd door met water te spoelen" + }, + "1": { + "then": "Het afval valt in een put" + }, + "2": { + "then": "Het afval valt in een emmer of andere opvangbak die regelmatig geleegd wordt" + } + }, + "question": "Hoe worden de afvalproducten behandeld?" + }, "toilets-fee": { "mappings": { "0": { @@ -9939,6 +10002,15 @@ }, "1": { "then": "Men moet toestemming vragen om de rolstoeltoegankelijke toilet te gebruiken, bv. door een sleutel te vragen" + }, + "2": { + "then": "Men kan met een Master Locksmiths Access Key (MLAK-sleutel) deze toiletten te gebruiken." + }, + "3": { + "then": "Men kan met een RADAR-sleutel deze toiletten te gebruiken." + }, + "4": { + "then": "Men kan met een Eurosleutel deze toiletten te gebruiken." } }, "question": "Is de rolstoeltoegankelijke toilet op slot?"