From 1ba9c96870ee9cc67ca00ae10a2bc10860268f28 Mon Sep 17 00:00:00 2001
From: "Phyks (Lucas Verney)" <phyks@phyks.me>
Date: Mon, 22 Mar 2021 18:33:29 +0100
Subject: [PATCH 1/2] Use sharrows for bicycle=designated streets. Fix #389

---
 CHANGELOG.md                     |  2 ++
 LICENSE.md                       |  4 +++
 labels.mss                       | 15 +--------
 symbols/nounproject/sharrows.svg | 55 ++++++++++++++++++++++++++++++++
 4 files changed, 62 insertions(+), 14 deletions(-)
 create mode 100644 symbols/nounproject/sharrows.svg

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d839c6f..a74119e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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.
 
 
 
diff --git a/LICENSE.md b/LICENSE.md
index f984ee2..76b791b 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -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.
diff --git a/labels.mss b/labels.mss
index 0e02bb7..155aaa2 100644
--- a/labels.mss
+++ b/labels.mss
@@ -491,26 +491,13 @@
      designated/marker-max-error: 0.5;
      designated/marker-spacing: 50;
      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); }
      [zoom=15] {
         designated/marker-transform: "scale(0.75)";
         designated/marker-spacing: 40;
      }
   }
-  [bicycle='designated'][oneway = 'yes'][oneway_bicycle = 'no'],
-  [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;
-     }
-  }
 }
 
 
diff --git a/symbols/nounproject/sharrows.svg b/symbols/nounproject/sharrows.svg
new file mode 100644
index 0000000..6995cda
--- /dev/null
+++ b/symbols/nounproject/sharrows.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 18 7"
+   enable-background="new 0 0 100 100"
+   xml:space="preserve"
+   id="svg966"
+   sodipodi:docname="sharrows.svg"
+   width="18"
+   height="7"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"><metadata
+     id="metadata972"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs970" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1596"
+     inkscape:window-height="861"
+     id="namedview968"
+     showgrid="false"
+     fit-margin-left="20"
+     fit-margin-right="20"
+     fit-margin-top="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="31.159734"
+     inkscape:cx="11.648183"
+     inkscape:cy="8.5366067"
+     inkscape:window-x="0"
+     inkscape:window-y="37"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg966" /><polygon
+     points="50.13379,15.47119 80.39648,33.50586 80.39648,24.58789 50.13379,6.55322 19.60352,24.74707 19.60352,33.66504 "
+     id="polygon946"
+     transform="matrix(0,0.11514491,-0.11514491,0,13.173229,-2.2572454)"
+     style="fill:#93a7ac;fill-opacity:1" /><polygon
+     points="50.13379,37.49512 80.39648,55.5293 80.39648,46.61133 50.13379,28.57715 19.60352,46.771 19.60352,55.68848 "
+     id="polygon948"
+     transform="matrix(0,0.11514491,-0.11514491,0,11.993586,-2.2572454)"
+     style="fill:#93a7ac;fill-opacity:1" /></svg>

From 6a71f4fa9634657d1e9ff22281bc140b7ef28a77 Mon Sep 17 00:00:00 2001
From: "Phyks (Lucas Verney)" <phyks@phyks.me>
Date: Sat, 27 Mar 2021 12:32:04 +0100
Subject: [PATCH 2/2] Updater marker spacing

---
 labels.mss | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/labels.mss b/labels.mss
index 155aaa2..44d7610 100644
--- a/labels.mss
+++ b/labels.mss
@@ -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'] {
@@ -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] {
@@ -488,8 +488,7 @@
   [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/nounproject/sharrows.svg);
      [oneway='-1'] { designated/marker-file: url(symbols/oneway-reverse.svg); }