From f6af13cb2f5e8f072c4668a7adcfd64290e0bb91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Fiti=C3=A9?= <jfitie@gmail.com>
Date: Sat, 22 Jul 2017 19:01:26 +0200
Subject: Improve cursor in Car and Car-dark layouts (#302)

---
 contrib/cursor/navitcursor.svg | 102 +++++++++++++++++++++++++++++++++++++++++
 navit/navit_shipped.xml        |  62 +++++++++++++++++++------
 2 files changed, 150 insertions(+), 14 deletions(-)
 create mode 100644 contrib/cursor/navitcursor.svg

diff --git a/contrib/cursor/navitcursor.svg b/contrib/cursor/navitcursor.svg
new file mode 100644
index 000000000..a87091638
--- /dev/null
+++ b/contrib/cursor/navitcursor.svg
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   width="42"
+   height="42"
+   viewBox="0 0 42.000002 42.000001"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="navitcursor.svg">
+  <title
+     id="title3336">Navit cursor</title>
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="24.988831"
+     inkscape:cy="19.67354"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1440"
+     inkscape:window-height="874"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <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>Navit cursor</dc:title>
+        <dc:description>jfitie@gmail.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>jfitie@gmail.com</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>Navit</dc:source>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1010.3623)">
+    <path
+       style="fill:#008500;fill-rule:evenodd;stroke:#008500;stroke-width:0.25000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 0,1049.3623 21.000002,-39 0,24 z"
+       id="path3365"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#00bc00;fill-rule:evenodd;stroke:#008500;stroke-width:0.25000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 42.000004,1049.3623 -21.000002,-39 0,24 z"
+       id="path4167"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#009c00;fill-opacity:1;fill-rule:evenodd;stroke:#008500;stroke-width:0.25000003;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 0,1049.3623 21.000002,-15 0,6 z"
+       id="path4169"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#006500;fill-opacity:1;fill-rule:evenodd;stroke:#008500;stroke-width:0.25000003;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 21.000002,1034.3623 0,6 21.000002,9 z"
+       id="path4171"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
diff --git a/navit/navit_shipped.xml b/navit/navit_shipped.xml
index fd75918d8..977358283 100644
--- a/navit/navit_shipped.xml
+++ b/navit/navit_shipped.xml
@@ -440,13 +440,6 @@ Waypoint</text></img>
 					</circle>
 				</itemgra>
 				<itemgra speed_range="3-">
-					<!-- <polygon color="#00000066">
-						<coord x="-21" y="-27" />
-						<coord x="0" y="12" />
-						<coord x="21" y="-27" />
-						<coord x="0" y="-12" />
-						<coord x="-21" y="-27" />
-					</polygon> -->
 					<polygon color="#008500">
 						<coord x="-21" y="-18" />
 						<coord x="0" y="21" />
@@ -459,6 +452,18 @@ Waypoint</text></img>
 						<coord x="0" y="-3" />
 						<coord x="21" y="-18" />
 					</polygon>
+					<polygon color="#009C00">
+						<coord x="-21" y="-18" />
+						<coord x="0" y="-3" />
+						<coord x="0" y="-9" />
+						<coord x="-21" y="-18" />
+					</polygon>
+					<polygon color="#006500">
+						<coord x="21" y="-18" />
+						<coord x="0" y="-3" />
+						<coord x="0" y="-9" />
+						<coord x="21" y="-18" />
+					</polygon>
 					<polyline color="#008500" width="1">
 						<coord x="-21" y="-18" />
 						<coord x="0" y="21" />
@@ -471,6 +476,18 @@ Waypoint</text></img>
 						<coord x="0" y="-3" />
 						<coord x="21" y="-18" />
 					</polyline>
+					<polyline color="#008500" width="1">
+						<coord x="-21" y="-18" />
+						<coord x="0" y="-3" />
+						<coord x="0" y="-9" />
+						<coord x="-21" y="-18" />
+					</polyline>
+					<polyline color="#008500" width="1">
+						<coord x="21" y="-18" />
+						<coord x="0" y="-3" />
+						<coord x="0" y="-9" />
+						<coord x="21" y="-18" />
+					</polyline>
 				</itemgra>
 			</cursor>
 
@@ -2441,13 +2458,6 @@ Waypoint</text></img>
 					</circle>
 				</itemgra>
 				<itemgra speed_range="3-">
-					<!-- <polygon color="#00000066">
-						<coord x="-21" y="-27" />
-						<coord x="0" y="12" />
-						<coord x="21" y="-27" />
-						<coord x="0" y="-12" />
-						<coord x="-21" y="-27" />
-					</polygon> -->
 					<polygon color="#000085">
 						<coord x="-21" y="-18" />
 						<coord x="0" y="21" />
@@ -2460,6 +2470,18 @@ Waypoint</text></img>
 						<coord x="0" y="-3" />
 						<coord x="21" y="-18" />
 					</polygon>
+					<polygon color="#00009C">
+						<coord x="-21" y="-18" />
+						<coord x="0" y="-3" />
+						<coord x="0" y="-9" />
+						<coord x="-21" y="-18" />
+					</polygon>
+					<polygon color="#000065">
+						<coord x="21" y="-18" />
+						<coord x="0" y="-3" />
+						<coord x="0" y="-9" />
+						<coord x="21" y="-18" />
+					</polygon>
 					<polyline color="#000085" width="1">
 						<coord x="-21" y="-18" />
 						<coord x="0" y="21" />
@@ -2472,6 +2494,18 @@ Waypoint</text></img>
 						<coord x="0" y="-3" />
 						<coord x="21" y="-18" />
 					</polyline>
+					<polyline color="#000085" width="1">
+						<coord x="-21" y="-18" />
+						<coord x="0" y="-3" />
+						<coord x="0" y="-9" />
+						<coord x="-21" y="-18" />
+					</polyline>
+					<polyline color="#000085" width="1">
+						<coord x="21" y="-18" />
+						<coord x="0" y="-3" />
+						<coord x="0" y="-9" />
+						<coord x="21" y="-18" />
+					</polyline>
 				</itemgra>
 			</cursor>
 
-- 
cgit v1.2.1