From 060325de358ac37dcff98880966627dacc746f19 Mon Sep 17 00:00:00 2001
From: Sten Smoller <stnsm1@outlook.com>
Date: Tue, 21 Jun 2022 19:54:10 +0200
Subject: [PATCH 1/2] icons: Add keep left/right directions icons

---
 .../maps-direction-keep-left-symbolic.svg     | 125 ++++++++++++++++++
 .../maps-direction-keep-right-symbolic.svg    | 125 ++++++++++++++++++
 2 files changed, 250 insertions(+)
 create mode 100644 data/icons/private/hicolor/32x32/apps/maps-direction-keep-left-symbolic.svg
 create mode 100644 data/icons/private/hicolor/32x32/apps/maps-direction-keep-right-symbolic.svg

diff --git a/data/icons/private/hicolor/32x32/apps/maps-direction-keep-left-symbolic.svg b/data/icons/private/hicolor/32x32/apps/maps-direction-keep-left-symbolic.svg
new file mode 100644
index 00000000..ad5ea314
--- /dev/null
+++ b/data/icons/private/hicolor/32x32/apps/maps-direction-keep-left-symbolic.svg
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="32"
+   height="32"
+   viewBox="0 0 8.4666665 8.4666669"
+   version="1.1"
+   id="svg1940"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="keep_left1.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1942"
+     pagecolor="#505050"
+     bordercolor="#eeeeee"
+     borderopacity="1"
+     inkscape:pageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="mm"
+     showgrid="true"
+     units="px"
+     inkscape:zoom="17.612172"
+     inkscape:cx="14.677349"
+     inkscape:cy="18.084084"
+     inkscape:window-width="1920"
+     inkscape:window-height="1011"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1100" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1937">
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect1246"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.83607788,0,1 @ F,0,0,1,0,0,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect1347"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0.58166399,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g1909"
+       transform="matrix(-0.50115686,0,0,0.50799752,21.40873,-36.440915)"
+       style="fill:#555753;fill-opacity:1;stroke-width:1.9819">
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#555753;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.11404;marker:none;enable-background:accumulate"
+         d="m 34.816596,73.817779 -3.331887,4.754993 h 6.663775 z"
+         id="rect13802-1-3-2"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccc" />
+      <rect
+         style="fill:#555753;fill-opacity:1;stroke-width:0.28368"
+         id="rect120"
+         width="2.3733518"
+         height="2.2519338"
+         x="78.539032"
+         y="-35.939579"
+         transform="rotate(90)"
+         ry="0" />
+      <path
+         style="fill:#555753;fill-opacity:1;stroke-width:0.438425"
+         id="rect120-7-3"
+         width="2.243"
+         height="2.6597049"
+         x="-32.637512"
+         y="-86.317841"
+         transform="scale(-1)"
+         ry="0"
+         inkscape:path-effect="#path-effect1246"
+         sodipodi:type="rect"
+         d="m -32.637512,-86.317841 h 2.243 v 1.823627 a 0.83607788,0.83607788 135 0 1 -0.836078,0.836078 h -1.406922 z" />
+      <path
+         style="fill:#555753;fill-opacity:1;stroke-width:0.4217"
+         id="rect120-6"
+         width="5.9371614"
+         height="2.357625"
+         x="40.855938"
+         y="-78.905663"
+         transform="matrix(-0.62821025,0.77804362,-0.78377105,-0.62104987,0,0)"
+         inkscape:path-effect="#path-effect1347"
+         sodipodi:type="rect"
+         d="m 41.437602,-78.905663 h 5.355497 v 2.357625 h -5.937161 v -1.775961 a 0.58166399,0.58166399 135 0 1 0.581664,-0.581664 z" />
+    </g>
+  </g>
+</svg>
diff --git a/data/icons/private/hicolor/32x32/apps/maps-direction-keep-right-symbolic.svg b/data/icons/private/hicolor/32x32/apps/maps-direction-keep-right-symbolic.svg
new file mode 100644
index 00000000..092789b2
--- /dev/null
+++ b/data/icons/private/hicolor/32x32/apps/maps-direction-keep-right-symbolic.svg
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="32"
+   height="32"
+   viewBox="0 0 8.4666665 8.4666669"
+   version="1.1"
+   id="svg1940"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="keep_right1.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1942"
+     pagecolor="#505050"
+     bordercolor="#eeeeee"
+     borderopacity="1"
+     inkscape:pageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="mm"
+     showgrid="true"
+     units="px"
+     inkscape:zoom="17.612172"
+     inkscape:cx="14.677349"
+     inkscape:cy="18.084084"
+     inkscape:window-width="1920"
+     inkscape:window-height="1011"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1100" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1937">
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect1246"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.83607788,0,1 @ F,0,0,1,0,0,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect1347"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0.58166399,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g1909"
+       transform="matrix(0.50115686,0,0,0.50799752,-12.942063,-36.440915)"
+       style="fill:#555753;fill-opacity:1;stroke-width:1.9819">
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#555753;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.11404;marker:none;enable-background:accumulate"
+         d="m 34.816596,73.817779 -3.331887,4.754993 h 6.663775 z"
+         id="rect13802-1-3-2"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccc" />
+      <rect
+         style="fill:#555753;fill-opacity:1;stroke-width:0.28368"
+         id="rect120"
+         width="2.3733518"
+         height="2.2519338"
+         x="78.539032"
+         y="-35.939579"
+         transform="rotate(90)"
+         ry="0" />
+      <path
+         style="fill:#555753;fill-opacity:1;stroke-width:0.438425"
+         id="rect120-7-3"
+         width="2.243"
+         height="2.6597049"
+         x="-32.637512"
+         y="-86.317841"
+         transform="scale(-1)"
+         ry="0"
+         inkscape:path-effect="#path-effect1246"
+         sodipodi:type="rect"
+         d="m -32.637512,-86.317841 h 2.243 v 1.823627 a 0.83607788,0.83607788 135 0 1 -0.836078,0.836078 h -1.406922 z" />
+      <path
+         style="fill:#555753;fill-opacity:1;stroke-width:0.4217"
+         id="rect120-6"
+         width="5.9371614"
+         height="2.357625"
+         x="40.855938"
+         y="-78.905663"
+         transform="matrix(-0.62821025,0.77804362,-0.78377105,-0.62104987,0,0)"
+         inkscape:path-effect="#path-effect1347"
+         sodipodi:type="rect"
+         d="m 41.437602,-78.905663 h 5.355497 v 2.357625 h -5.937161 v -1.775961 a 0.58166399,0.58166399 135 0 1 0.581664,-0.581664 z" />
+    </g>
+  </g>
+</svg>
-- 
GitLab


