Skip to content

Commit

Permalink
Render unsegregated cycle track as light blue (#652)
Browse files Browse the repository at this point in the history
Render unsegregated cycle track tagged on road with blue shared color.
  • Loading branch information
kaneap authored Aug 1, 2023
1 parent 2e2f74b commit c4e8611
Show file tree
Hide file tree
Showing 4 changed files with 128 additions and 1 deletion.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
`cycleway:left|right=opposite_lane`. See #555.
* Cycleways and bicycle-designated paths with no oneway tag are now drawn like a
cycleway/path with oneway=no tag. See #601

* Cycle tracks on roads rendered in shared light blue when cycleway[:left/:right/:both]:segregrated=no is set.

## v0.6

Expand Down
97 changes: 97 additions & 0 deletions roads.mss
Original file line number Diff line number Diff line change
Expand Up @@ -831,14 +831,17 @@

// Eventually overload right border for cycleways
#roads_high::outline_right[zoom>=11][cycleway_right_render='track'],
#roads_high::outline_right[zoom>=11][cycleway_right_render='shared_track'],
#roads_high::outline_right[zoom>=11][cycleway_right_render='sidewalk'],
#roads_high::outline_right[zoom>=12][cycleway_right_render='lane'],
#roads_high::outline_right[zoom>=12][cycleway_right_render='busway'],
#tunnel::outline_right[zoom>=11][cycleway_right_render='track'],
#tunnel::outline_right[zoom>=11][cycleway_right_render='shared_track'],
#tunnel::outline_right[zoom>=11][cycleway_right_render='sidewalk'],
#tunnel::outline_right[zoom>=12][cycleway_right_render='lane'],
#tunnel::outline_right[zoom>=12][cycleway_right_render='busway'],
#bridge::outline_right[zoom>=11][cycleway_right_render='track'],
#bridge::outline_right[zoom>=11][cycleway_right_render='shared_track'],
#bridge::outline_right[zoom>=11][cycleway_right_render='sidewalk'],
#bridge::outline_right[zoom>=12][cycleway_right_render='lane'],
#bridge::outline_right[zoom>=12][cycleway_right_render='busway'],
Expand All @@ -857,6 +860,9 @@
line-dasharray: 6,10;
line-color: @mixed-cycle-fill;
}
[cycleway_right_render='shared_track'] {
line-color: @mixed-cycle-fill;
}

line-offset: 1 * @rdz11_cycle;
[cycleway_right_oneway='no'] { line-offset: 1.5 * @rdz11_cycle; }
Expand Down Expand Up @@ -913,6 +919,9 @@
line-dasharray: 6,10;
line-color: @mixed-cycle-fill;
}
[cycleway_right_render='shared_track'] {
line-color: @mixed-cycle-fill;
}

line-offset: 1 * @rdz12_cycle;
[cycleway_right_oneway='no'] { line-offset: 1.5 * @rdz12_cycle; }
Expand Down Expand Up @@ -964,6 +973,9 @@
line-dasharray: 6,10;
line-color: @mixed-cycle-fill;
}
[cycleway_right_render='shared_track'] {
line-color: @mixed-cycle-fill;
}

line-offset: 1 * @rdz11_cycle;
[cycleway_right_oneway='no'] { line-offset: 1.5 * @rdz11_cycle; }
Expand Down Expand Up @@ -1020,6 +1032,10 @@
line-dasharray: 6,10;
line-color: @mixed-cycle-fill;
}
[cycleway_right_render='shared_track'] {
line-color: @mixed-cycle-fill;
}


line-offset: 1 * @rdz12_cycle;
[cycleway_right_oneway='no'] { line-offset: 1.5 * @rdz12_cycle; }
Expand Down Expand Up @@ -1071,6 +1087,9 @@
line-dasharray: 6,10;
line-color: @mixed-cycle-fill;
}
[cycleway_right_render='shared_track'] {
line-color: @mixed-cycle-fill;
}

line-offset: 1 * @rdz11_cycle;
[cycleway_right_oneway='no'] { line-offset: 1.5 * @rdz11_cycle; }
Expand Down Expand Up @@ -1127,6 +1146,9 @@
line-dasharray: 6,10;
line-color: @mixed-cycle-fill;
}
[cycleway_right_render='shared_track'] {
line-color: @mixed-cycle-fill;
}

