From 6de3db3f3dbb020beb68c0427e9bbcac556e911b Mon Sep 17 00:00:00 2001
From: JamesKingdom <james@unetworks.org>
Date: Mon, 31 Jul 2017 19:35:44 +0100
Subject: [PATCH] Updating milestone to triangle-stroked, and building NPM

---
 data/presets.yaml                           | 25 +++++++
 data/presets/presets.json                   | 73 +++++++++++++++++++++
 data/presets/presets/railway/milestone.json |  2 +-
 data/taginfo.json                           | 20 ++++++
 dist/locales/en.json                        | 20 ++++++
 5 files changed, 139 insertions(+), 1 deletion(-)

diff --git a/data/presets.yaml b/data/presets.yaml
index c992fa4e4..549854fbe 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -3760,6 +3760,11 @@ en:
         name: Railway Crossing (Path)
         # 'terms: crossing,pedestrian crossing,railroad crossing,level crossing,grade crossing,path through railroad,train crossing'
         terms: '<translate with synonyms or related terms for ''Railway Crossing (Path)'', separated by commas>'
+      railway/derail:
+        # railway=derail
+        name: Railway Derailer
+        # 'terms: derailer'
+        terms: '<translate with synonyms or related terms for ''Railway Derailer'', separated by commas>'
       railway/disused:
         # railway=disused
         name: Disused Railway
@@ -3779,6 +3784,11 @@ en:
         name: Railway Crossing (Road)
         # 'terms: crossing,railroad crossing,level crossing,grade crossing,road through railroad,train crossing'
         terms: '<translate with synonyms or related terms for ''Railway Crossing (Road)'', separated by commas>'
+      railway/milestone:
+        # railway=milestone
+        name: Railway Milestone
+        # 'terms: milestone,marker'
+        terms: '<translate with synonyms or related terms for ''Railway Milestone'', separated by commas>'
       railway/monorail:
         # railway=monorail
         name: Monorail
@@ -3796,6 +3806,11 @@ en:
         # railway=rail
         name: Rail
         terms: '<translate with synonyms or related terms for ''Rail'', separated by commas>'
+      railway/signal:
+        # railway=signal
+        name: Railway Signal
+        # 'terms: signal,lights'
+        terms: '<translate with synonyms or related terms for ''Railway Signal'', separated by commas>'
       railway/station:
         # railway=station
         name: Railway Station
@@ -3811,6 +3826,16 @@ en:
         name: Subway Entrance
         # 'terms: metro,transit'
         terms: '<translate with synonyms or related terms for ''Subway Entrance'', separated by commas>'
+      railway/switch:
+        # railway=switch
+        name: Railway Switch
+        # 'terms: switch,points'
+        terms: '<translate with synonyms or related terms for ''Railway Switch'', separated by commas>'
+      railway/train_wash:
+        # railway=wash
+        name: Train Wash
+        # 'terms: wash,clean'
+        terms: '<translate with synonyms or related terms for ''Train Wash'', separated by commas>'
       railway/tram:
         # railway=tram
         name: Tram
diff --git a/data/presets/presets.json b/data/presets/presets.json
index c45969634..7ade44fbf 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -10313,6 +10313,19 @@
             ],
             "name": "Railway Crossing (Path)"
         },
+        "railway/derail": {
+            "icon": "roadblock",
+            "geometry": [
+                "vertex"
+            ],
+            "tags": {
+                "railway": "derail"
+            },
+            "terms": [
+                "derailer"
+            ],
+            "name": "Railway Derailer"
+        },
         "railway/disused": {
             "icon": "railway-disused",
             "geometry": [
@@ -10386,6 +10399,21 @@
             ],
             "name": "Railway Crossing (Road)"
         },
