From 06ece1013f8b0eba31501c2a88d04872f80b10b2 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Thu, 10 Jul 2014 09:43:47 -0700
Subject: [PATCH] Re-add an access_simple field with suitable values

---
 data/presets.yaml                               |  3 +++
 data/presets/fields.json                        | 12 ++++++++++++
 data/presets/fields/access_simple.json          |  7 +++++++
 data/presets/presets.json                       |  3 +--
 data/presets/presets/amenity/parking.json       |  1 +
 data/presets/presets/entrance.json              |  1 +
 data/presets/presets/leisure/swimming_pool.json |  3 +++
 dist/locales/en.json                            |  4 ++++
 8 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 data/presets/fields/access_simple.json

diff --git a/data/presets.yaml b/data/presets.yaml
index 1ddc62be1..dd7fb7e74 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -52,6 +52,9 @@ en:
             description: Access permitted only to reach a destination
       access_simple: 
         label: Access
+        placeholder: yes
+      access_toilets: 
+        label: Access
       address: 
         label: Address
         placeholders: 
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 3ceebe93f..a7aee0793 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -50,6 +50,18 @@
         }
     },
     "access_simple": {
+        "key": "access",
+        "type": "combo",
+        "label": "Access",
+        "placeholder": "yes",
+        "options": [
+            "permissive",
+            "private",
+            "customers",
+            "no"
+        ]
+    },
+    "access_toilets": {
         "key": "access",
         "type": "combo",
         "label": "Access",
diff --git a/data/presets/fields/access_simple.json b/data/presets/fields/access_simple.json
new file mode 100644
index 000000000..e2bc42e9e
--- /dev/null
+++ b/data/presets/fields/access_simple.json
@@ -0,0 +1,7 @@
+{
+    "key": "access",
+    "type": "combo",
+    "label": "Access",
+    "placeholder": "yes",
+    "options": ["permissive", "private", "customers", "no"]
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 31f32bc81..63f3d7cd5 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -1660,8 +1660,7 @@
             "toilets/disposal",
             "operator",
             "building_area",
-            "fee",
-            "access_simple"
+            "access_toilets"
         ],
         "geometry": [
             "point",
diff --git a/data/presets/presets/amenity/parking.json b/data/presets/presets/amenity/parking.json
index 0acf80fac..0c362e6b4 100644
--- a/data/presets/presets/amenity/parking.json
+++ b/data/presets/presets/amenity/parking.json
@@ -4,6 +4,7 @@
         "parking",
         "capacity",
         "fee",
+        "access_simple",
         "supervised",
         "park_ride",
         "address"
diff --git a/data/presets/presets/entrance.json b/data/presets/presets/entrance.json
index e77729380..a61e8268b 100644
--- a/data/presets/presets/entrance.json
+++ b/data/presets/presets/entrance.json
@@ -8,6 +8,7 @@
     },
     "fields": [
         "entrance",
+        "access_simple",
         "address"
     ],
     "name": "Entrance/Exit"
diff --git a/data/presets/presets/leisure/swimming_pool.json b/data/presets/presets/leisure/swimming_pool.json
index 134d23d11..09c0dc26e 100644
--- a/data/presets/presets/leisure/swimming_pool.json
+++ b/data/presets/presets/leisure/swimming_pool.json
@@ -1,4 +1,7 @@
 {
+    "fields": [
+        "access_simple"
+    ],
     "geometry": [
         "point",
         "vertex",
diff --git a/dist/locales/en.json b/dist/locales/en.json
index b2a050b07..020b50df8 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -485,6 +485,10 @@
                 }
             },
             "access_simple": {
+                "label": "Access",
+                "placeholder": "yes"
+            },
+            "access_toilets": {
                 "label": "Access"
             },
             "address": {