From fd893494d6a2de5a6920636db4197aac31014643 Mon Sep 17 00:00:00 2001
From: Marcus Lundblad <ml@dfupdate.se>
Date: Tue, 21 Jun 2022 19:56:31 +0200
Subject: [PATCH 2/2] route: Use icons for keep left/right instructions

---
 src/route.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/route.js b/src/route.js
index f370fedb..6de38df5 100644
--- a/src/route.js
+++ b/src/route.js
@@ -130,7 +130,9 @@ export class TurnPoint {
         case TurnPoint.Type.SHARP_LEFT:   return 'maps-direction-sharpleft-symbolic';
         case TurnPoint.Type.LEFT:         return 'maps-direction-left-symbolic';
         case TurnPoint.Type.SLIGHT_LEFT:  return 'maps-direction-slightleft-symbolic';
+        case TurnPoint.Type.KEEP_LEFT:    return 'maps-direction-keep-left-symbolic';
         case TurnPoint.Type.CONTINUE:     return 'maps-direction-continue-symbolic';
+        case TurnPoint.Type.KEEP_RIGHT:   return 'maps-direction-keep-right-symbolic';
         case TurnPoint.Type.SLIGHT_RIGHT: return 'maps-direction-slightright-symbolic';
         case TurnPoint.Type.RIGHT:        return 'maps-direction-right-symbolic';
         case TurnPoint.Type.SHARP_RIGHT:  return 'maps-direction-sharpright-symbolic';
-- 
GitLab