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

Use sharrows for bicycle=designated streets #542

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Use sharrows for bicycle=designated streets #542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ba9c96
Use sharrows for bicycle=designated streets. Fix #389
Phyks Mar 22, 2021
6a71f4f
Updater marker spacing
Phyks Mar 27, 2021
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: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

* Fix names not rendered in some alphabts. Fix #489.
* Render train stations when tagged on buildings (polygons). Fix #527.
* Use sharrows for `bicycle=designated` streets instead of regular arrow.
Fix #389.



Expand Down
4 changes: 4 additions & 0 deletions LICENSE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,9 @@ style and are licensed under CC0 public domain.
The icons in `symbols/osmandapp` are taken from the
[OsmAnd app resources](https://github.com/osmandapp/OsmAnd-resources).

The icons in `symbols/nounproject` are taken from [The Noun
Project](https://thenounproject.com/) and are licensed under a CC BY-NC-ND 2.0
license.

The inner tube bicycle icon is based on
https://www.flaticon.com/free-icon/inner-tube_1575936.
22 changes: 4 additions & 18 deletions labels.mss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@
[highway='footway'][oneway_bicycle = '-1'] {
marker-placement:line;
marker-max-error: 0.5;
marker-spacing: 100;
marker-spacing: 150;
marker-fill: #777777;
[highway='cycleway'],
[highway='path'] {
Expand All @@ -474,7 +474,7 @@
[oneway = '-1'][oneway_bicycle = 'no'] {
bike/marker-placement: line;
bike/marker-max-error: 0.5;
bike/marker-spacing: 100;
bike/marker-spacing: 150;
bike/marker-file: url(symbols/oneway-cycle.svg);
[oneway='-1'] { bike/marker-file: url(symbols/oneway-cycle-reverse.svg); }
[zoom=15] {
Expand All @@ -488,29 +488,15 @@
[bicycle='designated'][oneway = 'yes'][oneway_bicycle != 'no'],
[bicycle='designated'][oneway = '-1'][oneway_bicycle != 'no'] {
designated/marker-placement: line;
designated/marker-max-error: 0.5;
designated/marker-spacing: 50;
designated/marker-spacing: 75;
designated/marker-fill: @cycle-fill;
designated/marker-file: url(symbols/oneway.svg);
designated/marker-file: url(symbols/nounproject/sharrows.svg);
[oneway='-1'] { designated/marker-file: url(symbols/oneway-reverse.svg); }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You forgot to change this svg.

[zoom=15] {
designated/marker-transform: "scale(0.75)";
designated/marker-spacing: 40;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove it, change to 60 ? like others

}
}
[bicycle='designated'][oneway = 'yes'][oneway_bicycle = 'no'],
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is a duplicate with https://github.com/cyclosm/cyclosm-cartocss-style/pull/542/files#diff-7f4b9a4751a0a11cd2e9b3a1919623c344185a0cbce66d3534b4ea26066fcffaR473-R485. But to be double checked.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Duplicate of what ?
This part is for designated on a road cyclable in both direction.
Here we need a both direction sharrow like : <<>>

[bicycle='designated'][oneway = '-1'][oneway_bicycle = 'no'],
[bicycle='designated'][oneway != 'yes'][oneway != '-1'][oneway_bicycle != 'yes'][oneway_bicycle != '-1'] {
designated/marker-placement: line;
designated/marker-max-error: 0.5;
designated/marker-spacing: 50;
designated/marker-fill: @cycle-fill;
designated/marker-file: url(symbols/oneway-cycle.svg);
[zoom=15] {
designated/marker-transform: "scale(0.75)";
designated/marker-spacing: 40;
}
}
}


Expand Down
55 changes: 55 additions & 0 deletions symbols/nounproject/sharrows.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.