line-offset: 1 * @rdz12_cycle;
[cycleway_right_oneway='no'] { line-offset: 1.5 * @rdz12_cycle; }
Expand Down Expand Up @@ -1178,6 +1200,9 @@
line-dasharray: 6,10;
line-color: @mixed-cycle-fill;
}
[cycleway_right_render='shared_track'] {
line-color: @mixed-cycle-fill;
}

line-offset: 1 * @rdz12_cycle;
[cycleway_right_oneway='no'] { line-offset: 1.5 * @rdz12_cycle; }
Expand Down Expand Up @@ -1229,6 +1254,9 @@
line-dasharray: 6,10;
line-color: @mixed-cycle-fill;
}
[cycleway_right_render='shared_track'] {
line-color: @mixed-cycle-fill;
}

line-offset: 1 * @rdz12_cycle;
[cycleway_right_oneway='no'] { line-offset: 1.5 * @rdz12_cycle; }
Expand Down Expand Up @@ -1280,6 +1308,9 @@
line-dasharray: 6,10;
line-color: @mixed-cycle-fill;
}
[cycleway_right_render='shared_track'] {
line-color: @mixed-cycle-fill;
}

line-offset: 1 * @rdz12_cycle;
[cycleway_right_oneway='no'] { line-offset: 1.5 * @rdz12_cycle; }
Expand Down Expand Up @@ -1331,6 +1362,9 @@
line-dasharray: 6,10;
line-color: @mixed-cycle-fill;
}
[cycleway_right_render='shared_track'] {
line-color: @mixed-cycle-fill;
}

line-offset: 1 * @rdz12_cycle;
[cycleway_right_oneway='no'] { line-offset: 1.5 * @rdz12_cycle; }
Expand Down Expand Up @@ -1382,6 +1416,9 @@
line-dasharray: 6,10;
line-color: @mixed-cycle-fill;
}
[cycleway_right_render='shared_track'] {
line-color: @mixed-cycle-fill;
}

line-offset: 1 * @rdz12_cycle;
[cycleway_right_oneway='no'] { line-offset: 1.5 * @rdz12_cycle; }
Expand Down Expand Up @@ -1433,6 +1470,9 @@
line-dasharray: 6,10;
line-color: @mixed-cycle-fill;
}
[cycleway_right_render='shared_track'] {
line-color: @mixed-cycle-fill;
}

line-offset: 1 * @rdz12_cycle;
[cycleway_right_oneway='no'] { line-offset: 1.5 * @rdz12_cycle; }
Expand Down Expand Up @@ -1484,6 +1524,9 @@
line-dasharray: 6,10;
line-color: @mixed-cycle-fill;
}
[cycleway_right_render='shared_track'] {
line-color: @mixed-cycle-fill;
}

line-offset: 1 * @rdz12_cycle;
[cycleway_right_oneway='no'] { line-offset: 1.5 * @rdz12_cycle; }
Expand Down Expand Up @@ -1521,6 +1564,12 @@
}
}

#roads_high::cycleway_right[zoom>=18][cycleway_right_render='shared_track'][cycleway_right_oneway='yes'],
#roads_high::cycleway_right[zoom>=18][cycleway_right_render='shared_track'][cycleway_right_oneway='-1'],
#tunnel::cycleway_right[zoom>=18][cycleway_right_render='shared_track'][cycleway_right_oneway='yes'],
#tunnel::cycleway_right[zoom>=18][cycleway_right_render='shared_track'][cycleway_right_oneway='-1'],
#bridge::cycleway_right[zoom>=18][cycleway_right_render='shared_track'][cycleway_right_oneway='yes'],
#bridge::cycleway_right[zoom>=18][cycleway_right_render='shared_track'][cycleway_right_oneway='-1'],
#roads_high::cycleway_right[zoom>=18][cycleway_right_render='track'][cycleway_right_oneway='yes'],
#roads_high::cycleway_right[zoom>=18][cycleway_right_render='track'][cycleway_right_oneway='-1'],
#tunnel::cycleway_right[zoom>=18][cycleway_right_render='track'][cycleway_right_oneway='yes'],
Expand Down Expand Up @@ -1568,14 +1617,17 @@

