Standardize on one access_simple field that includes "yes" option

(closes #4383) `access_toilets` used to be the only one with the "yes" option, now it's not needed.
openstreetmap · Oct 2, 2017 · a20cc8e · a20cc8e
1 parent b0c50bc
commit a20cc8e
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 34 deletions.
diff --git a/data/presets.yaml b/data/presets.yaml
@@ -80,9 +80,6 @@ en:
       access_simple:
         # access=*
         label: Allowed Access
-      access_toilets:
-        # access=*
-        label: Access
       address:
         # 'addr:block_number=*, addr:city=*, addr:block_number=*, addr:conscriptionnumber=*, addr:county=*, addr:country=*, addr:county=*, addr:district=*, addr:floor=*, addr:hamlet=*, addr:housename=*, addr:housenumber=*, addr:neighbourhood=*, addr:place=*, addr:postcode=*, addr:province=*, addr:quarter=*, addr:state=*, addr:street=*, addr:subdistrict=*, addr:suburb=*, addr:unit=*'
         label: Address

diff --git a/data/presets/README.md b/data/presets/README.md
@@ -70,10 +70,10 @@ Fields are reusable form elements that can be associated with presets.
 Fields are defined in JSON files located under `data/presets/fields`.
 
 The field files are typically named according to their associated OSM key.
-For example, the field for the tag `access=*` is stored in the file
-`data/presets/fields/access.json`.  Note that there are exceptions to this rule
-for fields that might work differently depending on which preset is active
-(`access_simple.json`, `access_toilets.json`).
+For example, the field for the tag `sport=*` is stored in the file
+`data/presets/fields/sport.json`.  When a field has multiple versions that
+depend on which preset is active, we add a suffix to the filename:
+(`sport.json`, `sport_ice.json`, `sport_racing_motor.json`).
 
 Some keys in OSM are namespaced using colons (':').  Namespaced fields
 are nested in folders according to their tag.

diff --git a/data/presets/fields.json b/data/presets/fields.json
@@ -5,23 +5,13 @@
             "type": "combo",
             "label": "Allowed Access",
             "options": [
+                "yes",
                 "permissive",
                 "private",
                 "customers",
                 "no"
             ]
         },
-        "access_toilets": {
-            "key": "access",
-            "type": "combo",
-            "label": "Access",
-            "options": [
-                "yes",
-                "permissive",
-                "private",
-                "customers"
-            ]
-        },
         "access": {
             "keys": [
                 "access",

diff --git a/data/presets/fields/access_simple.json b/data/presets/fields/access_simple.json
@@ -2,5 +2,5 @@
     "key": "access",
     "type": "combo",
     "label": "Allowed Access",
-    "options": ["permissive", "private", "customers", "no"]
+    "options": ["yes", "permissive", "private", "customers", "no"]
 }
diff --git a/data/presets/fields/access_toilets.json b/data/presets/fields/access_toilets.json
diff --git a/data/presets/presets.json b/data/presets/presets.json
@@ -2594,7 +2594,7 @@
             "icon": "poi-storage-tank",
             "fields": [
                 "operator",
-                "access_toilets",
+                "access_simple",
                 "fee",
                 "water_point"
             ],
@@ -2953,7 +2953,7 @@
                 "toilets/disposal",
                 "operator",
                 "building_area",
-                "access_toilets",
+                "access_simple",
                 "gender",
                 "fee",
                 "diaper"
@@ -16105,7 +16105,7 @@
             "fields": [
                 "name",
                 "operator",
-                "access_toilets",
+                "access_simple",
                 "fee",
                 "water_point"
             ],

diff --git a/data/presets/presets/amenity/sanitary_dump_station.json b/data/presets/presets/amenity/sanitary_dump_station.json
@@ -2,7 +2,7 @@
     "icon": "poi-storage-tank",
     "fields": [
         "operator",
-        "access_toilets",
+        "access_simple",
         "fee",
         "water_point"
     ],

diff --git a/data/presets/presets/amenity/toilets.json b/data/presets/presets/amenity/toilets.json
@@ -4,7 +4,7 @@
         "toilets/disposal",
         "operator",
         "building_area",
-        "access_toilets",
+        "access_simple",
         "gender",
         "fee",
         "diaper"

diff --git a/data/presets/presets/waterway/sanitary_dump_station.json b/data/presets/presets/waterway/sanitary_dump_station.json
@@ -3,7 +3,7 @@
     "fields": [
         "name",
         "operator",
-        "access_toilets",
+        "access_simple",
         "fee",
         "water_point"
     ],

diff --git a/dist/locales/en.json b/dist/locales/en.json
@@ -1097,9 +1097,6 @@
                 "access_simple": {
                     "label": "Allowed Access"
                 },
-                "access_toilets": {
-                    "label": "Access"
-                },
                 "access": {
                     "label": "Allowed Access",
                     "placeholder": "Not Specified",