From 7fb030dc93c39a555052640e40d82b482235ce03 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Wed, 1 Mar 2017 21:01:27 -0500
Subject: [PATCH] Add preset for railway=tram_stop (closes #3677)

---
 data/presets.yaml                           |  7 +++++-
 data/presets/presets.json                   | 25 ++++++++++++++++++++-
 data/presets/presets/railway/tram.json      |  7 +++++-
 data/presets/presets/railway/tram_stop.json | 20 +++++++++++++++++
 data/taginfo.json                           |  4 ++++
 dist/locales/en.json                        |  6 ++++-
 6 files changed, 65 insertions(+), 4 deletions(-)
 create mode 100644 data/presets/presets/railway/tram_stop.json

diff --git a/data/presets.yaml b/data/presets.yaml
index 3243bf023..f4c89fc61 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -3582,8 +3582,13 @@ en:
       railway/tram:
         # railway=tram
         name: Tram
-        # 'terms: streetcar'
+        # 'terms: light rail,streetcar,tram,trolley'
         terms: '<translate with synonyms or related terms for ''Tram'', separated by commas>'
+      railway/tram_stop:
+        # railway=tram_stop
+        name: Tram Stop
+        # 'terms: light rail,streetcar,tram,trolley'
+        terms: '<translate with synonyms or related terms for ''Tram Stop'', separated by commas>'
       relation:
         name: Relation
         terms: '<translate with synonyms or related terms for ''Relation'', separated by commas>'
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 965eca4a6..383c05c91 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -9322,6 +9322,26 @@
             "terms": [],
             "name": "Subway"
         },
+        "railway/tram_stop": {
+            "icon": "rail-light",
+            "fields": [
+                "network",
+                "operator"
+            ],
+            "geometry": [
+                "vertex"
+            ],
+            "tags": {
+                "railway": "tram_stop"
+            },
+            "terms": [
+                "light rail",
+                "streetcar",
+                "tram",
+                "trolley"
+            ],
+            "name": "Tram Stop"
+        },
         "railway/tram": {
             "icon": "railway-light-rail",
             "geometry": [
@@ -9337,7 +9357,10 @@
                 "service_rail"
             ],
             "terms": [
-                "streetcar"
+                "light rail",
+                "streetcar",
+                "tram",
+                "trolley"
             ],
             "name": "Tram"
         },
diff --git a/data/presets/presets/railway/tram.json b/data/presets/presets/railway/tram.json
index 89273a7d0..ae20c35b0 100644
--- a/data/presets/presets/railway/tram.json
+++ b/data/presets/presets/railway/tram.json
@@ -12,6 +12,11 @@
         "electrified",
         "service_rail"
     ],
-    "terms": ["streetcar"],
+    "terms": [
+        "light rail",
+        "streetcar",
+        "tram",
+        "trolley"
+    ],
     "name": "Tram"
 }
diff --git a/data/presets/presets/railway/tram_stop.json b/data/presets/presets/railway/tram_stop.json
new file mode 100644
index 000000000..f01fa1cee
--- /dev/null
+++ b/data/presets/presets/railway/tram_stop.json
@@ -0,0 +1,20 @@
+{
+    "icon": "rail-light",
+    "fields": [
+        "network",
+        "operator"
+    ],
+    "geometry": [
+        "vertex"
+    ],
+    "tags": {
+        "railway": "tram_stop"
+    },
+    "terms": [
+        "light rail",
+        "streetcar",
+        "tram",
+        "trolley"
+    ],
+    "name": "Tram Stop"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 5543c5dd6..69371c7ed 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -2055,6 +2055,10 @@
             "key": "railway",
             "value": "subway"
         },
+        {
+            "key": "railway",
+            "value": "tram_stop"
+        },
         {
             "key": "railway",
             "value": "tram"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index f16648a0d..9313e4cf4 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -3909,9 +3909,13 @@
                     "name": "Subway",
                     "terms": ""
                 },
+                "railway/tram_stop": {
+                    "name": "Tram Stop",
+                    "terms": "light rail,streetcar,tram,trolley"
+                },
                 "railway/tram": {
                     "name": "Tram",
-                    "terms": "streetcar"
+                    "terms": "light rail,streetcar,tram,trolley"
                 },
                 "relation": {
                     "name": "Relation",