From 06afeded01393f334f915ecee35e41d84c3617ba Mon Sep 17 00:00:00 2001
From: "Nathaniel V. KELSO" <nvkelso@gmail.com>
Date: Tue, 30 Apr 2019 13:48:59 -0700
Subject: [PATCH 1/2] prefer elevator over general subway_entrance

---
 yaml/pois.yaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/yaml/pois.yaml b/yaml/pois.yaml
index 271300c46..ac64e3508 100644
--- a/yaml/pois.yaml
+++ b/yaml/pois.yaml
@@ -2432,6 +2432,12 @@ filters:
     output:
       <<: *output_properties
       kind: {col: tourism}
+  - filter: # prefer elevator over general subway_entrance
+      highway: elevator
+    min_zoom: 17
+    output:
+      <<: *output_properties
+      kind: elevator
   - filter: {railway: subway_entrance}
     min_zoom: 17
     output:
@@ -2766,12 +2772,6 @@ filters:
       <<: *output_properties
       kind: sanitary_dump_station
 
-  - filter: {highway: elevator}
-    min_zoom: 17
-    output:
-      <<: *output_properties
-      kind: elevator
-
   - filter: { historic: wayside_cross }
     min_zoom: 16
     output:

From 6232c3f10207aa152954577478cb8e9e01426794 Mon Sep 17 00:00:00 2001
From: "Nathaniel V. KELSO" <nvkelso@gmail.com>
Date: Tue, 30 Apr 2019 13:49:18 -0700
Subject: [PATCH 2/2] add test for elevator vis-a-vis subway_entrance

---
 .../1876-elevator-subway-entrance.py          | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 integration-test/1876-elevator-subway-entrance.py

diff --git a/integration-test/1876-elevator-subway-entrance.py b/integration-test/1876-elevator-subway-entrance.py
new file mode 100644
index 000000000..b5b5283b6
--- /dev/null
+++ b/integration-test/1876-elevator-subway-entrance.py
@@ -0,0 +1,27 @@
+# -*- encoding: utf-8 -*-
+from . import FixtureTest
+
+
+class BusStopTest(FixtureTest):
+
+    def test_elevator(self):
+        import dsl
+
+        z, x, y = (16, 10482, 25333)
+
+        self.generate_fixtures(
+            # https://www.openstreetmap.org/node/3570271795
+            dsl.point(3570271795, (-122.4195493, 37.7653381), {
+                'bicycle': u'yes',
+                'highway': u'elevator',
+                'railway': u'subway_entrance',
+                'source': u'openstreetmap.org',
+                'wheelchair': u'yes',
+            }),
+        )
+
+        self.assert_has_feature(
+            z, x, y, 'pois', {
+                'id': 3570271795,
+                'kind': u'elevator',
+            })