From c15b9da34c138603731801ac69877cb322d95472 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Sun, 17 Mar 2019 12:31:42 -0400 Subject: [PATCH] Add High-Speed Rail preset --- data/presets.yaml | 7 ++++++- data/presets/fields.json | 2 +- data/presets/fields/highspeed.json | 2 +- data/presets/presets.json | 1 + .../presets/railway/rail/highspeed.json | 21 +++++++++++++++++++ data/taginfo.json | 3 ++- dist/locales/en.json | 6 +++++- 7 files changed, 37 insertions(+), 5 deletions(-) create mode 100644 data/presets/presets/railway/rail/highspeed.json diff --git a/data/presets.yaml b/data/presets.yaml index 119eb90de..99a096638 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -761,7 +761,7 @@ en: label: Height (Meters) highspeed: # highspeed=* - label: Highspeed + label: High-Speed highway: # highway=* label: Type @@ -5959,6 +5959,11 @@ en: # railway=rail name: Rail terms: '' + railway/rail/highspeed: + # 'railway=rail, highspeed=yes' + name: High-Speed Rail + # 'terms: bullet train,fast rail,high speed rail,highspeed rail,HSR' + terms: '' railway/signal: # railway=signal name: Railway Signal diff --git a/data/presets/fields.json b/data/presets/fields.json index 10b7e4d8f..ba126d946 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -143,7 +143,7 @@ "healthcare": {"key": "healthcare", "type": "typeCombo", "label": "Type"}, "healthcare/speciality": {"key": "healthcare:speciality", "type": "semiCombo", "reference": {"key": "healthcare"}, "label": "Specialties"}, "height": {"key": "height", "minValue": 0, "type": "number", "label": "Height (Meters)"}, - "highspeed": {"key": "highspeed", "type": "check", "label": "Highspeed"}, + "highspeed": {"key": "highspeed", "type": "check", "label": "High-Speed"}, "highway": {"key": "highway", "type": "typeCombo", "label": "Type"}, "historic": {"key": "historic", "type": "typeCombo", "label": "Type"}, "historic/civilization": {"key": "historic:civilization", "type": "combo", "label": "Historic Civilization"}, diff --git a/data/presets/fields/highspeed.json b/data/presets/fields/highspeed.json index 1865f09b9..614ed3b9a 100644 --- a/data/presets/fields/highspeed.json +++ b/data/presets/fields/highspeed.json @@ -1,5 +1,5 @@ { "key": "highspeed", "type": "check", - "label": "Highspeed" + "label": "High-Speed" } diff --git a/data/presets/presets.json b/data/presets/presets.json index 13a2c06c3..3b5f398ce 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -844,6 +844,7 @@ "railway/monorail": {"icon": "temaki-monorail", "fields": ["name", "operator", "structure", "electrified", "service_rail", "usage_rail"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "monorail"}, "terms": [], "name": "Monorail"}, "railway/narrow_gauge": {"icon": "iD-railway-rail", "fields": ["{railway/rail}"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "narrow_gauge"}, "terms": ["narrow gauge railway", "narrow gauge railroad"], "name": "Narrow Gauge Rail"}, "railway/rail": {"icon": "iD-railway-rail", "fields": ["name", "operator", "structure", "gauge", "electrified", "service_rail", "usage_rail"], "moreFields": ["covered", "frequency_electrified", "highspeed", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "rail"}, "terms": [], "name": "Rail"}, + "railway/rail/highspeed": {"icon": "iD-railway-rail", "geometry": ["line"], "tags": {"railway": "rail", "highspeed": "yes"}, "reference": {"key": "highspeed"}, "terms": ["bullet train", "fast rail", "high speed rail", "highspeed rail", "HSR"], "name": "High-Speed Rail"}, "railway/signal": {"icon": "temaki-railway_signals", "geometry": ["point", "vertex"], "fields": ["railway/position", "railway/signal/direction", "ref"], "tags": {"railway": "signal"}, "terms": ["signal", "lights"], "name": "Railway Signal"}, "railway/subway_entrance": {"icon": "maki-entrance", "geometry": ["point", "vertex"], "fields": ["name"], "tags": {"railway": "subway_entrance"}, "terms": ["metro", "transit"], "name": "Subway Entrance"}, "railway/subway": {"icon": "temaki-subway", "fields": ["{railway/rail}"], "moreFields": ["frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "subway"}, "terms": ["metro", "transit"], "name": "Subway"}, diff --git a/data/presets/presets/railway/rail/highspeed.json b/data/presets/presets/railway/rail/highspeed.json new file mode 100644 index 000000000..51b3013f3 --- /dev/null +++ b/data/presets/presets/railway/rail/highspeed.json @@ -0,0 +1,21 @@ +{ + "icon": "iD-railway-rail", + "geometry": [ + "line" + ], + "tags": { + "railway": "rail", + "highspeed": "yes" + }, + "reference": { + "key": "highspeed" + }, + "terms": [ + "bullet train", + "fast rail", + "high speed rail", + "highspeed rail", + "HSR" + ], + "name": "High-Speed Rail" +} diff --git a/data/taginfo.json b/data/taginfo.json index 49d94c59f..211454d72 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -791,6 +791,7 @@ {"key": "railway", "value": "monorail", "description": "🄿 Monorail", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/monorail.svg?sanitize=true"}, {"key": "railway", "value": "narrow_gauge", "description": "🄿 Narrow Gauge Rail", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/railway-rail.svg?sanitize=true"}, {"key": "railway", "value": "rail", "description": "🄿 Rail", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/railway-rail.svg?sanitize=true"}, + {"key": "highspeed", "value": "yes", "description": "🄿 High-Speed Rail", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/railway-rail.svg?sanitize=true"}, {"key": "railway", "value": "signal", "description": "🄿 Railway Signal", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/railway_signals.svg?sanitize=true"}, {"key": "railway", "value": "subway_entrance", "description": "🄿 Subway Entrance", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/entrance-15.svg?sanitize=true"}, {"key": "railway", "value": "subway", "description": "🄿 Subway", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/subway.svg?sanitize=true"}, @@ -1281,7 +1282,7 @@ {"key": "hashtags", "description": "🄵 Suggested Hashtags"}, {"key": "healthcare:speciality", "description": "🄵 Specialties"}, {"key": "height", "description": "🄵 Height (Meters)"}, - {"key": "highspeed", "description": "🄵 Highspeed"}, + {"key": "highspeed", "description": "🄵 High-Speed"}, {"key": "historic:civilization", "description": "🄵 Historic Civilization"}, {"key": "wreck:date_sunk", "description": "🄵 Date Sunk"}, {"key": "wreck:visible_at_high_tide", "description": "🄵 Visible At High Tide"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 1109fc050..f67325e22 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2786,7 +2786,7 @@ "label": "Height (Meters)" }, "highspeed": { - "label": "Highspeed" + "label": "High-Speed" }, "highway": { "label": "Type" @@ -7309,6 +7309,10 @@ "name": "Rail", "terms": "" }, + "railway/rail/highspeed": { + "name": "High-Speed Rail", + "terms": "bullet train,fast rail,high speed rail,highspeed rail,HSR" + }, "railway/signal": { "name": "Railway Signal", "terms": "signal,lights"