From 8535bbc57cd27c5cee2a92b3cce2b82bc5e33551 Mon Sep 17 00:00:00 2001 From: tyr Date: Sun, 29 Dec 2013 11:30:02 +0100 Subject: [PATCH] improve railway presets * add preset for funiculars * add preset for narrow gauge railways * add gauge field to some railway presets * add "electrified" field to some railway presets --- data/presets.yaml | 10 ++++ data/presets/categories/rail.json | 2 +- data/presets/fields.json | 16 ++++++ data/presets/fields/electrified.json | 11 ++++ data/presets/fields/gauge.json | 5 ++ data/presets/presets.json | 55 +++++++++++++++++-- data/presets/presets/railway/funicular.json | 21 +++++++ data/presets/presets/railway/monorail.json | 3 +- .../presets/presets/railway/narrow_gauge.json | 19 +++++++ data/presets/presets/railway/rail.json | 6 +- data/presets/presets/railway/subway.json | 4 +- data/presets/presets/railway/tram.json | 4 +- dist/locales/en.json | 14 +++++ 13 files changed, 160 insertions(+), 10 deletions(-) create mode 100644 data/presets/fields/electrified.json create mode 100644 data/presets/fields/gauge.json create mode 100644 data/presets/presets/railway/funicular.json create mode 100644 data/presets/presets/railway/narrow_gauge.json diff --git a/data/presets.yaml b/data/presets.yaml index 8fd648f69..739d76cf0 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -133,6 +133,8 @@ en: label: Denotation description: label: Description + electrified: + label: Electrification elevation: label: Elevation emergency: @@ -148,6 +150,8 @@ en: label: Type fixme: label: Fix Me + gauge: + label: Gauge generator/method: label: Method generator/source: @@ -1322,6 +1326,9 @@ en: railway/disused: name: Disused Railway terms: "" + railway/funicular: + name: Funicular + terms: "" railway/halt: name: Railway Halt terms: "" @@ -1331,6 +1338,9 @@ en: railway/monorail: name: Monorail terms: "" + railway/narrow_gauge: + name: Narrow Gauge Rail + terms: "" railway/platform: name: Railway Platform terms: "" diff --git a/data/presets/categories/rail.json b/data/presets/categories/rail.json index a27a44b89..106844a2a 100644 --- a/data/presets/categories/rail.json +++ b/data/presets/categories/rail.json @@ -10,4 +10,4 @@ "railway/disused", "railway/abandoned" ] -} \ No newline at end of file +} diff --git a/data/presets/fields.json b/data/presets/fields.json index 3d56bf622..dccac93ec 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -293,6 +293,17 @@ "type": "textarea", "label": "Description" }, + "electrified": { + "key": "electrified", + "type": "combo", + "label": "Electrification", + "options": [ + "contact_line", + "rail", + "yes", + "no" + ] + }, "elevation": { "key": "ele", "type": "number", @@ -337,6 +348,11 @@ "type": "textarea", "label": "Fix Me" }, + "gauge": { + "key": "gauge", + "type": "combo", + "label": "Gauge" + }, "generator/method": { "key": "generator:method", "type": "combo", diff --git a/data/presets/fields/electrified.json b/data/presets/fields/electrified.json new file mode 100644 index 000000000..327c77cee --- /dev/null +++ b/data/presets/fields/electrified.json @@ -0,0 +1,11 @@ +{ + "key": "electrified", + "type": "combo", + "label": "Electrification", + "options": [ + "contact_line", + "rail", + "yes", + "no" + ] +} diff --git a/data/presets/fields/gauge.json b/data/presets/fields/gauge.json new file mode 100644 index 000000000..486348375 --- /dev/null +++ b/data/presets/fields/gauge.json @@ -0,0 +1,5 @@ +{ + "key": "gauge", + "type": "combo", + "label": "Gauge" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index 2a621daa5..d31807982 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -5505,6 +5505,27 @@ "terms": [], "name": "Disused Railway" }, + "railway/funicular": { + "geometry": [ + "line" + ], + "terms": [ + "venicular", + "cliff railway", + "cable car", + "cable railway", + "funicular railway" + ], + "fields": [ + "structure", + "gauge" + ], + "tags": { + "railway": "funicular" + }, + "icon": "railway-rail", + "name": "Funicular" + }, "railway/halt": { "icon": "rail", "geometry": [ @@ -5550,11 +5571,31 @@ "railway": "monorail" }, "fields": [ - "structure" + "structure", + "electrified" ], "terms": [], "name": "Monorail" }, + "railway/narrow_gauge": { + "icon": "railway-rail", + "geometry": [ + "line" + ], + "tags": { + "railway": "narrow_gauge" + }, + "fields": [ + "structure", + "gauge", + "electrified" + ], + "terms": [ + "narrow gauge railway", + "narrow gauge railroad" + ], + "name": "Narrow Gauge Rail" + }, "railway/platform": { "geometry": [ "point", @@ -5576,7 +5617,9 @@ "railway": "rail" }, "fields": [ - "structure" + "structure", + "gauge", + "electrified" ], "terms": [], "name": "Rail" @@ -5600,7 +5643,9 @@ "railway/subway": { "icon": "railway-subway", "fields": [ - "structure" + "structure", + "gauge", + "electrified" ], "geometry": [ "line" @@ -5631,7 +5676,9 @@ "railway": "tram" }, "fields": [ - "structure" + "structure", + "gauge", + "electrified" ], "terms": [ "streetcar" diff --git a/data/presets/presets/railway/funicular.json b/data/presets/presets/railway/funicular.json new file mode 100644 index 000000000..5382a4324 --- /dev/null +++ b/data/presets/presets/railway/funicular.json @@ -0,0 +1,21 @@ +{ + "geometry": [ + "line" + ], + "terms": [ + "venicular", + "cliff railway", + "cable car", + "cable railway", + "funicular railway" + ], + "fields": [ + "structure", + "gauge" + ], + "tags": { + "railway": "funicular" + }, + "icon": "railway-rail", + "name": "Funicular" +} diff --git a/data/presets/presets/railway/monorail.json b/data/presets/presets/railway/monorail.json index 13d11450e..f85aa3ea9 100644 --- a/data/presets/presets/railway/monorail.json +++ b/data/presets/presets/railway/monorail.json @@ -7,7 +7,8 @@ "railway": "monorail" }, "fields": [ - "structure" + "structure", + "electrified" ], "terms": [], "name": "Monorail" diff --git a/data/presets/presets/railway/narrow_gauge.json b/data/presets/presets/railway/narrow_gauge.json new file mode 100644 index 000000000..601e09eff --- /dev/null +++ b/data/presets/presets/railway/narrow_gauge.json @@ -0,0 +1,19 @@ +{ + "icon": "railway-rail", + "geometry": [ + "line" + ], + "tags": { + "railway": "narrow_gauge" + }, + "fields": [ + "structure", + "gauge", + "electrified" + ], + "terms": [ + "narrow gauge railway", + "narrow gauge railroad" + ], + "name": "Narrow Gauge Rail" +} diff --git a/data/presets/presets/railway/rail.json b/data/presets/presets/railway/rail.json index 23249045e..5d3f7f8df 100644 --- a/data/presets/presets/railway/rail.json +++ b/data/presets/presets/railway/rail.json @@ -7,8 +7,10 @@ "railway": "rail" }, "fields": [ - "structure" + "structure", + "gauge", + "electrified" ], "terms": [], "name": "Rail" -} \ No newline at end of file +} diff --git a/data/presets/presets/railway/subway.json b/data/presets/presets/railway/subway.json index 67dffda28..665ff202c 100644 --- a/data/presets/presets/railway/subway.json +++ b/data/presets/presets/railway/subway.json @@ -1,7 +1,9 @@ { "icon": "railway-subway", "fields": [ - "structure" + "structure", + "gauge", + "electrified" ], "geometry": [ "line" diff --git a/data/presets/presets/railway/tram.json b/data/presets/presets/railway/tram.json index 05b67c6ef..0304a6509 100644 --- a/data/presets/presets/railway/tram.json +++ b/data/presets/presets/railway/tram.json @@ -7,7 +7,9 @@ "railway": "tram" }, "fields": [ - "structure" + "structure", + "gauge", + "electrified" ], "terms": ["streetcar"], "name": "Tram" diff --git a/dist/locales/en.json b/dist/locales/en.json index 1c9c4f4d3..ad793a609 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -586,6 +586,9 @@ "description": { "label": "Description" }, + "electrified": { + "label": "Electrification" + }, "elevation": { "label": "Elevation" }, @@ -608,6 +611,9 @@ "fixme": { "label": "Fix Me" }, + "gauge": { + "label": "Gauge" + }, "generator/method": { "label": "Method" }, @@ -2192,6 +2198,10 @@ "name": "Disused Railway", "terms": "" }, + "railway/funicular": { + "name": "Funicular", + "terms": "venicular,cliff railway,cable car,cable railway,funicular railway" + }, "railway/halt": { "name": "Railway Halt", "terms": "break,interrupt,rest,wait,interruption" @@ -2204,6 +2214,10 @@ "name": "Monorail", "terms": "" }, + "railway/narrow_gauge": { + "name": "Narrow Gauge Rail", + "terms": "narrow gauge railway,narrow gauge railroad" + }, "railway/platform": { "name": "Railway Platform", "terms": ""