From 47a865622fe487a044eb8e0566d041b19d5dd094 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Wed, 22 Apr 2020 12:38:49 -0700 Subject: [PATCH] Add Heritage Railway Track preset Deprecate railway=preserved --- data/deprecated.json | 4 +++ data/presets.yaml | 5 ++++ data/presets/presets.json | 1 + data/presets/presets/railway/preserved.json | 31 +++++++++++++++++++++ data/taginfo.json | 2 ++ dist/locales/en.json | 4 +++ 6 files changed, 47 insertions(+) create mode 100644 data/presets/presets/railway/preserved.json diff --git a/data/deprecated.json b/data/deprecated.json index 4dac07403..1254c985d 100644 --- a/data/deprecated.json +++ b/data/deprecated.json @@ -963,6 +963,10 @@ "old": {"railway": "platform"}, "replace": {"railway": "platform", "public_transport": "platform"} }, + { + "old": {"railway": "preserved"}, + "replace": {"railway": "rail", "railway:preserved": "yes"} + }, { "old": {"railway": "station"}, "replace": {"railway": "station", "public_transport": "station"} diff --git a/data/presets.yaml b/data/presets.yaml index f34d2aeae..35897b500 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -7467,6 +7467,11 @@ en: railway/platform: # railway=platform name: Train Platform + railway/preserved: + # 'railway=*, railway:preserved=yes' + name: Heritage Railway Track + # 'terms: historic train,preserved rail,steam train,tourist train' + terms: '' railway/rail: # railway=rail name: Train Track diff --git a/data/presets/presets.json b/data/presets/presets.json index 5ac0967ba..d22819ed2 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -1016,6 +1016,7 @@ "railway/monorail": {"icon": "temaki-monorail", "fields": ["{railway/light_rail}"], "moreFields": ["{railway/light_rail}"], "geometry": ["line"], "tags": {"railway": "monorail"}, "name": "Monorail Track"}, "railway/monorail/hanging": {"icon": "temaki-hanging_rail", "geometry": ["line"], "tags": {"railway": "monorail", "monorail": "hanging"}, "reference": {"key": "monorail", "value": "hanging"}, "terms": ["suspension railway"], "name": "Hanging Monorail Track"}, "railway/narrow_gauge": {"icon": "temaki-railway_track_narrow", "fields": ["{railway/light_rail}"], "moreFields": ["{railway/light_rail}"], "geometry": ["line"], "tags": {"railway": "narrow_gauge"}, "terms": ["narrow gauge railway", "narrow gauge railroad"], "name": "Narrow Gauge Track"}, + "railway/preserved": {"icon": "temaki-train_steam", "fields": ["railway", "{railway/light_rail}"], "moreFields": ["{railway/light_rail}"], "geometry": ["line"], "tags": {"railway": "*", "railway:preserved": "yes"}, "addTags": {"railway": "rail", "railway:preserved": "yes"}, "reference": {"key": "railway:preserved"}, "terms": ["historic train", "preserved rail", "steam train", "tourist train"], "name": "Heritage Railway Track"}, "railway/rail": {"icon": "temaki-railway_track", "fields": ["{railway/light_rail}"], "moreFields": ["{railway/light_rail}", "highspeed"], "geometry": ["line"], "tags": {"railway": "rail"}, "terms": ["permanent way", "rail line", "railroad track", "railway track", "track", "train track"], "name": "Train Track"}, "railway/rail/highspeed": {"icon": "temaki-train_bullet", "geometry": ["line"], "tags": {"railway": "rail", "highspeed": "yes"}, "reference": {"key": "highspeed"}, "terms": ["bullet train", "fast rail", "high speed rail", "highspeed rail", "HSR"], "name": "High-Speed Train Track"}, "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"}, diff --git a/data/presets/presets/railway/preserved.json b/data/presets/presets/railway/preserved.json new file mode 100644 index 000000000..24f7afe26 --- /dev/null +++ b/data/presets/presets/railway/preserved.json @@ -0,0 +1,31 @@ +{ + "icon": "temaki-train_steam", + "fields": [ + "railway", + "{railway/light_rail}" + ], + "moreFields": [ + "{railway/light_rail}" + ], + "geometry": [ + "line" + ], + "tags": { + "railway": "*", + "railway:preserved": "yes" + }, + "addTags": { + "railway": "rail", + "railway:preserved": "yes" + }, + "reference": { + "key": "railway:preserved" + }, + "terms": [ + "historic train", + "preserved rail", + "steam train", + "tourist train" + ], + "name": "Heritage Railway Track" +} diff --git a/data/taginfo.json b/data/taginfo.json index 119edc9f4..d8d0b2753 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -964,6 +964,7 @@ {"key": "railway", "value": "monorail", "description": "🄿 Monorail Track", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/monorail.svg"}, {"key": "monorail", "value": "hanging", "description": "🄿 Hanging Monorail Track", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/hanging_rail.svg"}, {"key": "railway", "value": "narrow_gauge", "description": "🄿 Narrow Gauge Track", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/railway_track_narrow.svg"}, + {"key": "railway:preserved", "value": "yes", "description": "🄿 Heritage Railway Track", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/train_steam.svg"}, {"key": "railway", "value": "rail", "description": "🄿 Train Track", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/railway_track.svg"}, {"key": "highspeed", "value": "yes", "description": "🄿 High-Speed Train Track", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/train_bullet.svg"}, {"key": "railway", "value": "signal", "description": "🄿 Railway Signal", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/railway_signals.svg"}, @@ -2181,6 +2182,7 @@ {"key": "pump", "value": "electrical_pump", "description": "🄳 ➜ pump=powered"}, {"key": "pump", "value": "no_pump", "description": "🄳 ➜ pump=no"}, {"key": "pump", "value": "power", "description": "🄳 ➜ pump=powered"}, + {"key": "railway", "value": "preserved", "description": "🄳 ➜ railway=rail + railway:preserved=yes"}, {"key": "recommended_speed", "description": "🄳 ➜ maxspeed:advisory=*"}, {"key": "recommended_speed:backward", "description": "🄳 ➜ maxspeed:advisory:backward=*"}, {"key": "recommended_speed:forward", "description": "🄳 ➜ maxspeed:advisory:forward=*"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index a7a412f5b..0a323f5f4 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -8966,6 +8966,10 @@ "name": "Narrow Gauge Track", "terms": "narrow gauge railway,narrow gauge railroad" }, + "railway/preserved": { + "name": "Heritage Railway Track", + "terms": "historic train,preserved rail,steam train,tourist train" + }, "railway/rail": { "name": "Train Track", "terms": "permanent way,rail line,railroad track,railway track,track,train track"