@wemap/routers 10.10.0 → 10.11.0

package/helpers/InstructionManager.js

@@ -39,7 +39,7 @@ export default class InstructionManager {
      * @param {Step} step
      * @returns {string}
      */
-    // eslint-disable-next-line max-statements
+    // eslint-disable-next-line max-statements, complexity
     static getInstructionFromStep(step) {
 
         const { direction, directionExtra } = getTurnInfoFromAngle(step.angle);
@@ -53,7 +53,12 @@ export default class InstructionManager {
             }
         }
 
-        const suffix = step.name ? ` on ${step.name}` : '';
+        let suffix = '';
+        if (step.extras.isGate) {
+            suffix = ` on gate ${step.name}`;
+        } else if (step.name) {
+            suffix = ` on ${step.name}`;
+        }
 
         if (step.levelChange) {
             if (step.levelChange.direction === 'up') {

package/index.d.ts

@@ -26,7 +26,11 @@ declare module '@wemap/routers' {
         duration?: number;
         name: string | null;
         levelChange?: LevelChange;
-        extras?: { subwayEntrance?: boolean, subwayEntranceRef?: string };
+        extras?: { 
+            subwayEntrance?: boolean;
+            subwayEntranceRef?: string;
+            isGate?: boolean; 
+        };
 
         equals(obj: Step): boolean;
         toJson(): object;

package/package.json

@@ -12,7 +12,7 @@
         "directory": "packages/routers"
     },
     "name": "@wemap/routers",
-    "version": "10.10.0",
+    "version": "10.11.0",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -35,5 +35,5 @@
         "@wemap/maths": "^10.10.0",
         "@wemap/osm": "^10.10.0"
     },
-    "gitHead": "61c5899e7feb7b75f228a9ee6dc6e8c3e39beb11"
+    "gitHead": "2e30d73684ee8a1cefb0fef0df882b86afc2044f"
 }

package/src/model/Step.js

@@ -40,7 +40,7 @@ class Step {
     /** @type {?LevelChange} */
     levelChange = null;
 
-    /** @type {?{?subwayEntrance: boolean, ?subwayEntranceRef: string}} */
+    /** @type {?{?subwayEntrance: boolean, ?subwayEntranceRef: string, ?isGate: boolean}} */
     extras = {};
 
     /** @type {!number} */
@@ -72,6 +72,7 @@ class Step {
                     obj1.extras !== null
                     && obj1.extras.subwayEntrance === obj2.extras.subwayEntrance
                     && obj1.extras.subwayEntranceRef === obj2.extras.subwayEntranceRef
+                    && obj1.extras.isGate === obj2.extras.isGate
                 )
             )
             && obj1._idCoordsInLeg === obj2._idCoordsInLeg;

package/src/model/Step.spec.js

@@ -25,7 +25,7 @@ step2.firstStep = false;
 step2.number = 2;
 step2.coords = new Coordinates(1, 0);
 step2.distance = step1.coords.distanceTo(step2.coords);
-step2.extras = { subwayEntrance: true, subwayEntranceRef: 'toto' };
+step2.extras = { subwayEntrance: true, subwayEntranceRef: 'toto', isGate: true };
 step2._idCoordsInLeg = 1;
 
 const step3 = new Step();

package/src/model/Step.type.spec.js

@@ -17,7 +17,7 @@ const isNullOrLevelChange = val => val === null || val instanceof LevelChange;
 const isUndefinedOrBoolean = val => typeof val === 'undefined' || typeof val === 'boolean';
 const isUndefinedOrString = val => typeof val === 'undefined' || typeof val === 'string';
 
-const stepExtraProperties = ['subwayEntrance', 'subwayEntranceRef'];
+const stepExtraProperties = ['subwayEntrance', 'subwayEntranceRef', 'isGate'];
 
 /**
  * @param {Step} step
@@ -48,5 +48,6 @@ export default function checkStepType(step) {
         }
         expect(step.extras.subwayEntrance).satisfies(isUndefinedOrBoolean);
         expect(step.extras.subwayEntranceRef).satisfies(isUndefinedOrString);
+        expect(step.extras.isGate).satisfies(isUndefinedOrBoolean);
     }
 }

package/src/remote/osrm/OsrmRemoteRouter.js

@@ -247,10 +247,15 @@ class OsrmRemoteRouter extends RemoteRouter {
             step.distance = jsonStep.distance;
             step.duration = jsonStep.duration;
 
-            if (jsonStep.extras && jsonStep.extras.subwayEntrance) {
-                step.extras.subwayEntrance = true;
-                if (jsonStep.extras.subwayEntranceRef) {
-                    step.extras.subwayEntranceRef = jsonStep.extras.subwayEntranceRef;
+            if (jsonStep.extras) {
+                if (jsonStep.extras.subwayEntrance) {
+                    step.extras.subwayEntrance = true;
+                    if (jsonStep.extras.subwayEntranceRef) {
+                        step.extras.subwayEntranceRef = jsonStep.extras.subwayEntranceRef;
+                    }
+                }
+                if (jsonStep.extras.isGate) {
+                    step.extras.isGate = true;
                 }
             }
 

package/src/wemap/WemapStepsGeneration.js

@@ -43,6 +43,7 @@ class WemapStepsGeneration {
             const splitStepCondition = splitByAngle || splitByLevel;
 
             const isSubwayEntrance = node ? node.builtFrom.tags.railway === 'subway_entrance' : false;
+            const isGate = node ? (node.builtFrom.tags.barrier === 'gate' || node.builtFrom.tags.aeroway === 'gate') : false;
 
             // New step creation
             if (isFirstStep || splitStepCondition || isSubwayEntrance) {
@@ -61,12 +62,15 @@ class WemapStepsGeneration {
 
                 if (isSubwayEntrance) {
                     currentStep.extras.subwayEntrance = true;
-                    currentStep.name = node.builtFrom.tags.name;
                     if (node.builtFrom.tags.ref) {
                         currentStep.extras.subwayEntranceRef = node.builtFrom.tags.ref;
                     }
                 }
 
+                if (isGate) {
+                    currentStep.extras.gate = true;
+                }
+
                 if (splitByLevel) {
                     currentStep.levelChange = WemapStepsGeneration.levelChangefromTwoNodes(node, nextNode);
                 }