diff --git a/CHANGELOG.md b/CHANGELOG.md index 1cdf013b..85b0656b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,6 +33,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 * Fix forest tree icons being rendered on top of buildings. See #223. * Render `aerialway`. See #256. * Drop road shields and place the ref of the roads along them. Fix #197. +* Render motorways where cycling is allowed in very pale red. Fix #203. ## v0.3.1 diff --git a/project.mml b/project.mml index 7ee672b8..28245f4c 100644 --- a/project.mml +++ b/project.mml @@ -661,7 +661,7 @@ Layer: END AS cycleway_right_oneway, CASE WHEN bicycle IS NOT NULL THEN bicycle - WHEN access IS NOT NULL THEN access + WHEN highway NOT IN ('motorway', 'motorway_link') AND access IS NOT NULL THEN access ELSE NULL END AS can_bicycle, CASE @@ -722,7 +722,8 @@ Layer: CASE WHEN highway IN ('motorway', 'trunk') THEN 'motorway_trunk' ELSE highway - END AS type + END AS type, + bicycle FROM planet_osm_roads WHERE highway IN ('motorway', 'trunk', 'primary', 'secondary', 'motorway_link', 'trunk_link') ) AS data @@ -736,8 +737,12 @@ Layer: <<: *osm2pgsql table: |- ( - SELECT ST_Snaptogrid(way, !pixel_width! / 4) AS way, - 'motorway_trunk' AS type, bridge, tunnel + SELECT + ST_Snaptogrid(way, !pixel_width! / 4) AS way, + 'motorway_trunk' AS type, + bridge, + tunnel, + bicycle FROM planet_osm_roads WHERE highway IN ('motorway', 'trunk') ) AS data diff --git a/road-colors-generated.mss b/road-colors-generated.mss index 57d7cdea..939ad192 100644 --- a/road-colors-generated.mss +++ b/road-colors-generated.mss @@ -14,9 +14,9 @@ @lcn-shield-fill: #f6f6f6; @mixed-cycle-fill: #0050ff; @motorway-trunk-case: #f6f6f6; +@motorway-trunk-cycle-fill: #f4c3c3; @motorway-trunk-fill: #c0ccc4; @motorway-trunk-line: #f6f6f6; -@motorway-trunk-shield-fill: #620728; @mtb-overlay: #d15000; @mtb-shield-fill: #f6f6f6; @ncn-overlay: #aa00ff; @@ -27,14 +27,12 @@ @primary-case: #d8b267; @primary-fill: #f4dfc3; @primary-line: #f4dfc3; -@primary-shield-fill: #4c2e00; @rail-line: #999999; @rcn-overlay: #5500ff; @rcn-shield-fill: #f6f6f6; @secondary-case: #b1bb5d; @secondary-fill: #f6f8d2; @secondary-line: #f6f8d2; -@secondary-shield-fill: #323b00; @speed20-fill: #21ffcc; @speed32-fill: #bbffff; @speedWalk-fill: #41ffa0; @@ -42,12 +40,9 @@ @standard-fill: #f6f6f6; @standard-line: #f6f6f6; @standard-nobicycle: #c0ccc4; -@steps-case: @land; -@steps-fill: #003e00; @tertiary-case: #777; @tertiary-fill: #f6f6f6; @tertiary-line: #f6f6f6; -@tertiary-shield-fill: #3b3b3b; @track-case: #cdae8c; @track-fill: #1e4374; @track-light1: lighten(@track-fill, 30%); diff --git a/road-colors.yml b/road-colors.yml index b176ab83..25e02ac3 100644 --- a/road-colors.yml +++ b/road-colors.yml @@ -13,22 +13,20 @@ mss: line: '#f6f6f6' fill: '#c0ccc4' case: '#f6f6f6' - shield-fill: '#620728' + motorway-trunk-cycle: + fill: '#f4c3c3' primary: line: '#f4dfc3' fill: '#f4dfc3' case: '#d8b267' - shield-fill: '#4c2e00' secondary: line: '#f6f8d2' fill: '#f6f8d2' case: '#b1bb5d' - shield-fill: '#323b00' tertiary: line: '#f6f6f6' fill: '#f6f6f6' case: '#777' - shield-fill: '#3b3b3b' standard: line: '#f6f6f6' fill: '#f6f6f6' diff --git a/roads.mss b/roads.mss index 12ed9b1b..93c410fa 100644 --- a/roads.mss +++ b/roads.mss @@ -7,6 +7,9 @@ and trunks. */ #roads_low[zoom>=5][zoom<=8] { line-color: @motorway-trunk-line; + [bicycle='yes'] { + line-color: @motorway-trunk-cycle-fill; + } [zoom >= 5] { line-width: 0.4; @@ -30,6 +33,9 @@ as well. */ [type='motorway_link'], [type='trunk_link'] { line-color: @motorway-trunk-line; + [bicycle='yes'] { + line-color: @motorway-trunk-cycle-fill; + } } [type='primary'] { line-color: @primary-line; } [type='secondary'] { line-color: @secondary-line; } @@ -1364,6 +1370,9 @@ come in as well. [type='motorway_link'], [type='trunk_link'] { line-color: @motorway-trunk-fill; + [can_bicycle='yes'] { + line-color: @motorway-trunk-cycle-fill; + } } [type='primary'], [type='primary_link'] {