+        "railway/milestone": {
+            "icon": "triangle-stroked",
+            "geometry": [
+                "point",
+                "vertex"
+            ],
+            "tags": {
+                "railway": "milestone"
+            },
+            "terms": [
+                "milestone",
+                "marker"
+            ],
+            "name": "Railway Milestone"
+        },
         "railway/monorail": {
             "icon": "railway-monorail",
             "geometry": [
@@ -10457,6 +10485,21 @@
             "terms": [],
             "name": "Rail"
         },
+        "railway/signal": {
+            "icon": "poi-junction",
+            "geometry": [
+                "point",
+                "vertex"
+            ],
+            "tags": {
+                "railway": "signal"
+            },
+            "terms": [
+                "signal",
+                "lights"
+            ],
+            "name": "Railway Signal"
+        },
         "railway/station": {
             "icon": "rail",
             "fields": [
@@ -10517,6 +10560,36 @@
             ],
             "name": "Subway"
         },
+        "railway/switch": {
+            "icon": "poi-junction",
+            "geometry": [
+                "vertex"
+            ],
+            "tags": {
+                "railway": "switch"
+            },
+            "terms": [
+                "switch",
+                "points"
+            ],
+            "name": "Railway Switch"
+        },
+        "railway/train_wash": {
+            "icon": "rail",
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "tags": {
+                "railway": "wash"
+            },
+            "terms": [
+                "wash",
+                "clean"
+            ],
+            "name": "Train Wash"
+        },
         "railway/tram_stop": {
             "icon": "rail-light",
             "fields": [
diff --git a/data/presets/presets/railway/milestone.json b/data/presets/presets/railway/milestone.json
index ac79e3fad..e7167b829 100644
--- a/data/presets/presets/railway/milestone.json
+++ b/data/presets/presets/railway/milestone.json
@@ -1,5 +1,5 @@
 {
-    "icon": "roadblock",
+    "icon": "triangle-stroked",
     "geometry": [
         "point",
         "vertex"
diff --git a/data/taginfo.json b/data/taginfo.json
index 245fb9134..0dfc9f114 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -2137,6 +2137,10 @@
             "key": "railway",
             "value": "crossing"
         },
+        {
+            "key": "railway",
+            "value": "derail"
+        },
         {
             "key": "railway",
             "value": "disused"
@@ -2153,6 +2157,10 @@
             "key": "railway",
             "value": "level_crossing"
         },
+        {
+            "key": "railway",
+            "value": "milestone"
+        },
         {
             "key": "railway",
             "value": "monorail"
@@ -2169,6 +2177,10 @@
             "key": "railway",
             "value": "rail"
         },
+        {
+            "key": "railway",
+            "value": "signal"
+        },
         {
             "key": "railway",
             "value": "station"
@@ -2181,6 +2193,14 @@
             "key": "railway",
             "value": "subway"
         },
+        {
+            "key": "railway",
+            "value": "switch"
+        },
+        {
+            "key": "railway",
+            "value": "wash"
+        },
         {
             "key": "railway",
             "value": "tram_stop"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 9d9ec0214..fa7219167 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -4404,6 +4404,10 @@
                     "name": "Railway Crossing (Path)",
                     "terms": "crossing,pedestrian crossing,railroad crossing,level crossing,grade crossing,path through railroad,train crossing"
                 },
+                "railway/derail": {
+                    "name": "Railway Derailer",
+                    "terms": "derailer"
+                },
                 "railway/disused": {
                     "name": "Disused Railway",
                     "terms": ""
@@ -4420,6 +4424,10 @@
                     "name": "Railway Crossing (Road)",
                     "terms": "crossing,railroad crossing,level crossing,grade crossing,road through railroad,train crossing"
                 },
+                "railway/milestone": {
+                    "name": "Railway Milestone",
+                    "terms": "milestone,marker"
+                },
                 "railway/monorail": {
                     "name": "Monorail",
                     "terms": ""
@@ -4436,6 +4444,10 @@
                     "name": "Rail",
                     "terms": ""
                 },
+                "railway/signal": {
+                    "name": "Railway Signal",
+                    "terms": "signal,lights"
+                },
                 "railway/station": {
                     "name": "Railway Station",
                     "terms": "train station,station"
@@ -4448,6 +4460,14 @@
                     "name": "Subway",
                     "terms": "metro,transit"
                 },
+                "railway/switch": {
+                    "name": "Railway Switch",
+                    "terms": "switch,points"
+                },
+                "railway/train_wash": {
+                    "name": "Train Wash",
+                    "terms": "wash,clean"
+                },
                 "railway/tram_stop": {
                     "name": "Tram Stop",
                     "terms": "light rail,streetcar,tram,trolley"