From 9e91b606b9b0d2864dd0c696231e0c312b4dcf62 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Sun, 7 Apr 2019 10:20:34 -0700 Subject: [PATCH] Add Rail Under Construction preset (close #6151) --- css/50_misc.css | 20 ++++++------- data/presets.yaml | 4 +++ data/presets/presets.json | 1 + .../presets/presets/railway/construction.json | 28 +++++++++++++++++++ data/taginfo.json | 1 + dist/locales/en.json | 4 +++ 6 files changed, 48 insertions(+), 10 deletions(-) create mode 100644 data/presets/presets/railway/construction.json diff --git a/css/50_misc.css b/css/50_misc.css index 5e21e5681..127a23fd5 100644 --- a/css/50_misc.css +++ b/css/50_misc.css @@ -373,34 +373,34 @@ path.line.casing.tag-status { color: #fc6c14; fill: #fff; } -path.line.shadow.tag-status.tag-status-construction { +path.line.shadow.tag-highway.tag-status.tag-status-construction { stroke-width: 20; } -path.line.casing.tag-status.tag-status-construction { +path.line.casing.tag-highway.tag-status.tag-status-construction { stroke-width: 10; stroke-linecap: butt; stroke-dasharray: none } -path.line.stroke.tag-status.tag-status-construction { +path.line.stroke.tag-highway.tag-status.tag-status-construction { stroke-width: 8; stroke-linecap: butt; stroke-dasharray: 10, 10; } -path.line.casing.tag-status.tag-status-construction, -.preset-icon-line path.line.stroke.tag-status.tag-status-construction { +path.line.casing.tag-highway.tag-status.tag-status-construction, +.preset-icon-line path.line.stroke.tag-highway.tag-status.tag-status-construction { stroke: #fff; } -path.line.stroke.tag-status.tag-status-construction, -.preset-icon-line path.line.casing.tag-status.tag-status-construction { +path.line.stroke.tag-highway.tag-status.tag-status-construction, +.preset-icon-line path.line.casing.tag-highway.tag-status.tag-status-construction { stroke: #fc6c14; } -.low-zoom path.line.shadow.tag-status.tag-status-construction { +.low-zoom path.line.shadow.tag-highway.tag-status.tag-status-construction { stroke-width: 16; } -.low-zoom path.line.casing.tag-status.tag-status-construction { +.low-zoom path.line.casing.tag-highway.tag-status.tag-status-construction { stroke-width: 7; } -.low-zoom path.line.stroke.tag-status.tag-status-construction { +.low-zoom path.line.stroke.tag-highway.tag-status.tag-status-construction { stroke-width: 5; stroke-dasharray: 8, 8; } diff --git a/data/presets.yaml b/data/presets.yaml index cde25cc83..13a696f1f 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -6063,6 +6063,10 @@ en: name: Buffer Stop # 'terms: stop,halt,buffer' terms: '' + railway/construction: + # railway=construction + name: Rail Under Construction + terms: '' railway/crossing: # railway=crossing name: Railway Crossing (Path) diff --git a/data/presets/presets.json b/data/presets/presets.json index b5baa02bb..1fc7016d0 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -857,6 +857,7 @@ "railway/tram_stop": {"icon": "temaki-tram", "fields": ["name", "network", "operator"], "geometry": ["vertex"], "tags": {"railway": "tram_stop"}, "terms": ["light rail", "streetcar", "tram", "trolley"], "name": "Tram Stopping Position", "searchable": false}, "railway/abandoned": {"icon": "iD-railway-abandoned", "fields": ["name", "structure", "service_rail", "usage_rail"], "moreFields": ["covered"], "geometry": ["line"], "tags": {"railway": "abandoned"}, "terms": [], "name": "Abandoned Railway"}, "railway/buffer_stop": {"icon": "temaki-buffer_stop", "geometry": ["vertex"], "tags": {"railway": "buffer_stop"}, "terms": ["stop", "halt", "buffer"], "name": "Buffer Stop"}, + "railway/construction": {"icon": "iD-railway-rail", "fields": ["name", "opening_date", "check_date", "note", "structure", "gauge", "electrified"], "moreFields": ["covered", "frequency_electrified", "highspeed", "maxspeed", "service_rail", "usage_rail", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "construction"}, "name": "Rail Under Construction"}, "railway/crossing": {"icon": "temaki-pedestrian", "geometry": ["vertex"], "tags": {"railway": "crossing"}, "terms": ["crossing", "pedestrian crossing", "railroad crossing", "level crossing", "grade crossing", "path through railroad", "train crossing"], "name": "Railway Crossing (Path)"}, "railway/derail": {"icon": "maki-roadblock", "geometry": ["vertex"], "tags": {"railway": "derail"}, "terms": ["derailer"], "name": "Railway Derailer"}, "railway/disused": {"icon": "iD-railway-disused", "fields": ["operator", "structure", "service_rail", "usage_rail"], "moreFields": ["covered"], "geometry": ["line"], "tags": {"railway": "disused"}, "terms": [], "name": "Disused Railway"}, diff --git a/data/presets/presets/railway/construction.json b/data/presets/presets/railway/construction.json new file mode 100644 index 000000000..caeacd747 --- /dev/null +++ b/data/presets/presets/railway/construction.json @@ -0,0 +1,28 @@ +{ + "icon": "iD-railway-rail", + "fields": [ + "name", + "opening_date", + "check_date", + "note", + "structure", + "gauge", + "electrified" + ], + "moreFields": [ + "covered", + "frequency_electrified", + "highspeed", + "maxspeed", + "service_rail", + "usage_rail", + "voltage_electrified" + ], + "geometry": [ + "line" + ], + "tags": { + "railway": "construction" + }, + "name": "Rail Under Construction" +} diff --git a/data/taginfo.json b/data/taginfo.json index 5582a97a5..115e9c62e 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -800,6 +800,7 @@ {"key": "railway", "value": "tram_stop", "description": "🄿 Tram Stopping Position (unsearchable)", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/tram.svg?sanitize=true"}, {"key": "railway", "value": "abandoned", "description": "🄿 Abandoned Railway", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/railway-abandoned.svg?sanitize=true"}, {"key": "railway", "value": "buffer_stop", "description": "🄿 Buffer Stop", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/buffer_stop.svg?sanitize=true"}, + {"key": "railway", "value": "construction", "description": "🄿 Rail Under Construction", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/railway-rail.svg?sanitize=true"}, {"key": "railway", "value": "crossing", "description": "🄿 Railway Crossing (Path)", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/pedestrian.svg?sanitize=true"}, {"key": "railway", "value": "derail", "description": "🄿 Railway Derailer", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/roadblock-15.svg?sanitize=true"}, {"key": "railway", "value": "disused", "description": "🄿 Disused Railway", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/railway-disused.svg?sanitize=true"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 6141fae8c..71ee644f6 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -7473,6 +7473,10 @@ "name": "Buffer Stop", "terms": "stop,halt,buffer" }, + "railway/construction": { + "name": "Rail Under Construction", + "terms": "" + }, "railway/crossing": { "name": "Railway Crossing (Path)", "terms": "crossing,pedestrian crossing,railroad crossing,level crossing,grade crossing,path through railroad,train crossing"