From 189204f506b3676e7aaebd0efc46edb5cfff94d6 Mon Sep 17 00:00:00 2001 From: Benoit Costamagna Date: Thu, 18 Jan 2018 17:07:16 +0100 Subject: [PATCH 1/3] Added bus guideway preset and modified the css to render it in blue --- css/30_highways.css | 21 +++++++++++++++++++ data/presets.yaml | 4 ++++ data/presets/presets.json | 17 +++++++++++++++ .../presets/presets/highway/bus_guideway.json | 17 +++++++++++++++ data/taginfo.json | 4 ++++ dist/locales/en.json | 4 ++++ 6 files changed, 67 insertions(+) create mode 100644 data/presets/presets/highway/bus_guideway.json diff --git a/css/30_highways.css b/css/30_highways.css index 8dcb1cdab..148e7fd36 100644 --- a/css/30_highways.css +++ b/css/30_highways.css @@ -215,6 +215,21 @@ path.casing.tag-residential { stroke:#444; } +.preset-icon .icon.highway-bus_guideway { + color: #fff; + fill: #444; +} +path.stroke.tag-highway-bus_guideway, +path.stroke.tag-bus_guideway { + stroke:#fff; + stroke-linecap: butt; + stroke-dasharray: 12, 16; +} +path.casing.tag-highway-bus_guideway, +path.casing.tag-bus_guideway { + stroke:#66a3ff; +} + .preset-icon .icon.highway-unclassified { color: #dcd9b9; fill: #444; @@ -270,6 +285,7 @@ path.shadow.tag-highway-corridor, path.shadow.tag-highway-pedestrian, path.shadow.tag-highway-steps, path.shadow.tag-path, +path.shadow.tag-highway-bus_guideway, path.shadow.tag-footway, path.shadow.tag-cycleway, path.shadow.tag-bridleway, @@ -286,6 +302,7 @@ path.casing.tag-highway-corridor, path.casing.tag-highway-pedestrian, path.casing.tag-highway-steps, path.casing.tag-path, +path.casing.tag-highway-bus_guideway, path.casing.tag-footway, path.casing.tag-cycleway, path.casing.tag-bridleway, @@ -302,6 +319,7 @@ path.stroke.tag-highway-corridor, path.stroke.tag-highway-pedestrian, path.stroke.tag-highway-steps, path.stroke.tag-path, +path.stroke.tag-highway-bus_guideway, path.stroke.tag-footway, path.stroke.tag-cycleway, path.stroke.tag-bridleway, @@ -350,6 +368,7 @@ path.stroke.tag-steps { .low-zoom path.shadow.tag-highway-pedestrian, .low-zoom path.shadow.tag-highway-steps, .low-zoom path.shadow.tag-path, +.low-zoom path.shadow.tag-highway-bus_guideway, .low-zoom path.shadow.tag-footway, .low-zoom path.shadow.tag-cycleway, .low-zoom path.shadow.tag-bridleway, @@ -366,6 +385,7 @@ path.stroke.tag-steps { .low-zoom path.casing.tag-highway-pedestrian, .low-zoom path.casing.tag-highway-steps, .low-zoom path.casing.tag-path, +.low-zoom path.casing.tag-highway-bus_guideway, .low-zoom path.casing.tag-footway, .low-zoom path.casing.tag-cycleway, .low-zoom path.casing.tag-bridleway, @@ -382,6 +402,7 @@ path.stroke.tag-steps { .low-zoom path.stroke.tag-highway-pedestrian, .low-zoom path.stroke.tag-highway-steps, .low-zoom path.stroke.tag-path, +.low-zoom path.stroke.tag-highway-bus_guideway, .low-zoom path.stroke.tag-footway, .low-zoom path.stroke.tag-cycleway, .low-zoom path.stroke.tag-bridleway, diff --git a/data/presets.yaml b/data/presets.yaml index 7cf9cab58..74ef602ee 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -3096,6 +3096,10 @@ en: name: Bridle Path # 'terms: bridleway,equestrian,horse' terms: '' + highway/bus_guideway: + # 'highway=bus_guideway, access=no, bus=designated' + name: Bus Guideway + terms: '' highway/bus_stop: # highway=bus_stop name: Bus Stop / Platform diff --git a/data/presets/presets.json b/data/presets/presets.json index 49f2a2c55..64f5a00ae 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -6929,6 +6929,23 @@ ], "name": "Bridle Path" }, + "highway/bus_guideway": { + "icon": "bus", + "fields": [ + "name", + "operator" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "bus_guideway", + "access": "no", + "bus": "designated" + }, + "terms": [], + "name": "Bus Guideway" + }, "highway/corridor": { "icon": "highway-footway", "fields": [ diff --git a/data/presets/presets/highway/bus_guideway.json b/data/presets/presets/highway/bus_guideway.json new file mode 100644 index 000000000..9d1dadc5c --- /dev/null +++ b/data/presets/presets/highway/bus_guideway.json @@ -0,0 +1,17 @@ +{ + "icon": "bus", + "fields": [ + "name", + "operator" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "bus_guideway", + "access": "no", + "bus": "designated" + }, + "terms": [], + "name": "Bus Guideway" +} diff --git a/data/taginfo.json b/data/taginfo.json index e356c2228..84da0f7be 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1332,6 +1332,10 @@ "key": "highway", "value": "bridleway" }, + { + "key": "bus", + "value": "designated" + }, { "key": "highway", "value": "corridor" diff --git a/dist/locales/en.json b/dist/locales/en.json index ae008afc4..2b486058e 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -3976,6 +3976,10 @@ "name": "Bridle Path", "terms": "bridleway,equestrian,horse" }, + "highway/bus_guideway": { + "name": "Bus Guideway", + "terms": "" + }, "highway/corridor": { "name": "Indoor Corridor", "terms": "gallery,hall,hallway,indoor,passage,passageway" From a87456abb88b7752be0a921a0707d07aa69c1000 Mon Sep 17 00:00:00 2001 From: Benoit Costamagna Date: Fri, 19 Jan 2018 10:23:01 +0100 Subject: [PATCH 2/3] Making the guideway a bit easier on the eye by reusing the cycleway's blue color and shrinking the dashes --- css/30_highways.css | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/css/30_highways.css b/css/30_highways.css index 148e7fd36..82851892c 100644 --- a/css/30_highways.css +++ b/css/30_highways.css @@ -223,11 +223,17 @@ path.stroke.tag-highway-bus_guideway, path.stroke.tag-bus_guideway { stroke:#fff; stroke-linecap: butt; - stroke-dasharray: 12, 16; + stroke-dasharray: 8, 8; + stroke-width: 1; +} + +.low-zoom path.stroke.tag-highway-bus_guideway, +.low-zoom path.stroke.tag-bus_guideway { + stroke-dasharray: 4, 4; } path.casing.tag-highway-bus_guideway, path.casing.tag-bus_guideway { - stroke:#66a3ff; + stroke:#58a9ed; } .preset-icon .icon.highway-unclassified { @@ -319,7 +325,6 @@ path.stroke.tag-highway-corridor, path.stroke.tag-highway-pedestrian, path.stroke.tag-highway-steps, path.stroke.tag-path, -path.stroke.tag-highway-bus_guideway, path.stroke.tag-footway, path.stroke.tag-cycleway, path.stroke.tag-bridleway, From 6c84312a20e36758e6d93c77d08d459ae1e07dcc Mon Sep 17 00:00:00 2001 From: Benoit Costamagna Date: Fri, 19 Jan 2018 10:37:06 +0100 Subject: [PATCH 3/3] Added oneway to suggested tags list for a bus guideway --- data/presets/presets.json | 3 ++- data/presets/presets/highway/bus_guideway.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/data/presets/presets.json b/data/presets/presets.json index 64f5a00ae..230c380b4 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -6933,7 +6933,8 @@ "icon": "bus", "fields": [ "name", - "operator" + "operator", + "oneway" ], "geometry": [ "line" diff --git a/data/presets/presets/highway/bus_guideway.json b/data/presets/presets/highway/bus_guideway.json index 9d1dadc5c..d4f1272b9 100644 --- a/data/presets/presets/highway/bus_guideway.json +++ b/data/presets/presets/highway/bus_guideway.json @@ -2,7 +2,8 @@ "icon": "bus", "fields": [ "name", - "operator" + "operator", + "oneway" ], "geometry": [ "line"