From 04f2f610d738cb98cd25f81a6d3699da21eb7465 Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Mon, 6 Jan 2020 11:17:27 -0500
Subject: [PATCH] Add wheelchair field to entrance and subway entrance presets
 (close #7214) Add ref field to entrance preset

---
 data/presets/presets.json                     |  4 ++--
 data/presets/presets/entrance.json            | 22 ++++++++++---------
 .../presets/railway/subway_entrance.json      |  3 ++-
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/data/presets/presets.json b/data/presets/presets.json
index 30aa47a90..b9f5f74f0 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -455,7 +455,7 @@
     "emergency/phone": {"icon": "maki-emergency-phone", "fields": ["ref", "operator", "covered", "indoor", "booth"], "moreFields": ["level"], "geometry": ["point", "vertex"], "tags": {"emergency": "phone"}, "name": "Emergency Phone"},
     "emergency/siren": {"icon": "fas-volume-up", "fields": ["siren/purpose", "siren/type", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["air raid", "loud", "noise", "storm", "tornado", "warning"], "tags": {"emergency": "siren"}, "name": "Siren"},
     "emergency/water_tank": {"icon": "maki-water", "fields": ["name", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["water tank", "cistern", "reservoir"], "tags": {"emergency": "water_tank"}, "name": "Emergency Water Tank"},
-    "entrance": {"icon": "maki-entrance-alt1", "geometry": ["vertex"], "terms": ["entrance", "exit", "door"], "tags": {"entrance": "*"}, "fields": ["entrance", "door", "access_simple", "level", "address"], "matchScore": 0.8, "name": "Entrance/Exit"},
+    "entrance": {"icon": "maki-entrance-alt1", "fields": ["ref", "entrance", "door", "access_simple", "wheelchair", "level", "address"], "geometry": ["vertex"], "tags": {"entrance": "*"}, "terms": ["entrance", "exit", "door"], "matchScore": 0.8, "name": "Entrance/Exit"},
     "entrance/emergency": {"icon": "maki-entrance-alt1", "fields": ["ref", "door", "access_simple", "level"], "geometry": ["vertex"], "tags": {"entrance": "emergency"}, "terms": ["fire exit", "door"], "matchScore": 0.8, "name": "Emergency Exit"},
     "ford": {"icon": "temaki-pedestrian", "fields": ["name", "access", "seasonal"], "moreFields": ["gnis/feature_id"], "geometry": ["vertex"], "tags": {"ford": "yes"}, "name": "Ford"},
     "golf/bunker": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "bunker"}, "addTags": {"golf": "bunker", "natural": "sand"}, "terms": ["hazard", "bunker"], "name": "Sand Trap"},
@@ -999,7 +999,7 @@
     "railway/rail": {"icon": "iD-railway-rail", "fields": ["name", "operator", "structure", "gauge", "electrified", "service_rail", "usage_rail"], "moreFields": ["covered", "frequency_electrified", "highspeed", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "rail"}, "terms": ["rail line", "railroad track", "train track"], "name": "Rail"},
     "railway/rail/highspeed": {"icon": "iD-railway-rail", "geometry": ["line"], "tags": {"railway": "rail", "highspeed": "yes"}, "reference": {"key": "highspeed"}, "terms": ["bullet train", "fast rail", "high speed rail", "highspeed rail", "HSR"], "name": "High-Speed Rail"},
     "railway/signal": {"icon": "temaki-railway_signals", "geometry": ["point", "vertex"], "fields": ["railway/position", "railway/signal/direction", "ref"], "tags": {"railway": "signal"}, "terms": ["signal", "lights"], "name": "Railway Signal"},
-    "railway/subway_entrance": {"icon": "maki-entrance", "geometry": ["point", "vertex"], "fields": ["name", "level"], "tags": {"railway": "subway_entrance"}, "terms": ["metro", "transit"], "name": "Subway Entrance"},
+    "railway/subway_entrance": {"icon": "maki-entrance", "geometry": ["point", "vertex"], "fields": ["name", "level", "wheelchair"], "tags": {"railway": "subway_entrance"}, "terms": ["metro", "transit"], "name": "Subway Entrance"},
     "railway/subway": {"icon": "temaki-subway", "fields": ["{railway/rail}"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "subway"}, "terms": ["metro", "transit"], "name": "Subway"},
     "railway/switch": {"icon": "temaki-junction", "geometry": ["vertex"], "tags": {"railway": "switch"}, "terms": ["switch", "points"], "name": "Railway Switch"},
     "railway/train_wash": {"icon": "maki-rail", "geometry": ["point", "vertex", "area"], "fields": ["operator", "building_area"], "tags": {"railway": "wash"}, "terms": ["wash", "clean"], "name": "Train Wash"},
diff --git a/data/presets/presets/entrance.json b/data/presets/presets/entrance.json
index 51951e4f3..885b3d90c 100644
--- a/data/presets/presets/entrance.json
+++ b/data/presets/presets/entrance.json
@@ -1,23 +1,25 @@
 {
     "icon": "maki-entrance-alt1",
+    "fields": [
+        "ref",
+        "entrance",
+        "door",
+        "access_simple",
+        "wheelchair",
+        "level",
+        "address"
+    ],
     "geometry": [
         "vertex"
     ],
+    "tags": {
+        "entrance": "*"
+    },
     "terms": [
         "entrance",
         "exit",
         "door"
     ],
-    "tags": {
-        "entrance": "*"
-    },
-    "fields": [
-        "entrance",
-        "door",
-        "access_simple",
-        "level",
-        "address"
-    ],
     "matchScore": 0.8,
     "name": "Entrance/Exit"
 }
diff --git a/data/presets/presets/railway/subway_entrance.json b/data/presets/presets/railway/subway_entrance.json
index b593bd040..2a2e924d8 100644
--- a/data/presets/presets/railway/subway_entrance.json
+++ b/data/presets/presets/railway/subway_entrance.json
@@ -6,7 +6,8 @@
     ],
     "fields": [
         "name",
-        "level"
+        "level",
+        "wheelchair"
     ],
     "tags": {
         "railway": "subway_entrance"