@wemap/routers 11.3.1 → 11.3.3

package/helpers/InstructionManager.ts

@@ -55,21 +55,33 @@ export default class InstructionManager {
 
         if (step.levelChange) {
             if (step.levelChange.direction === 'up') {
-                if (step.levelChange.type === 'conveyor') {
-                    return 'Go up the escalator';
-                }
                 if (step.levelChange.type === 'stairs') {
                     return 'Go up the stairs';
                 }
+                if (step.levelChange.type === 'escalator') {
+                    return 'Go up the escalator';
+                }
+                if (step.levelChange.type === 'elevator') {
+                    return 'Go up the elevator';
+                }
+                if (step.levelChange.type === 'moving walkway') {
+                    return 'Go up the moving walkway';
+                }
                 return 'Go up' + suffix;
             }
             if (step.levelChange.direction === 'down') {
-                if (step.levelChange.type === 'conveyor') {
-                    return 'Go down the escalator';
-                }
                 if (step.levelChange.type === 'stairs') {
                     return 'Go down the stairs';
                 }
+                if (step.levelChange.type === 'escalator') {
+                    return 'Go down the escalator';
+                }
+                if (step.levelChange.type === 'elevator') {
+                    return 'Go down the elevator';
+                }
+                if (step.levelChange.type === 'moving walkway') {
+                    return 'Go down the moving walkway';
+                }
                 return 'Go down' + suffix;
             }
             if (step.extras?.subwayEntrance) {

package/helpers/InstructionManagerV1.ts

@@ -32,7 +32,7 @@ export default class InstructionManagerV1 {
 
         if (step.levelChange) {
             if (step.levelChange.direction === 'up') {
-                if (step.levelChange.type === 'conveyor') {
+                if (step.levelChange.type === 'escalator') {
                     return 'Go up the escalator';
                 }
                 if (step.levelChange.type === 'stairs') {
@@ -41,7 +41,7 @@ export default class InstructionManagerV1 {
                 return 'Go up' + suffix;
             }
             if (step.levelChange.direction === 'down') {
-                if (step.levelChange.type === 'conveyor') {
+                if (step.levelChange.type === 'escalator') {
                     return 'Go down the escalator';
                 }
                 if (step.levelChange.type === 'stairs') {

package/package.json

@@ -12,7 +12,7 @@
         "directory": "packages/routers"
     },
     "name": "@wemap/routers",
-    "version": "11.3.1",
+    "version": "11.3.3",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -34,10 +34,10 @@
         "@turf/convex": "^6.5.0",
         "@turf/helpers": "^6.5.0",
         "@types/mapbox__polyline": "^1.0.2",
-        "@wemap/geo": "^11.3.1",
+        "@wemap/geo": "^11.3.3",
         "@wemap/logger": "^11.0.1",
         "@wemap/maths": "^11.0.1",
-        "@wemap/osm": "^11.3.1",
+        "@wemap/osm": "^11.3.3",
         "@wemap/salesman.js": "^2.1.0"
     },
     "devDependencies": {
@@ -52,5 +52,5 @@
         },
         "./helpers/*": "./helpers/*"
     },
-    "gitHead": "d2e603fe3846cfb5b2944ca35c06e74bce6fd6d2"
+    "gitHead": "e53e577cf8a7f4e9bd1e1be6639d2ebc68319bcc"
 }

package/src/model/LevelChange.spec.ts

@@ -19,8 +19,7 @@ const levelChange2: LevelChange = {
 const levelChange3: LevelChange = {
     direction: 'up',
     difference: 3,
-    // TODO: change to 'escalator'
-    type: 'conveyor'
+    type: 'escalator'
 };
 
 const levelChange4: LevelChange = {

package/src/model/LevelChange.ts

@@ -1,5 +1,4 @@
-// TODO: remove conveying
-export type LevelChangeType = 'elevator' | 'escalator' | 'stairs' | 'moving walkway' | 'conveyor';
+export type LevelChangeType = 'elevator' | 'escalator' | 'stairs' | 'moving walkway';
 
 export type LevelChange = {
     direction: 'up' | 'down';

package/src/wemap-osm/OsmRouter.ts

@@ -40,35 +40,41 @@ const buildStepsRules = (graphItinerary: OsmItinerary): StepsGenerationRules =>
     if (edge.data.isElevator) {
         levelChangeType = 'elevator';
     } else if (edge.data instanceof OsmWay && edge.data.isConveying && edge.data.areStairs) {
-        // TODO: change to escalator
-        levelChangeType = 'conveyor';
-        // levelChangeType = 'escalator';
+        levelChangeType = 'escalator';
     } else if (edge.data instanceof OsmWay && edge.data.areStairs) {
         levelChangeType = 'stairs';
     } else if (edge.data instanceof OsmWay && edge.data.isConveying) {
         levelChangeType = 'moving walkway';
     }
 
-    // Handle stairs/elevator/conveyors without change in level coordinates
+    // Handle stairs/elevators/escalators/moving walkway without change in level coordinates
     let forceLevelChange: 'up' | 'down' | undefined;
     const edgeTags = edge.data.tags || {};
     if (
-        edge.data instanceof OsmWay
-        && edge.data.areStairs
+        (
+            edge.data instanceof OsmWay && edge.data.areStairs ||
+            edge.data.isElevator
+        )
         && ['up', 'down'].includes(edgeTags.incline)
         && !previousStep?.levelChange
     ) {
         forceLevelChange = edgeTags.incline as 'up' | 'down';
-        for (const n of edge.data.nodes) {
-            if (n !== vertex.data) continue;
-        }
-        const isReversed = edge.data.nodes.reduce((acc: boolean | null, n, idx, arr) => {
-            if (n !== vertex.data) return acc;
-            acc = !(idx + 1 < arr.length && arr[idx + 1] === nextVertex.data);
-            return acc;
-        }, null);
-        if (isReversed) {
-            forceLevelChange = forceLevelChange === 'up' ? 'down' : 'up';
+
+        if (edge.data instanceof OsmWay) {
+
+            for (const n of edge.data.nodes) {
+                if (n !== vertex.data) continue;
+            }
+
+            const isReversed = edge.data.nodes.reduce((acc: boolean | null, n, idx, arr) => {
+                if (n !== vertex.data) return acc;
+                acc = !(idx + 1 < arr.length && arr[idx + 1] === nextVertex.data);
+                return acc;
+            }, null);
+
+            if (isReversed) {
+                forceLevelChange = forceLevelChange === 'up' ? 'down' : 'up';
+            }
         }
     }
 
@@ -235,11 +241,11 @@ class WemapOsmRouter extends GeoGraphRouter<OsmVertexData, OsmEdgeData> {
                 && edge.data instanceof OsmWay && edge.data.areStairs && !edge.data.isConveying) return false;
 
             // Verify escalators
-            if (typeof options?.useEscalator !== 'undefined' && !options?.useEscalator
+            if (typeof options?.useEscalators !== 'undefined' && !options?.useEscalators
                 && edge.data instanceof OsmWay && edge.data.areStairs && edge.data.isConveying) return false;
 
             // Verify elevator
-            if (typeof options?.useElevator !== 'undefined' && !options?.useElevator && edge.data?.isElevator) return false;
+            if (typeof options?.useElevators !== 'undefined' && !options?.useElevators && edge.data?.isElevator) return false;
 
             return true;
         };

package/src/wemap-osm/OsmRouterOptions.ts

@@ -2,9 +2,9 @@ export type OsmRouterOptions = {
 
     useStairs?: boolean;
 
-    useEscalator?: boolean;
+    useEscalators?: boolean;
 
-    useElevator?: boolean;
+    useElevators?: boolean;
 
     isTrip?: boolean;