From 250bfdad27e1e4a0d25ee9ef218d17ac661d0650 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Tue, 27 Aug 2013 11:41:34 -0700
Subject: [PATCH] Fix toilet access field (fixes #1754)

---
 data/presets.yaml                         |  2 ++
 data/presets/fields.json                  | 11 +++++++++++
 data/presets/fields/access_toilets.json   |  6 ++++++
 data/presets/presets.json                 |  2 +-
 data/presets/presets/amenity/toilets.json |  2 +-
 dist/locales/en.json                      |  5 ++++-
 6 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 data/presets/fields/access_toilets.json

diff --git a/data/presets.yaml b/data/presets.yaml
index 6154e59e0..8acc09b34 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -42,6 +42,8 @@ en:
           destination: 
             title: Destination
             description: Access permitted only to reach a destination
+      access_toilets: 
+        label: Access
       address: 
         label: Address
         placeholders: 
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 812832a43..6392661fd 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -46,6 +46,17 @@
             }
         }
     },
+    "access_toilets": {
+        "key": "access",
+        "type": "combo",
+        "label": "Access",
+        "options": [
+            "public",
+            "permissive",
+            "private",
+            "customers"
+        ]
+    },
     "address": {
         "type": "address",
         "keys": [
diff --git a/data/presets/fields/access_toilets.json b/data/presets/fields/access_toilets.json
new file mode 100644
index 000000000..d3bb1948b
--- /dev/null
+++ b/data/presets/fields/access_toilets.json
@@ -0,0 +1,6 @@
+{
+    "key": "access",
+    "type": "combo",
+    "label": "Access",
+    "options": ["public", "permissive", "private", "customers"]
+}
\ No newline at end of file
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 2f1488f9f..9fb7ff614 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -1102,7 +1102,7 @@
             "toilets/disposal",
             "operator",
             "building_area",
-            "access"
+            "access_toilets"
         ],
         "geometry": [
             "point",
diff --git a/data/presets/presets/amenity/toilets.json b/data/presets/presets/amenity/toilets.json
index 1893840b2..033b9e9f8 100644
--- a/data/presets/presets/amenity/toilets.json
+++ b/data/presets/presets/amenity/toilets.json
@@ -3,7 +3,7 @@
         "toilets/disposal",
         "operator",
         "building_area",
-        "access"
+        "access_toilets"
     ],
     "geometry": [
         "point",
diff --git a/dist/locales/en.json b/dist/locales/en.json
index f9e276496..8f702b2a6 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -425,6 +425,9 @@
                     }
                 }
             },
+            "access_toilets": {
+                "label": "Access"
+            },
             "address": {
                 "label": "Address",
                 "placeholders": {
@@ -2041,4 +2044,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file