From bf8c24fd2b580021247f48151ef30a92b3b374f0 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Wed, 28 Mar 2018 00:26:36 -0400 Subject: [PATCH] Add `usage` `voltage` `frequency` fields to several rail presets (closes #4919) --- data/presets.yaml | 16 +++ data/presets/fields.json | 15 +++ data/presets/fields/usage_rail.json | 15 +++ data/presets/presets.json | 120 ++++++++++-------- data/presets/presets/railway/abandoned.json | 11 +- data/presets/presets/railway/disused.json | 9 +- data/presets/presets/railway/light_rail.json | 17 ++- data/presets/presets/railway/monorail.json | 15 ++- .../presets/presets/railway/narrow_gauge.json | 17 ++- data/presets/presets/railway/rail.json | 17 ++- data/presets/presets/railway/subway.json | 17 ++- data/presets/presets/railway/tram.json | 17 ++- dist/locales/en.json | 11 ++ 13 files changed, 197 insertions(+), 100 deletions(-) create mode 100644 data/presets/fields/usage_rail.json diff --git a/data/presets.yaml b/data/presets.yaml index ebbad9435..f95f691de 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -1563,6 +1563,22 @@ en: label: Type # tunnel field placeholder placeholder: Default + usage_rail: + # usage=* + label: Usage Type + options: + # usage=branch + branch: Branch + # usage=industrial + industrial: Industrial + # usage=main + main: Main + # usage=military + military: Military + # usage=test + test: Test + # usage=tourism + tourism: Tourism vending: # vending=* label: Type of Goods diff --git a/data/presets/fields.json b/data/presets/fields.json index dc027c10f..8e9fb51af 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -2112,6 +2112,21 @@ "label": "Type", "placeholder": "Default" }, + "usage_rail": { + "key": "usage", + "type": "combo", + "label": "Usage Type", + "strings": { + "options": { + "main": "Main", + "branch": "Branch", + "industrial": "Industrial", + "military": "Military", + "test": "Test", + "tourism": "Tourism" + } + } + }, "vending": { "key": "vending", "type": "combo", diff --git a/data/presets/fields/usage_rail.json b/data/presets/fields/usage_rail.json new file mode 100644 index 000000000..f13963609 --- /dev/null +++ b/data/presets/fields/usage_rail.json @@ -0,0 +1,15 @@ +{ + "key": "usage", + "type": "combo", + "label": "Usage Type", + "strings": { + "options": { + "main": "Main", + "branch": "Branch", + "industrial": "Industrial", + "military": "Military", + "test": "Test", + "tourism": "Tourism" + } + } +} diff --git a/data/presets/presets.json b/data/presets/presets.json index 8edce98c7..52c005839 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -15499,17 +15499,18 @@ }, "railway/abandoned": { "icon": "railway-abandoned", + "fields": [ + "name", + "structure", + "service_rail", + "usage_rail" + ], "geometry": [ "line" ], "tags": { "railway": "abandoned" }, - "fields": [ - "name", - "structure", - "service_rail" - ], "terms": [], "name": "Abandoned Railway" }, @@ -15562,16 +15563,17 @@ }, "railway/disused": { "icon": "railway-disused", + "fields": [ + "structure", + "service_rail", + "usage_rail" + ], "geometry": [ "line" ], "tags": { "railway": "disused" }, - "fields": [ - "structure", - "service_rail" - ], "terms": [], "name": "Disused Railway" }, @@ -15617,19 +15619,22 @@ }, "railway/light_rail": { "icon": "railway-light-rail", + "fields": [ + "name", + "structure", + "gauge", + "electrified", + "service_rail", + "usage_rail", + "voltage", + "frequency" + ], "geometry": [ "line" ], "tags": { "railway": "light_rail" }, - "fields": [ - "name", - "structure", - "gauge", - "electrified", - "service_rail" - ], "terms": [ "light rail", "streetcar", @@ -15679,36 +15684,42 @@ }, "railway/monorail": { "icon": "railway-monorail", + "fields": [ + "name", + "structure", + "electrified", + "service_rail", + "usage_rail", + "voltage", + "frequency" + ], "geometry": [ "line" ], "tags": { "railway": "monorail" }, - "fields": [ - "name", - "structure", - "electrified", - "service_rail" - ], "terms": [], "name": "Monorail" }, "railway/narrow_gauge": { "icon": "railway-rail", + "fields": [ + "name", + "structure", + "gauge", + "electrified", + "service_rail", + "usage_rail", + "voltage", + "frequency" + ], "geometry": [ "line" ], "tags": { "railway": "narrow_gauge" }, - "fields": [ - "name", - "structure", - "gauge", - "electrified", - "service_rail" - ], "terms": [ "narrow gauge railway", "narrow gauge railroad" @@ -15717,20 +15728,23 @@ }, "railway/rail": { "icon": "railway-rail", - "geometry": [ - "line" - ], - "tags": { - "railway": "rail" - }, "fields": [ "name", "structure", "gauge", "electrified", "maxspeed", - "service_rail" + "service_rail", + "usage_rail", + "voltage", + "frequency" ], + "geometry": [ + "line" + ], + "tags": { + "railway": "rail" + }, "terms": [], "name": "Rail" }, @@ -15774,19 +15788,22 @@ }, "railway/subway": { "icon": "railway-subway", + "fields": [ + "name", + "structure", + "gauge", + "electrified", + "service_rail", + "usage_rail", + "voltage", + "frequency" + ], "geometry": [ "line" ], "tags": { "railway": "subway" }, - "fields": [ - "name", - "structure", - "gauge", - "electrified", - "service_rail" - ], "terms": [ "metro", "transit" @@ -15829,19 +15846,22 @@ }, "railway/tram": { "icon": "railway-light-rail", + "fields": [ + "name", + "structure", + "gauge", + "electrified", + "service_rail", + "usage_rail", + "voltage", + "frequency" + ], "geometry": [ "line" ], "tags": { "railway": "tram" }, - "fields": [ - "name", - "structure", - "gauge", - "electrified", - "service_rail" - ], "terms": [ "light rail", "streetcar", diff --git a/data/presets/presets/railway/abandoned.json b/data/presets/presets/railway/abandoned.json index 80dc4dba0..e452daf3a 100644 --- a/data/presets/presets/railway/abandoned.json +++ b/data/presets/presets/railway/abandoned.json @@ -1,16 +1,17 @@ { "icon": "railway-abandoned", + "fields": [ + "name", + "structure", + "service_rail", + "usage_rail" + ], "geometry": [ "line" ], "tags": { "railway": "abandoned" }, - "fields": [ - "name", - "structure", - "service_rail" - ], "terms": [], "name": "Abandoned Railway" } diff --git a/data/presets/presets/railway/disused.json b/data/presets/presets/railway/disused.json index 032e7cce7..60c1491ea 100644 --- a/data/presets/presets/railway/disused.json +++ b/data/presets/presets/railway/disused.json @@ -1,15 +1,16 @@ { "icon": "railway-disused", + "fields": [ + "structure", + "service_rail", + "usage_rail" + ], "geometry": [ "line" ], "tags": { "railway": "disused" }, - "fields": [ - "structure", - "service_rail" - ], "terms": [], "name": "Disused Railway" } diff --git a/data/presets/presets/railway/light_rail.json b/data/presets/presets/railway/light_rail.json index 462b8f0e4..c990b43c5 100644 --- a/data/presets/presets/railway/light_rail.json +++ b/data/presets/presets/railway/light_rail.json @@ -1,18 +1,21 @@ { "icon": "railway-light-rail", + "fields": [ + "name", + "structure", + "gauge", + "electrified", + "service_rail", + "usage_rail", + "voltage", + "frequency" + ], "geometry": [ "line" ], "tags": { "railway": "light_rail" }, - "fields": [ - "name", - "structure", - "gauge", - "electrified", - "service_rail" - ], "terms": [ "light rail", "streetcar", diff --git a/data/presets/presets/railway/monorail.json b/data/presets/presets/railway/monorail.json index 33a95d440..0034d2ce7 100644 --- a/data/presets/presets/railway/monorail.json +++ b/data/presets/presets/railway/monorail.json @@ -1,17 +1,20 @@ { "icon": "railway-monorail", + "fields": [ + "name", + "structure", + "electrified", + "service_rail", + "usage_rail", + "voltage", + "frequency" + ], "geometry": [ "line" ], "tags": { "railway": "monorail" }, - "fields": [ - "name", - "structure", - "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 a490f924b..9b3708ddf 100644 --- a/data/presets/presets/railway/narrow_gauge.json +++ b/data/presets/presets/railway/narrow_gauge.json @@ -1,18 +1,21 @@ { "icon": "railway-rail", + "fields": [ + "name", + "structure", + "gauge", + "electrified", + "service_rail", + "usage_rail", + "voltage", + "frequency" + ], "geometry": [ "line" ], "tags": { "railway": "narrow_gauge" }, - "fields": [ - "name", - "structure", - "gauge", - "electrified", - "service_rail" - ], "terms": [ "narrow gauge railway", "narrow gauge railroad" diff --git a/data/presets/presets/railway/rail.json b/data/presets/presets/railway/rail.json index 24ef4241a..d50f322e6 100644 --- a/data/presets/presets/railway/rail.json +++ b/data/presets/presets/railway/rail.json @@ -1,19 +1,22 @@ { "icon": "railway-rail", - "geometry": [ - "line" - ], - "tags": { - "railway": "rail" - }, "fields": [ "name", "structure", "gauge", "electrified", "maxspeed", - "service_rail" + "service_rail", + "usage_rail", + "voltage", + "frequency" ], + "geometry": [ + "line" + ], + "tags": { + "railway": "rail" + }, "terms": [], "name": "Rail" } diff --git a/data/presets/presets/railway/subway.json b/data/presets/presets/railway/subway.json index 60c7ca2de..ba1e1b800 100644 --- a/data/presets/presets/railway/subway.json +++ b/data/presets/presets/railway/subway.json @@ -1,18 +1,21 @@ { "icon": "railway-subway", + "fields": [ + "name", + "structure", + "gauge", + "electrified", + "service_rail", + "usage_rail", + "voltage", + "frequency" + ], "geometry": [ "line" ], "tags": { "railway": "subway" }, - "fields": [ - "name", - "structure", - "gauge", - "electrified", - "service_rail" - ], "terms": [ "metro", "transit" diff --git a/data/presets/presets/railway/tram.json b/data/presets/presets/railway/tram.json index 19254c4d7..449a75709 100644 --- a/data/presets/presets/railway/tram.json +++ b/data/presets/presets/railway/tram.json @@ -1,18 +1,21 @@ { "icon": "railway-light-rail", + "fields": [ + "name", + "structure", + "gauge", + "electrified", + "service_rail", + "usage_rail", + "voltage", + "frequency" + ], "geometry": [ "line" ], "tags": { "railway": "tram" }, - "fields": [ - "name", - "structure", - "gauge", - "electrified", - "service_rail" - ], "terms": [ "light rail", "streetcar", diff --git a/dist/locales/en.json b/dist/locales/en.json index ce42d60fc..27c4e4fd7 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2664,6 +2664,17 @@ "label": "Type", "placeholder": "Default" }, + "usage_rail": { + "label": "Usage Type", + "options": { + "main": "Main", + "branch": "Branch", + "industrial": "Industrial", + "military": "Military", + "test": "Test", + "tourism": "Tourism" + } + }, "vending": { "label": "Type of Goods" },