Add right u-turn for GraphHopper and Valhalla

diff --git a/app/assets/javascripts/index/directions/fossgis_osrm.js b/app/assets/javascripts/index/directions/fossgis_osrm.js
index 4e8691a794b5055acb2729cc254e85f7e6b972e5..2fb835453b67d0e226efad5ef19aafc81d32204f 100644 (file)
--- a/app/assets/javascripts/index/directions/fossgis_osrm.js
+++ b/app/assets/javascripts/index/directions/fossgis_osrm.js
@@ -49,7 +49,7 @@
         "turn slight right": "slight-right",
         "turn right": "right",
         "turn sharp right": "sharp-right",
         "turn slight right": "slight-right",
         "turn right": "right",
         "turn sharp right": "sharp-right",

-        "turn uturn": "u-turn",
+        "turn uturn": "u-turn-left",

         "turn slight left": "slight-left",
         "turn left": "left",
         "turn sharp left": "sharp-left",
         "turn slight left": "slight-left",
         "turn left": "left",
         "turn sharp left": "sharp-left",

diff --git a/app/assets/javascripts/index/directions/fossgis_valhalla.js b/app/assets/javascripts/index/directions/fossgis_valhalla.js
index 493d0907208bcea6fd7406ac0d4ec79afb39aa70..8bfb1908f57603ccc6f6ae25052dd8ad66bcde0a 100644 (file)
--- a/app/assets/javascripts/index/directions/fossgis_valhalla.js
+++ b/app/assets/javascripts/index/directions/fossgis_valhalla.js
@@ -13,8 +13,8 @@
       "slight-right", // kSlightRight = 9;
       "right", // kRight = 10;
       "sharp-right", // kSharpRight = 11;
       "slight-right", // kSlightRight = 9;
       "right", // kRight = 10;
       "sharp-right", // kSharpRight = 11;

-      "u-turn", // kUturnRight = 12;
-      "u-turn", // kUturnLeft = 13;
+      "u-turn-right", // kUturnRight = 12;
+      "u-turn-left", // kUturnLeft = 13;

       "sharp-left", // kSharpLeft = 14;
       "left", // kLeft = 15;
       "slight-left", // kSlightLeft = 16;
       "sharp-left", // kSharpLeft = 14;
       "left", // kLeft = 15;
       "slight-left", // kSlightLeft = 16;

diff --git a/app/assets/javascripts/index/directions/graphhopper.js b/app/assets/javascripts/index/directions/graphhopper.js
index 430801a3b669aca3954abe6f20ab0fab553ce094..14b721d233658a88b3723ad80ac97b5d93c2d891 100644 (file)
--- a/app/assets/javascripts/index/directions/graphhopper.js
+++ b/app/assets/javascripts/index/directions/graphhopper.js
@@ -13,9 +13,9 @@
       "6": "roundabout",
       "-7": "fork-left",
       "7": "fork-right",
       "6": "roundabout",
       "-7": "fork-left",
       "7": "fork-right",

-      "-98": "u-turn", // unknown direction u-turn
-      "-8": "u-turn", // left u-turn
-      "8": "u-turn" // right u-turn
+      "-98": "u-turn-left", // unknown direction u-turn
+      "-8": "u-turn-left", // left u-turn
+      "8": "u-turn-right" // right u-turn

     };
 
     function _processDirections(path) {
     };
 
     function _processDirections(path) {

diff --git a/app/views/directions/search.html.erb b/app/views/directions/search.html.erb
index ff2bcb2da50830f6fc79dddf8412d6fd5a4e4b14..4b3f24ecd71f1997e884e4c40537f233d4586716 100644 (file)
--- a/app/views/directions/search.html.erb
+++ b/app/views/directions/search.html.erb
@@ -20,8 +20,8 @@
   <symbol id="routing-sprite-sharp-right" fill="none" stroke="currentColor" stroke-width="2">
     <path d="M8 17 v-7 q0 -6 6 0 l2 2 m0 0 v-3 l-3 3 z" />
   </symbol>
   <symbol id="routing-sprite-sharp-right" fill="none" stroke="currentColor" stroke-width="2">
     <path d="M8 17 v-7 q0 -6 6 0 l2 2 m0 0 v-3 l-3 3 z" />
   </symbol>

-  <symbol id="routing-sprite-u-turn" fill="none" stroke="currentColor" stroke-width="2">
-    <path d="M16 17 v-7 a4.5 4.5 0 0 0 -9 0 v5 m-2.5 -2 l2.5 2.5 2.5 -2.5 z" />
+  <symbol id="routing-sprite-u-turn-right" fill="none" stroke="currentColor" stroke-width="2">
+    <path d="M4 17 v-7 a4.5 4.5 0 0 1 9 0 v5 m2.5 -2 l-2.5 2.5 -2.5 -2.5 z" />

   </symbol>
   <symbol id="routing-sprite-slight-left" fill="none" stroke="currentColor" stroke-width="2">
     <path d="M13 17 v-3 q0 -2 -2 -4 l-5 -5 m0 0 h3 l-3 3 z" />
   </symbol>
   <symbol id="routing-sprite-slight-left" fill="none" stroke="currentColor" stroke-width="2">
     <path d="M13 17 v-3 q0 -2 -2 -4 l-5 -5 m0 0 h3 l-3 3 z" />


@@ -32,6 +32,9 @@
   <symbol id="routing-sprite-sharp-left" fill="none" stroke="currentColor" stroke-width="2">
     <path d="M13 17 v-7 q0 -6 -6 0 l-2 2 m0 0 v-3 l3 3 z" />
   </symbol>
   <symbol id="routing-sprite-sharp-left" fill="none" stroke="currentColor" stroke-width="2">
     <path d="M13 17 v-7 q0 -6 -6 0 l-2 2 m0 0 v-3 l3 3 z" />
   </symbol>

+  <symbol id="routing-sprite-u-turn-left" fill="none" stroke="currentColor" stroke-width="2">
+    <path d="M16 17 v-7 a4.5 4.5 0 0 0 -9 0 v5 m-2.5 -2 l2.5 2.5 2.5 -2.5 z" />
+  </symbol>

 
   <symbol id="routing-sprite-roundabout" fill="none" stroke="currentColor" stroke-width="2">
     <path d="M8 17 v-3 a 3 3 0 1 0 0 -6 3 3 0 1 0 0 6 m2 -4 l5 -5 m0 0 h-3 l3 3 z" />
 
   <symbol id="routing-sprite-roundabout" fill="none" stroke="currentColor" stroke-width="2">
     <path d="M8 17 v-3 a 3 3 0 1 0 0 -6 3 3 0 1 0 0 6 m2 -4 l5 -5 m0 0 h-3 l3 3 z" />