From a2615cefe6de5a860a9264b12bfc09258c7aeb53 Mon Sep 17 00:00:00 2001
From: Martin Raifer <martin@raifer.tech>
Date: Mon, 17 Oct 2022 12:06:53 +0200
Subject: [PATCH] add toilets field as optional field of more POI presets & add
 toilets:wheelchair field (#325)

---
 data/fields/toilets/wheelchair.json          | 16 ++++++++++++++++
 data/presets/amenity/cafe.json               |  2 ++
 data/presets/amenity/pub.json                |  2 ++
 data/presets/amenity/restaurant.json         |  2 ++
 data/presets/shop.json                       |  2 ++
 data/presets/tourism/aquarium.json           |  2 ++
 data/presets/tourism/gallery.json            |  2 ++
 data/presets/tourism/information/office.json |  2 ++
 data/presets/tourism/museum.json             |  2 ++
 data/presets/tourism/zoo.json                |  2 ++
 interim/source_strings.yaml                  | 11 +++++++++++
 11 files changed, 45 insertions(+)
 create mode 100644 data/fields/toilets/wheelchair.json

diff --git a/data/fields/toilets/wheelchair.json b/data/fields/toilets/wheelchair.json
new file mode 100644
index 00000000..949545af
--- /dev/null
+++ b/data/fields/toilets/wheelchair.json
@@ -0,0 +1,16 @@
+{
+    "key": "toilets/wheelchair",
+    "type": "radio",
+    "strings": {
+        "options": {
+            "yes": "Yes",
+            "limited": "Limited",
+            "no": "No"
+        }
+    },
+    "label": "Wheelchair Accessible Toilet",
+    "prerequisiteTag": {
+        "key": "toilets",
+        "valueNot": "no"
+    }
+}
diff --git a/data/presets/amenity/cafe.json b/data/presets/amenity/cafe.json
index 8f788d58..5c9e482c 100644
--- a/data/presets/amenity/cafe.json
+++ b/data/presets/amenity/cafe.json
@@ -34,6 +34,8 @@
         "reservation",
         "smoking",
         "takeaway",
+        "toilets",
+        "toilets/wheelchair",
         "wheelchair",
         "highchair"
     ],
diff --git a/data/presets/amenity/pub.json b/data/presets/amenity/pub.json
index 17a0e24d..229c2531 100644
--- a/data/presets/amenity/pub.json
+++ b/data/presets/amenity/pub.json
@@ -29,6 +29,8 @@
         "ref/FR/siret-FR",
         "real_fire-GB-IE",
         "sport_pub",
+        "toilets",
+        "toilets/wheelchair",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/amenity/restaurant.json b/data/presets/amenity/restaurant.json
index 6fdcbf94..cb2dbdee 100644
--- a/data/presets/amenity/restaurant.json
+++ b/data/presets/amenity/restaurant.json
@@ -38,6 +38,8 @@
         "sport_pub",
         "stars",
         "takeaway",
+        "toilets",
+        "toilets/wheelchair",
         "wheelchair",
         "highchair"
     ],
diff --git a/data/presets/shop.json b/data/presets/shop.json
index 7e0ec732..a8a617d7 100644
--- a/data/presets/shop.json
+++ b/data/presets/shop.json
@@ -31,6 +31,8 @@
         "ref/FR/siret-FR",
         "second_hand",
         "stroller",
+        "toilets",
+        "toilets/wheelchair",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/tourism/aquarium.json b/data/presets/tourism/aquarium.json
index f93671ce..441037ab 100644
--- a/data/presets/tourism/aquarium.json
+++ b/data/presets/tourism/aquarium.json
@@ -21,6 +21,8 @@
         "phone",
         "ref/vatin",
         "smoking",
+        "toilets",
+        "toilets/wheelchair",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/tourism/gallery.json b/data/presets/tourism/gallery.json
index d7dcd6f7..dd379573 100644
--- a/data/presets/tourism/gallery.json
+++ b/data/presets/tourism/gallery.json
@@ -18,6 +18,8 @@
         "payment_multi",
         "phone",
         "ref/vatin",
+        "toilets",
+        "toilets/wheelchair",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/tourism/information/office.json b/data/presets/tourism/information/office.json
index 0d222846..b67653d4 100644
--- a/data/presets/tourism/information/office.json
+++ b/data/presets/tourism/information/office.json
@@ -16,6 +16,8 @@
         "height_building",
         "internet_access/ssid",
         "phone",
+        "toilets",
+        "toilets/wheelchair",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/tourism/museum.json b/data/presets/tourism/museum.json
index 79197f2e..27fe10e1 100644
--- a/data/presets/tourism/museum.json
+++ b/data/presets/tourism/museum.json
@@ -25,6 +25,8 @@
         "opening_hours/covid19",
         "payment_multi",
         "phone",
+        "toilets",
+        "toilets/wheelchair",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/tourism/zoo.json b/data/presets/tourism/zoo.json
index 1d4d367c..ce38564f 100644
--- a/data/presets/tourism/zoo.json
+++ b/data/presets/tourism/zoo.json
@@ -19,6 +19,8 @@
         "opening_hours/covid19",
         "phone",
         "ref/vatin",
+        "toilets",
+        "toilets/wheelchair",
         "wheelchair"
     ],
     "geometry": [
diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml
index 4b89d085..6bf9d56b 100644
--- a/interim/source_strings.yaml
+++ b/interim/source_strings.yaml
@@ -3656,6 +3656,17 @@ en:
         # toilets:position=*
         label: Positions
         terms: '[translate with synonyms or related terms for ''Positions'', separated by commas]'
+      toilets/wheelchair:
+        # toilets/wheelchair=*
+        label: Wheelchair Accessible Toilet
+        options:
+          # toilets/wheelchair=limited
+          limited: Limited
+          # toilets/wheelchair=no
+          'no': 'No'
+          # toilets/wheelchair=yes
+          'yes': 'Yes'
+        terms: '[translate with synonyms or related terms for ''Wheelchair Accessible Toilet'', separated by commas]'
       toll:
         # toll=*
         label: Toll