// Eventually overload left border for cycleways
#roads_high::outline_left[zoom>=11][cycleway_left_render='track'],
#roads_high::outline_left[zoom>=11][cycleway_left_render='shared_track'],
#roads_high::outline_left[zoom>=11][cycleway_left_render='sidewalk'],
#roads_high::outline_left[zoom>=12][cycleway_left_render='lane'],
#roads_high::outline_left[zoom>=12][cycleway_left_render='busway'],
#tunnel::outline_left[zoom>=11][cycleway_left_render='track'],
#tunnel::outline_left[zoom>=11][cycleway_left_render='shared_track'],
#tunnel::outline_left[zoom>=11][cycleway_left_render='sidewalk'],
#tunnel::outline_left[zoom>=12][cycleway_left_render='lane'],
#tunnel::outline_left[zoom>=12][cycleway_left_render='busway'],
#bridge::outline_left[zoom>=11][cycleway_left_render='track'],
#bridge::outline_left[zoom>=11][cycleway_left_render='shared_track'],
#bridge::outline_left[zoom>=11][cycleway_left_render='sidewalk'],
#bridge::outline_left[zoom>=12][cycleway_left_render='lane'],
#bridge::outline_left[zoom>=12][cycleway_left_render='busway'],
Expand All @@ -1594,6 +1646,9 @@
line-dasharray: 6,10;
line-color: @mixed-cycle-fill;
}
[cycleway_left_render='shared_track'] {
line-color: @mixed-cycle-fill;
}

line-offset: -1 * @rdz11_cycle;
[cycleway_left_oneway='no'] { line-offset: -1.5 * @rdz11_cycle; }
Expand Down Expand Up @@ -1650,6 +1705,9 @@
line-dasharray: 6,10;
line-color: @mixed-cycle-fill;
}
[cycleway_left_render='shared_track'] {
line-color: @mixed-cycle-fill;
}

line-offset: -1 * @rdz12_cycle;
[cycleway_left_oneway='no'] { line-offset: -1.5 * @rdz12_cycle; }
Expand Down Expand Up @@ -1701,6 +1759,9 @@
line-dasharray: 6,10;
line-color: @mixed-cycle-fill;
}
[cycleway_left_render='shared_track'] {
line-color: @mixed-cycle-fill;
}

line-offset: -1 * @rdz11_cycle;
[cycleway_left_oneway='no'] { line-offset: -1.5 * @rdz11_cycle; }
Expand Down Expand Up @@ -1757,6 +1818,9 @@
line-dasharray: 6,10;
line-color: @mixed-cycle-fill;
}
[cycleway_left_render='shared_track'] {
line-color: @mixed-cycle-fill;
}

line-offset: -1 * @rdz12_cycle;
[cycleway_left_oneway='no'] { line-offset: -1.5 * @rdz12_cycle; }
Expand Down Expand Up @@ -1808,6 +1872,9 @@
line-dasharray: 6,10;
line-color: @mixed-cycle-fill;
}
[cycleway_left_render='shared_track'] {
line-color: @mixed-cycle-fill;
}

line-offset: -1 * @rdz11_cycle;
[cycleway_left_oneway='no'] { line-offset: -1.5 * @rdz11_cycle; }
Expand Down Expand Up @@ -1864,6 +1931,9 @@
line-dasharray: 6,10;
line-color: @mixed-cycle-fill;
}
[cycleway_left_render='shared_track'] {
line-color: @mixed-cycle-fill;
}

line-offset: -1 * @rdz12_cycle;
[cycleway_left_oneway='no'] { line-offset: -1.5 * @rdz12_cycle; }
Expand Down Expand Up @@ -1915,6 +1985,9 @@
line-dasharray: 6,10;
line-color: @mixed-cycle-fill;
}
[cycleway_left_render='shared_track'] {
line-color: @mixed-cycle-fill;
}

line-offset: -1 * @rdz12_cycle;
[cycleway_left_oneway='no'] { line-offset: -1.5 * @rdz12_cycle; }
Expand Down Expand Up @@ -1966,6 +2039,9 @@
line-dasharray: 6,10;
line-color: @mixed-cycle-fill;
}
[cycleway_left_render='shared_track'] {
line-color: @mixed-cycle-fill;
}

