From 50a3fe320e4652409f3d5aa99ed3931e2e77b9b1 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@7thposition.com>
Date: Thu, 12 Mar 2015 14:33:06 -0400
Subject: [PATCH] Add `service` field for railways (closes #2552)

---
 data/presets.yaml                             |  7 ++++
 data/presets/fields.json                      | 13 ++++++++
 data/presets/fields/service_rail.json         | 13 ++++++++
 data/presets/presets.json                     | 32 ++++++++++++-------
 data/presets/presets/railway/abandoned.json   |  3 +-
 data/presets/presets/railway/disused.json     |  3 +-
 data/presets/presets/railway/funicular.json   |  3 +-
 data/presets/presets/railway/monorail.json    |  3 +-
 .../presets/presets/railway/narrow_gauge.json |  3 +-
 data/presets/presets/railway/rail.json        |  3 +-
 data/presets/presets/railway/subway.json      | 11 ++++---
 data/presets/presets/railway/tram.json        |  3 +-
 dist/locales/en.json                          |  9 ++++++
 13 files changed, 82 insertions(+), 24 deletions(-)
 create mode 100644 data/presets/fields/service_rail.json

diff --git a/data/presets.yaml b/data/presets.yaml
index 8f34fbef5..8c88c9e08 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -479,6 +479,13 @@ en:
           undefined: Assumed to be No
           "yes": "Yes"
           "no": "No"
+      service_rail:
+        label: Service Type
+        options:
+          spur: Spur
+          yard: Yard
+          siding: Siding
+          crossover: Crossover
       shelter:
         label: Shelter
       shelter_type:
diff --git a/data/presets/fields.json b/data/presets/fields.json
index c4928c964..f82846188 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -977,6 +977,19 @@
             }
         }
     },
+    "service_rail": {
+        "key": "service",
+        "type": "combo",
+        "label": "Service Type",
+        "strings": {
+            "options": {
+                "spur": "Spur",
+                "yard": "Yard",
+                "siding": "Siding",
+                "crossover": "Crossover"
+            }
+        }
+    },
     "shelter": {
         "key": "shelter",
         "type": "check",
diff --git a/data/presets/fields/service_rail.json b/data/presets/fields/service_rail.json
new file mode 100644
index 000000000..8f4e09a92
--- /dev/null
+++ b/data/presets/fields/service_rail.json
@@ -0,0 +1,13 @@
+{
+    "key": "service",
+    "type": "combo",
+    "label": "Service Type",
+    "strings": {
+        "options": {
+            "spur": "Spur",
+            "yard": "Yard",
+            "siding": "Siding",
+            "crossover": "Crossover"
+        }
+    }
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 98da82d38..9ae0b891b 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -6591,7 +6591,8 @@
             "railway": "abandoned"
         },
         "fields": [
-            "structure"
+            "structure",
+            "service_rail"
         ],
         "terms": [],
         "name": "Abandoned Railway"
@@ -6605,7 +6606,8 @@
             "railway": "disused"
         },
         "fields": [
-            "structure"
+            "structure",
+            "service_rail"
         ],
         "terms": [],
         "name": "Disused Railway"
@@ -6623,7 +6625,8 @@
         ],
         "fields": [
             "structure",
-            "gauge"
+            "gauge",
+            "service_rail"
         ],
         "tags": {
             "railway": "funicular"
@@ -6677,7 +6680,8 @@
         },
         "fields": [
             "structure",
-            "electrified"
+            "electrified",
+            "service_rail"
         ],
         "terms": [],
         "name": "Monorail"
@@ -6693,7 +6697,8 @@
         "fields": [
             "structure",
             "gauge",
-            "electrified"
+            "electrified",
+            "service_rail"
         ],
         "terms": [
             "narrow gauge railway",
@@ -6724,7 +6729,8 @@
         "fields": [
             "structure",
             "gauge",
-            "electrified"
+            "electrified",
+            "service_rail"
         ],
         "terms": [],
         "name": "Rail"
@@ -6753,17 +6759,18 @@
     },
     "railway/subway": {
         "icon": "railway-subway",
-        "fields": [
-            "structure",
-            "gauge",
-            "electrified"
-        ],
         "geometry": [
             "line"
         ],
         "tags": {
             "railway": "subway"
         },
+        "fields": [
+            "structure",
+            "gauge",
+            "electrified",
+            "service_rail"
+        ],
         "terms": [],
         "name": "Subway"
     },
