@wemap/routers 10.5.1 → 10.5.2

package/helpers/InstructionManager.js

@@ -94,8 +94,7 @@ export default class InstructionManager {
             }
         }
 
-
-        return '';
+        return 'Continue straight';
     }
 
 

package/package.json

@@ -12,7 +12,7 @@
         "directory": "packages/routers"
     },
     "name": "@wemap/routers",
-    "version": "10.5.1",
+    "version": "10.5.2",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -35,5 +35,5 @@
         "@wemap/maths": "^10.3.1",
         "@wemap/osm": "^10.5.1"
     },
-    "gitHead": "ce2d0e4a541b521098e5382bd665dc54805f1c27"
+    "gitHead": "befe244ba1bc8d1761522e2458f611efe8cee598"
 }

package/src/Utils.js

@@ -68,3 +68,31 @@ export function multiplyRouterResponseLevel(routerResponse, levelFactor) {
 }
 
 
+/**
+ * @param {Itinerary} itinerary
+ * @param {number} levelFactor
+ */
+export function forceUnknownItineraryLevelTo0(itinerary) {
+
+    itinerary.from.level ||= 0;
+    itinerary.to.level ||= 0;
+
+    for (const leg of itinerary.legs) {
+        leg.from.coords.level ||= 0;
+        leg.to.coords.level ||= 0;
+        for (const coords of leg.coords) {
+            coords.level ||= 0;
+        }
+        if (leg.steps) {
+            for (const step of leg.steps) {
+                step.coords.level ||= 0;
+            }
+        }
+    }
+
+    if (itinerary._coords) {
+        for (const coords of itinerary._coords) {
+            coords.level ||= 0;
+        }
+    }
+}

package/src/wemap/WemapRouterUtils.js

@@ -1,5 +1,5 @@
 import { GraphItinerary } from '@wemap/geo';
-import { diffAngleLines, positiveMod, rad2deg } from '@wemap/maths';
+import { diffAngle, rad2deg } from '@wemap/maths';
 import { OsmElement } from '@wemap/osm';
 
 import Constants from '../Constants.js';
@@ -56,18 +56,18 @@ export function getTurnInfoFromAngle(_angle) {
 
     let direction, directionExtra;
 
-    const directionAngle = rad2deg(diffAngleLines(_angle, Math.PI));
-    if (directionAngle <= 20) {
+    const directionAngle = rad2deg(diffAngle(_angle, Math.PI));
+    const directionAngleAbs = Math.abs(directionAngle);
+    if (directionAngleAbs <= 20) {
         direction = 'straight';
     } else {
-        direction = positiveMod(_angle, 2 * Math.PI) > Math.PI ? 'left' : 'right';
-        if (directionAngle < 55) {
+        direction = directionAngle > 0 ? 'left' : 'right';
+        if (directionAngleAbs < 55) {
             directionExtra = 'slight';
-        } else if (directionAngle > 120) {
+        } else if (directionAngleAbs > 120) {
             directionExtra = 'sharp';
         }
     }
 
-
     return { direction, directionExtra };
 }