@wemap/routers 10.3.0-alpha.0 → 10.3.0

package/index.d.ts

@@ -119,4 +119,6 @@ declare module '@wemap/routers' {
     export function multiplyItineraryLevel(itinerary: Itinerary, levelFactor: number): void;
     export function multiplyRouterResponseLevel(routerResponse: RouterResponse, levelFactor: number): void;
 
+    // WemapRouterUtils
+    export function getTurnInfoFromAngle(angle: number): { direction: 'straight' | 'left' | 'right', directionExtra?: 'slight' | 'sharp' };
 }

package/package.json

@@ -12,7 +12,7 @@
         "directory": "packages/routers"
     },
     "name": "@wemap/routers",
-    "version": "10.3.0-alpha.0",
+    "version": "10.3.0",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -30,10 +30,10 @@
         "@turf/boolean-point-in-polygon": "^6.5.0",
         "@turf/convex": "^6.5.0",
         "@turf/helpers": "^6.5.0",
-        "@wemap/geo": "^10.3.0-alpha.0",
+        "@wemap/geo": "^10.3.0",
         "@wemap/logger": "^10.0.0",
-        "@wemap/maths": "^10.3.0-alpha.0",
-        "@wemap/osm": "^10.3.0-alpha.0"
+        "@wemap/maths": "^10.3.0",
+        "@wemap/osm": "^10.3.0"
     },
-    "gitHead": "d08f3459ff3cb996212da48efb454b1518c2f7fb"
+    "gitHead": "2435b4a1c0218f56a87ff1768e197f8cb738aa4d"
 }

package/src/model/Step.js

@@ -1,6 +1,5 @@
 import { Coordinates } from '@wemap/geo';
 
-import OsrmRemoteRouter from '../remote/osrm/OsrmRemoteRouter.js';
 import LevelChange from './LevelChange.js';
 
 class Step {
@@ -47,55 +46,6 @@ class Step {
     /** @type {!number} */
     _idCoordsInLeg = null;
 
-
-    /** @type {{type: string, direction?: string}} */
-    get instruction() {
-
-        const modifier = OsrmRemoteRouter.getModifierFromAngle(this.angle);
-        let type, direction, directionExtra;
-
-        if (this.levelChange) {
-            return {
-                type: 'level-change',
-                levelChange: this.levelChange
-            };
-        }
-
-        switch (modifier) {
-        case 'sharp right':
-        case 'slight right':
-        case 'right':
-            type = 'turn';
-            direction = 'right';
-            break;
-        case 'sharp left':
-        case 'slight left':
-        case 'left':
-            type = 'turn';
-            direction = 'left';
-            break;
-        case 'straight':
-            type = 'continue';
-            break;
-        case 'u turn':
-            type = 'u-turn';
-            break;
-        }
-        if (modifier.includes('sharp')) {
-            directionExtra = 'sharp';
-        } else if (modifier.includes('slight')) {
-            directionExtra = 'slight';
-        }
-
-        return {
-            type,
-            direction,
-            directionExtra,
-            name: this.name,
-            indoor: this.coords.level !== null
-        };
-    }
-
     /**
      * @param {Step} obj1
      * @param {Step} obj2

package/src/wemap/WemapRouterUtils.js

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