line-offset: -1 * @rdz12_cycle;
[cycleway_left_oneway='no'] { line-offset: -1.5 * @rdz12_cycle; }
Expand Down Expand Up @@ -2017,6 +2093,9 @@
line-dasharray: 6,10;
line-color: @mixed-cycle-fill;
}
[cycleway_left_render='shared_track'] {
line-color: @mixed-cycle-fill;
}

line-offset: -1 * @rdz12_cycle;
[cycleway_left_oneway='no'] { line-offset: -1.5 * @rdz12_cycle; }
Expand Down Expand Up @@ -2068,6 +2147,9 @@
line-dasharray: 6,10;
line-color: @mixed-cycle-fill;
}
[cycleway_left_render='shared_track'] {
line-color: @mixed-cycle-fill;
}

line-offset: -1 * @rdz12_cycle;
[cycleway_left_oneway='no'] { line-offset: -1.5 * @rdz12_cycle; }
Expand Down Expand Up @@ -2119,6 +2201,9 @@
line-dasharray: 6,10;
line-color: @mixed-cycle-fill;
}
[cycleway_left_render='shared_track'] {
line-color: @mixed-cycle-fill;
}

line-offset: -1 * @rdz12_cycle;
[cycleway_left_oneway='no'] { line-offset: -1.5 * @rdz12_cycle; }
Expand Down Expand Up @@ -2170,6 +2255,9 @@
line-dasharray: 6,10;
line-color: @mixed-cycle-fill;
}
[cycleway_left_render='shared_track'] {
line-color: @mixed-cycle-fill;
}

line-offset: -1 * @rdz12_cycle;
[cycleway_left_oneway='no'] { line-offset: -1.5 * @rdz12_cycle; }
Expand Down Expand Up @@ -2221,6 +2309,9 @@
line-dasharray: 6,10;
line-color: @mixed-cycle-fill;
}
[cycleway_left_render='shared_track'] {
line-color: @mixed-cycle-fill;
}

line-offset: -1 * @rdz12_cycle;
[cycleway_left_oneway='no'] { line-offset: -1.5 * @rdz12_cycle; }
Expand Down Expand Up @@ -2258,6 +2349,12 @@
}
}

#roads_high::cycleway_left[zoom>=18][cycleway_left_render='shared_track'][cycleway_left_oneway='yes'],
#roads_high::cycleway_left[zoom>=18][cycleway_left_render='shared_track'][cycleway_left_oneway='-1'],
#tunnel::cycleway_left[zoom>=18][cycleway_left_render='shared_track'][cycleway_left_oneway='yes'],
#tunnel::cycleway_left[zoom>=18][cycleway_left_render='shared_track'][cycleway_left_oneway='-1'],
#bridge::cycleway_left[zoom>=18][cycleway_left_render='shared_track'][cycleway_left_oneway='yes'],
#bridge::cycleway_left[zoom>=18][cycleway_left_render='shared_track'][cycleway_left_oneway='-1'],
#roads_high::cycleway_left[zoom>=18][cycleway_left_render='track'][cycleway_left_oneway='yes'],
#roads_high::cycleway_left[zoom>=18][cycleway_left_render='track'][cycleway_left_oneway='-1'],
#tunnel::cycleway_left[zoom>=18][cycleway_left_render='track'][cycleway_left_oneway='yes'],
Expand Down
12 changes: 12 additions & 0 deletions taginfo.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,21 +83,33 @@
{
"key": "cycleway"
},
{
"key": "cycleway:segregated"
},
{
"key": "cycleway:both"
},
{
"key": "cycleway:both:segregated"
},
{
"key": "cycleway:left"
},
{
"key": "cycleway:left:oneway"
},
{
"key": "cycleway:left:segregated"
},
{
"key": "cycleway:right"
},
{
"key": "cycleway:right:oneway"
},
{
"key": "cycleway:right:segregated"
},
{
"key": "denomination"
},
Expand Down
Loading

0 comments on commit c4e8611

Please sign in to comment.