Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Render unsegregated cycle track as light blue #652

Merged
merged 10 commits into from
Aug 1, 2023
Merged

Render unsegregated cycle track as light blue #652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6b8d85a
Render unsegregated cycle track tagged on road with blue shared color
kaneap Mar 26, 2023
9ab257d
add new cycleway_left_segregated and cycleway_right_segregated to que…
kaneap Mar 26, 2023
52d5984
update taginfo.json
kaneap Jul 6, 2023
78abf88
update changelog
kaneap Jul 6, 2023
4a099a4
change to cycleway_side_render
kaneap Jul 6, 2023
e896ed6
Merge branch 'shared-cycleway' of https://github.com/kaneap/cyclosm-c…
kaneap Jul 6, 2023
b5ec996
test and fix errors
kaneap Jul 6, 2023
5257843
revert changes to project.mml
kaneap Jul 6, 2023
3e1798c
Merge branch 'shared-cycleway' of https://github.com/kaneap/cyclosm-c…
kaneap Jul 6, 2023
5accbad
undo new columns in views
kaneap Jul 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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