@@ -6789,7 +6796,8 @@
         "fields": [
             "structure",
             "gauge",
-            "electrified"
+            "electrified",
+            "service_rail"
         ],
         "terms": [
             "streetcar"
diff --git a/data/presets/presets/railway/abandoned.json b/data/presets/presets/railway/abandoned.json
index 898a96195..7a4a68e4a 100644
--- a/data/presets/presets/railway/abandoned.json
+++ b/data/presets/presets/railway/abandoned.json
@@ -7,7 +7,8 @@
         "railway": "abandoned"
     },
     "fields": [
-        "structure"
+        "structure",
+        "service_rail"
     ],
     "terms": [],
     "name": "Abandoned Railway"
diff --git a/data/presets/presets/railway/disused.json b/data/presets/presets/railway/disused.json
index 748bba069..032e7cce7 100644
--- a/data/presets/presets/railway/disused.json
+++ b/data/presets/presets/railway/disused.json
@@ -7,7 +7,8 @@
         "railway": "disused"
     },
     "fields": [
-        "structure"
+        "structure",
+        "service_rail"
     ],
     "terms": [],
     "name": "Disused Railway"
diff --git a/data/presets/presets/railway/funicular.json b/data/presets/presets/railway/funicular.json
index 5382a4324..48016ba43 100644
--- a/data/presets/presets/railway/funicular.json
+++ b/data/presets/presets/railway/funicular.json
@@ -11,7 +11,8 @@
     ],
     "fields": [
         "structure",
-        "gauge"
+        "gauge",
+        "service_rail"
     ],
     "tags": {
         "railway": "funicular"
diff --git a/data/presets/presets/railway/monorail.json b/data/presets/presets/railway/monorail.json
index f85aa3ea9..b66217ce0 100644
--- a/data/presets/presets/railway/monorail.json
+++ b/data/presets/presets/railway/monorail.json
@@ -8,7 +8,8 @@
     },
     "fields": [
         "structure",
-        "electrified"
+        "electrified",
+        "service_rail"
     ],
     "terms": [],
     "name": "Monorail"
diff --git a/data/presets/presets/railway/narrow_gauge.json b/data/presets/presets/railway/narrow_gauge.json
index 601e09eff..c227b00a7 100644
--- a/data/presets/presets/railway/narrow_gauge.json
+++ b/data/presets/presets/railway/narrow_gauge.json
@@ -9,7 +9,8 @@
     "fields": [
         "structure",
         "gauge",
-        "electrified"
+        "electrified",
+        "service_rail"
     ],
     "terms": [
         "narrow gauge railway",
diff --git a/data/presets/presets/railway/rail.json b/data/presets/presets/railway/rail.json
index 5d3f7f8df..852af52c3 100644
--- a/data/presets/presets/railway/rail.json
+++ b/data/presets/presets/railway/rail.json
@@ -9,7 +9,8 @@
     "fields": [
         "structure",
         "gauge",
-        "electrified"
+        "electrified",
+        "service_rail"
     ],
     "terms": [],
     "name": "Rail"
diff --git a/data/presets/presets/railway/subway.json b/data/presets/presets/railway/subway.json
index 665ff202c..9cf652236 100644
--- a/data/presets/presets/railway/subway.json
+++ b/data/presets/presets/railway/subway.json
@@ -1,16 +1,17 @@
 {
     "icon": "railway-subway",
-    "fields": [
-        "structure",
-        "gauge",
-        "electrified"
-    ],
     "geometry": [
         "line"
     ],
     "tags": {
         "railway": "subway"
     },
+    "fields": [
+        "structure",
+        "gauge",
+        "electrified",
+        "service_rail"
+    ],
     "terms": [],
     "name": "Subway"
 }
diff --git a/data/presets/presets/railway/tram.json b/data/presets/presets/railway/tram.json
index 0304a6509..89273a7d0 100644
--- a/data/presets/presets/railway/tram.json
+++ b/data/presets/presets/railway/tram.json
@@ -9,7 +9,8 @@
     "fields": [
         "structure",
         "gauge",
-        "electrified"
+        "electrified",
+        "service_rail"
     ],
     "terms": ["streetcar"],
     "name": "Tram"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index db6722d36..4df6dd23a 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1183,6 +1183,15 @@
                     "no": "No"
                 }
             },
+            "service_rail": {
+                "label": "Service Type",
+                "options": {
+                    "spur": "Spur",
+                    "yard": "Yard",
+                    "siding": "Siding",
+                    "crossover": "Crossover"
+                }
+            },
             "shelter": {
                 "label": "Shelter"
             },