@wemap/routers 10.3.0-alpha.1 → 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.1",
+    "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": "37e7a236d38de6fbf772eb6720fb17e4921a8dad"
+    "gitHead": "2435b4a1c0218f56a87ff1768e197f8cb738aa4d"
 }

package/src/ItineraryInfoManager.js

@@ -147,34 +147,6 @@ class ItineraryInfoManager {
         return itineraryInfo;
     }
 
-    /**
-     * @param {Coordinates} position
-     * @returns {string | null}
-     */
-    getInstructionFromPosition(position) {
-        const itineraryInfo = this.getInfo(position);
-        if (!itineraryInfo) {
-            return null;
-        }
-
-        const { nextStep } = itineraryInfo;
-        if (!nextStep) {
-            return null;
-        }
-
-        const distNextStep = position.distanceTo(nextStep.coords);
-        const nextStep2 = this._steps.find((step) => step.number > nextStep.number);
-        if (distNextStep < 3 && nextStep2) {
-            return nextStep2.instructionLivemap;
-        }
-
-        if (distNextStep > 10) {
-            return `Continue for ${distNextStep.toFixed(0)}m`;
-        }
-
-        return nextStep.instructionLivemap;
-    }
-
 }
 
 export default ItineraryInfoManager;

package/src/model/Step.js

@@ -1,6 +1,5 @@
 import { Coordinates } from '@wemap/geo';
 
-import { getTurnInfoFromAngle } from '../wemap/WemapRouterUtils.js';
 import LevelChange from './LevelChange.js';
 
 class Step {
@@ -47,92 +46,6 @@ class Step {
     /** @type {!number} */
     _idCoordsInLeg = null;
 
-
-    /** @type {{type: string, direction?: string}} */
-    get instructionInfo() {
-
-        let type, direction, directionExtra, levelChange;
-
-        if (this.levelChange) {
-            type = 'level-change';
-            levelChange = this.levelChange;
-        } else {
-            type = 'turn';
-            const turnInfo = getTurnInfoFromAngle(this.angle);
-            direction = turnInfo.direction;
-            directionExtra = turnInfo.directionExtra;
-        }
-
-        return {
-            type,
-            direction,
-            directionExtra,
-            levelChange,
-            name: this.name,
-            indoor: this.coords.level !== null
-        };
-    }
-
-    // eslint-disable-next-line max-statements
-    get instructionLivemap() {
-
-        const {direction, directionExtra} = getTurnInfoFromAngle(this.angle);
-        const isTurn = direction !== 'straight';
-
-        if (this.lastStep) {
-            if (isTurn && direction === 'left') {
-                return 'Your destination is on your left';
-            } else if (isTurn && direction === 'right') {
-                return 'Your destination is on your right';
-            }
-        }
-
-        const suffix = this.name ? ` on ${this.name}` : '' ;
-
-        if (this.levelChange) {
-            if (this.levelChange.direction === 'up') {
-                if (this.levelChange.type === 'conveyor') {
-                    return 'Go up the escalator';
-                }
-                if (this.levelChange.type === 'stairs') {
-                    return 'Go up the stairs';
-                }
-                return 'Go up' + suffix;
-            }
-            if (this.levelChange.direction === 'down') {
-                if (this.levelChange.type === 'conveyor') {
-                    return 'Go down the escalator';
-                }
-                if (this.levelChange.type === 'stairs') {
-                    return 'Go down the stairs';
-                }
-                return 'Go down' + suffix;
-            }
-            if (this.extras.subwayEntrance) {
-                return `Take exit ${this.extras.subwayEntranceRef}`;
-            }
-        }
-
-        if (isTurn) {
-            if (direction === 'left') {
-                if (directionExtra === 'slight') {
-                    return 'Turn slightly left' + suffix;
-                }
-                return 'Turn left' + suffix;
-            }
-            if (direction === 'right') {
-                if (directionExtra === 'slight') {
-                    return 'Turn slightly right' + suffix;
-                }
-                return 'Turn right' + suffix;
-            }
-        }
-
-
-        return '';
-    }
-
-
     /**
      * @param {Step} obj1
      * @param {Step} obj2