@wemap/routers 9.0.0 → 9.0.2

package/assets/bureaux-wemap-montpellier-network.osm

@@ -71,9 +71,15 @@
   <node id='-441210' action='modify' visible='true' lat='43.60932786111' lon='3.8842776591'>
     <tag k='name' v='p17' />
   </node>
-  <node id='-441262' action='modify' visible='true' lat='43.60932198746' lon='3.8843159771'>
+  <node id='-441270' action='modify' visible='true' lat='43.6093032' lon='3.8844388'>
     <tag k='name' v='p21' />
   </node>
+  <node id='-441273' action='modify' visible='true' lat='43.6095297' lon='3.8845039'>
+    <tag k='name' v='p22' />
+  </node>
+  <node id='-441286' action='modify' visible='true' lat='43.6095624' lon='3.8845134'>
+    <tag k='name' v='p23' />
+  </node>
   <way id='-440499' action='modify' visible='true'>
     <nd ref='-440476' />
     <nd ref='-440460' />
@@ -154,9 +160,15 @@
   </way>
   <way id='-441263' action='modify' visible='true'>
     <nd ref='-441187' />
-    <nd ref='-441262' />
+    <nd ref='-441270' />
+    <nd ref='-441273' />
     <tag k='highway' v='footway' />
     <tag k='level' v='0' />
     <tag k='name' v='w10' />
   </way>
+  <way id='-441268' action='modify' visible='true'>
+    <nd ref='-441273' />
+    <nd ref='-441286' />
+    <tag k='highway' v='footway' />
+  </way>
 </osm>

package/dist/wemap-routers.es.js

@@ -1,4 +1,4 @@
-import { Coordinates, Network, GraphRouterOptions, GraphRouter, GraphUtils, Level, GraphEdge, GraphNode, NoRouteFoundError, GraphItinerary, Utils, MapMatching } from '@wemap/geo';
+import { Coordinates, Network, Level, GraphRouterOptions, GraphRouter, GraphUtils, GraphEdge, GraphNode, NoRouteFoundError, GraphItinerary, Utils, MapMatching } from '@wemap/geo';
 import { OsmParser, OsmWay, OsmNode } from '@wemap/osm';
 import { deg2rad, diffAngle, positiveMod, rad2deg } from '@wemap/maths';
 import Logger from '@wemap/logger';
@@ -23,7 +23,7 @@ class LevelChange {
      * @param {LevelChange} obj2
      * @returns {Boolean}
      */
-    static equalsTo(obj1, obj2) {
+    static equals(obj1, obj2) {
         return obj1.difference === obj2.difference
             && obj1.direction === obj2.direction
             && obj1.type === obj2.type;
@@ -33,8 +33,8 @@ class LevelChange {
      * @param {LevelChange} obj
      * @returns {Boolean}
      */
-    equalsTo(obj) {
-        return LevelChange.equalsTo(this, obj);
+    equals(obj) {
+        return LevelChange.equals(this, obj);
     }
 
     /**
@@ -110,11 +110,11 @@ class Step {
      * @param {Step} obj2
      * @returns {Boolean}
      */
-    static equalsTo(obj1, obj2) {
+    static equals(obj1, obj2) {
         return obj1.firstStep === obj2.firstStep
             && obj1.lastStep === obj2.lastStep
             && obj1.number === obj2.number
-            && obj1.coords.equalsTo(obj2.coords)
+            && obj1.coords.equals(obj2.coords)
             && obj1.angle === obj2.angle
             && obj1.previousBearing === obj2.previousBearing
             && obj1.nextBearing === obj2.nextBearing
@@ -123,7 +123,7 @@ class Step {
             && obj1.name === obj2.name
             && (
                 obj1.levelChange === obj2.levelChange
-                || obj1.levelChange !== null && obj1.levelChange.equalsTo(obj2.levelChange)
+                || obj1.levelChange !== null && obj1.levelChange.equals(obj2.levelChange)
             )
             && (
                 obj1.extras === obj2.extras
@@ -140,8 +140,8 @@ class Step {
      * @param {Step} obj
      * @returns {Boolean}
      */
-    equalsTo(obj) {
-        return Step.equalsTo(this, obj);
+    equals(obj) {
+        return Step.equals(this, obj);
     }
 
     /**
@@ -294,16 +294,16 @@ class Leg {
      * @returns {Boolean}
      */
     // eslint-disable-next-line complexity
-    static equalsTo(obj1, obj2) {
+    static equals(obj1, obj2) {
         const intermediate = obj1.mode === obj2.mode
             && obj1.distance === obj2.distance
             && obj1.duration === obj2.duration
             && obj1.startTime === obj2.startTime
             && obj1.endTime === obj2.endTime
             && obj1.from.name === obj2.from.name
-            && obj1.from.coords.equalsTo(obj2.from.coords)
+            && obj1.from.coords.equals(obj2.from.coords)
             && obj1.to.name === obj2.to.name
-            && obj1.to.coords.equalsTo(obj2.to.coords)
+            && obj1.to.coords.equals(obj2.to.coords)
             && obj1.coords.length === obj2.coords.length
             && (
                 obj1.steps === obj2.steps
@@ -316,13 +316,13 @@ class Leg {
 
         let i;
         for (i = 0; i < obj1.coords.length; i++) {
-            if (!obj1.coords[i].equalsTo(obj2.coords[i])) {
+            if (!obj1.coords[i].equals(obj2.coords[i])) {
                 return false;
             }
         }
         if (obj1.steps) {
             for (i = 0; i < obj1.steps.length; i++) {
-                if (!obj1.steps[i].equalsTo(obj2.steps[i])) {
+                if (!obj1.steps[i].equals(obj2.steps[i])) {
                     return false;
                 }
             }
@@ -349,8 +349,8 @@ class Leg {
      * @param {Leg} obj
      * @returns {Boolean}
      */
-    equalsTo(obj) {
-        return Leg.equalsTo(this, obj);
+    equals(obj) {
+        return Leg.equals(this, obj);
     }
 
     /**
@@ -435,58 +435,60 @@ function getDurationFromLength(length, speed = 5) {
     return length / (speed * 1000 / 3600);
 }
 
-/* eslint-disable max-statements */
-/* eslint-disable max-depth */
+
 /**
- * @param {RouterResponse} routerResponse
- * @param {Number} levelFactor
+ * @param {Leg} leg
+ * @param {number} levelFactor
  */
-function multiplyRouterResponseLevel(routerResponse, levelFactor) {
-    if (routerResponse.from.level) {
-        routerResponse.from.level.multiplyBy(levelFactor);
-    }
-    if (routerResponse.to.level) {
-        routerResponse.to.level.multiplyBy(levelFactor);
+function multiplyLegLevel(leg, levelFactor) {
+
+    leg.from.coords.level = Level.multiplyBy(leg.from.coords.level, levelFactor);
+    leg.to.coords.level = Level.multiplyBy(leg.to.coords.level, levelFactor);
+    for (const coords of leg.coords) {
+        coords.level = Level.multiplyBy(coords.level, levelFactor);
     }
-    for (const itinerary of routerResponse.itineraries) {
-        if (itinerary.from.level) {
-            itinerary.from.level.multiplyBy(levelFactor);
-        }
-        if (itinerary.to.level) {
-            itinerary.to.level.multiplyBy(levelFactor);
+    if (leg.steps) {
+        for (const step of leg.steps) {
+            step.coords.level = Level.multiplyBy(step.coords.level, levelFactor);
         }
+    }
 
-        for (const leg of itinerary.legs) {
-            if (leg.from.coords.level) {
-                leg.from.coords.level.multiplyBy(levelFactor);
-            }
-            if (leg.to.coords.level) {
-                leg.to.coords.level.multiplyBy(levelFactor);
-            }
-            for (const coords of leg.coords) {
-                if (coords.level) {
-                    coords.level.multiplyBy(levelFactor);
-                }
-            }
-            if (leg.steps) {
-                for (const step of leg.steps) {
-                    if (step.coords.level) {
-                        step.coords.level.multiplyBy(levelFactor);
-                    }
-                }
-            }
-        }
+}
 
-        if (itinerary._coords) {
-            for (const coords of itinerary._coords) {
-                if (coords.level) {
-                    coords.level.multiplyBy(levelFactor);
-                }
-            }
+/**
+ * @param {Itinerary} itinerary
+ * @param {number} levelFactor
+ */
+function multiplyItineraryLevel(itinerary, levelFactor) {
+
+    itinerary.from.level = Level.multiplyBy(itinerary.from.level, levelFactor);
+    itinerary.to.level = Level.multiplyBy(itinerary.to.level, levelFactor);
+
+    for (const leg of itinerary.legs) {
+        multiplyLegLevel(leg, levelFactor);
+    }
+
+    if (itinerary._coords) {
+        for (const coords of itinerary._coords) {
+            coords.level = Level.multiplyBy(coords.level, levelFactor);
         }
     }
 }
 
+/**
+ * @param {RouterResponse} routerResponse
+ * @param {number} levelFactor
+ */
+function multiplyRouterResponseLevel(routerResponse, levelFactor) {
+
+    routerResponse.from.level = Level.multiplyBy(routerResponse.from.level, levelFactor);
+    routerResponse.to.level = Level.multiplyBy(routerResponse.to.level, levelFactor);
+
+    for (const itinerary of routerResponse.itineraries) {
+        multiplyItineraryLevel(itinerary, levelFactor);
+    }
+}
+
 /* eslint-disable max-statements */
 
 /**
@@ -535,7 +537,7 @@ class Itinerary {
         if (!this._coords) {
             // Returns the coordinates contained in all legs and remove duplicates between array
             this._coords = this.legs.reduce((acc, val) => {
-                const isDuplicate = acc.length && val.coords.length && acc[acc.length - 1].equalsTo(val.coords[0]);
+                const isDuplicate = acc.length && val.coords.length && acc[acc.length - 1].equals(val.coords[0]);
                 acc.push(...val.coords.slice(isDuplicate ? 1 : 0));
                 return acc;
             }, []);
@@ -679,9 +681,9 @@ class Itinerary {
      * @param {Itinerary} obj2
      * @returns {Boolean}
      */
-    static equalsTo(obj1, obj2) {
-        const intermediate = obj1.from.equalsTo(obj2.from)
-            && obj1.to.equalsTo(obj2.to)
+    static equals(obj1, obj2) {
+        const intermediate = obj1.from.equals(obj2.from)
+            && obj1.to.equals(obj2.to)
             && obj1.distance === obj2.distance
             && obj1.duration === obj2.duration
             && obj1.startTime === obj2.startTime
@@ -693,7 +695,7 @@ class Itinerary {
         }
 
         for (let i = 0; i < obj1.legs.length; i++) {
-            if (!obj1.legs[i].equalsTo(obj2.legs[i])) {
+            if (!obj1.legs[i].equals(obj2.legs[i])) {
                 return false;
             }
         }
@@ -705,8 +707,8 @@ class Itinerary {
      * @param {Itinerary} obj
      * @returns {Boolean}
      */
-    equalsTo(obj) {
-        return Itinerary.equalsTo(this, obj);
+    equals(obj) {
+        return Itinerary.equals(this, obj);
     }
 
     /**
@@ -773,10 +775,10 @@ class RouterResponse {
      * @param {RouterResponse} obj2
      * @returns {Boolean}
      */
-    static equalsTo(obj1, obj2) {
+    static equals(obj1, obj2) {
         const intermediate = obj1.routerName === obj2.routerName
-            && obj1.from.equalsTo(obj2.from)
-            && obj1.to.equalsTo(obj2.to)
+            && obj1.from.equals(obj2.from)
+            && obj1.to.equals(obj2.to)
             && obj1.itineraries.length === obj2.itineraries.length;
 
         if (!intermediate) {
@@ -784,7 +786,7 @@ class RouterResponse {
         }
 
         for (let i = 0; i < obj1.itineraries.length; i++) {
-            if (!obj1.itineraries[i].equalsTo(obj2.itineraries[i])) {
+            if (!obj1.itineraries[i].equals(obj2.itineraries[i])) {
                 return false;
             }
         }
@@ -796,8 +798,8 @@ class RouterResponse {
      * @param {RouterResponse} obj
      * @returns {Boolean}
      */
-    equalsTo(obj) {
-        return RouterResponse.equalsTo(this, obj);
+    equals(obj) {
+        return RouterResponse.equals(this, obj);
     }
 
 
@@ -949,9 +951,8 @@ class WemapStepsGeneration {
 
             let splitByAngle = Math.abs(diffAngle(Math.PI, angle)) >= SKIP_STEP_ANGLE_MAX;
 
-            const splitByLevel = edge.level && edge.level.isRange
-                && node.coords.level && !node.coords.level.isRange;
-            splitByAngle = splitByAngle && !(node.coords.level && node.coords.level.isRange);
+            const splitByLevel = Level.isRange(edge.level) && !Level.isRange(node.coords.level);
+            splitByAngle = splitByAngle && !(node.coords.level && Level.isRange(node.coords.level));
 
             const splitStepCondition = splitByAngle || splitByLevel;
 
@@ -999,7 +1000,7 @@ class WemapStepsGeneration {
         const lastNode = nodes[nodes.length - 1];
 
         // Create a last step if end is not on the network
-        if (!Coordinates.equalsTo(lastNode.coords, end)) {
+        if (!Coordinates.equals(lastNode.coords, end)) {
             const lastStep = new Step();
             lastStep.coords = lastNode.coords;
             lastStep.number = steps.length + 1;
@@ -1145,7 +1146,7 @@ function createNodesAndEdgesFromElevator(networkModel, node) {
     /** @type {GraphNode[]} */
     const createdNodes = [];
     const getOrCreateLevelNode = (level, builtFrom) => {
-        let levelNode = createdNodes.find(({ coords }) => Level.equalsTo(level, coords.level));
+        let levelNode = createdNodes.find(({ coords }) => Level.equals(level, coords.level));
         if (!levelNode) {
             levelNode = new GraphNode(node.coords.clone(), builtFrom);
             levelNode.coords.level = level;
@@ -1157,7 +1158,7 @@ function createNodesAndEdgesFromElevator(networkModel, node) {
 
     // Create nodes from node.edges
     node.edges.forEach(edge => {
-        if (edge.level.isRange) {
+        if (Level.isRange(edge.level)) {
             throw new Error('Cannot handle this elevator edge due to ambiguity');
         }
 
@@ -1177,10 +1178,13 @@ function createNodesAndEdgesFromElevator(networkModel, node) {
             const createdNode1 = createdNodes[i];
             const createdNode2 = createdNodes[j];
 
+            const minLevel = Math.min(createdNode1.coords.level, createdNode2.coords.level);
+            const maxLevel = Math.max(createdNode1.coords.level, createdNode2.coords.level);
+
             const newEdge = new GraphEdge(
                 createdNode1,
                 createdNode2,
-                new Level(createdNode1.coords.level.val, createdNode2.coords.level.val),
+                [minLevel, maxLevel],
                 node.builtFrom
             );
             networkModel.edges.push(newEdge);
@@ -1858,7 +1862,9 @@ class CitywayRemoteRouter extends RemoteRouter {
                     for (const jsonPathLink of jsonLeg.pathLinks.PathLink) {
                         const step = new Step();
                         let stepCoords;
-                        if (jsonPathLink.Geometry) {
+                        // jsonPathLink.Geometry is either a POINT or a LINESTRING
+                        // or it can also be 'Null' as string
+                        if (jsonPathLink.Geometry && jsonPathLink.Geometry !== 'Null') {
                             stepCoords = this.parseWKTGeometry(jsonPathLink.Geometry);
                         } else {
                             stepCoords = [leg.from.coords, leg.to.coords];
@@ -1869,7 +1875,7 @@ class CitywayRemoteRouter extends RemoteRouter {
                             if (
                                 idx !== 0
                                 || leg.coords.length === 0
-                                || !leg.coords[leg.coords.length - 1].equalsTo(coords)
+                                || !leg.coords[leg.coords.length - 1].equals(coords)
                             ) {
                                 leg.coords.push(coords);
                             }
@@ -1914,7 +1920,7 @@ class CitywayRemoteRouter extends RemoteRouter {
                             if (
                                 idx !== 0
                                 || leg.coords.length === 0
-                                || !leg.coords[leg.coords.length - 1].equalsTo(coords)
+                                || !leg.coords[leg.coords.length - 1].equals(coords)
                             ) {
                                 leg.coords.push(coords);
                             }
@@ -1991,8 +1997,8 @@ class CitywayRemoteRouter extends RemoteRouter {
      * @returns {Coordinates[]}
      */
     parseWKTGeometry(wktGeometry) {
-        const tmpCoordsStr = wktGeometry.match(/LINESTRING \((.*)\)/i);
-        const tmpCoordsPt = wktGeometry.match(/POINT \((.*)\)/i);
+        const tmpCoordsStr = wktGeometry.match(/LINESTRING ?\((.*)\)/i);
+        const tmpCoordsPt = wktGeometry.match(/POINT ?\((.*)\)/i);
         if (!tmpCoordsStr && !tmpCoordsPt) {
             return null;
         }
@@ -2077,12 +2083,10 @@ class DeutscheBahnRemoteRouter extends RemoteRouter {
         let url = endpointUrl + '/route/v1/walking/';
 
         url += waypoints.map(waypoint => {
-            if (waypoint.level) {
-                const altitude = waypoint.level.isRange ? waypoint.level.low : waypoint.level.val;
-
+            if (waypoint.level !== null) {
+                const altitude = Level.isRange(waypoint.level) ? waypoint.level[0] : waypoint.level;
                 return waypoint.longitude + ',' + waypoint.latitude + ',' + altitude;
             }
-
             return waypoint.longitude + ',' + waypoint.latitude;
         }).join(';');
 
@@ -2122,14 +2126,16 @@ class DeutscheBahnRemoteRouter extends RemoteRouter {
         let id = 1;
         for (const jsonSegment of jsonSegments) {
 
-            const level = new Level(jsonSegment.fromLevel, jsonSegment.toLevel);
+            const level = jsonSegment.fromLevel === jsonSegment.toLevel
+                ? jsonSegment.fromLevel
+                : [jsonSegment.fromLevel, jsonSegment.toLevel];
             const osmWay = new OsmWay(id++, null, level);
 
             for (const jsonPoint of jsonSegment.polyline) {
                 const coord = new Coordinates(jsonPoint.lat, jsonPoint.lon, null, level);
 
                 if (nodes.length !== 0
-                    && nodes[nodes.length - 1].coords.equalsTo(coord)) {
+                    && nodes[nodes.length - 1].coords.equals(coord)) {
                     continue;
                 }
 
@@ -2680,7 +2686,7 @@ class OsrmRemoteRouter extends RemoteRouter {
     coordinatesToJson(coordinates) {
         const output = [coordinates.lng, coordinates.lat];
         if (coordinates.level) {
-            output.push(coordinates.level.toString());
+            output.push(coordinates.level);
         }
         return output;
     }
@@ -2690,11 +2696,16 @@ class OsrmRemoteRouter extends RemoteRouter {
      * @returns {Coordinates}
      */
     jsonToCoordinates(json) {
-        const output = new Coordinates(json[1], json[0]);
+        const coords = new Coordinates(json[1], json[0]);
         if (json.length > 2) {
-            output.level = Level.fromString(json[2]);
+            if (typeof json[2] === 'string') {
+                Logger.warn('Still using legacy level format. Please update your project.');
+                coords.level = Level.fromString(json[2]);
+            } else {
+                coords.level = json[2];
+            }
         }
-        return output;
+        return coords;
     }
 
     nodesToJsonCoords(nodes) {
@@ -2758,10 +2769,10 @@ class OsrmRemoteRouter extends RemoteRouter {
                     let type = idStep === 0 && idLeg === 0 ? 'depart' : 'turn';
                     type = idStep === lastStepId && idLeg === lastLegId ? 'arrive' : type;
 
-                    const stepCoordsIdx = coords.findIndex(p => p.equalsTo(step.coords));
+                    const stepCoordsIdx = coords.findIndex(p => p.equals(step.coords));
                     const nextStepCoordsIdx = idStep === lastStepId
                         ? stepCoordsIdx
-                        : coords.findIndex(p => p.equalsTo(arr[idStep + 1].coords));
+                        : coords.findIndex(p => p.equals(arr[idStep + 1].coords));
 
                     const jsonStep = {
                         geometry: {
@@ -2903,7 +2914,7 @@ class OsrmRemoteRouter extends RemoteRouter {
                     .map(step => step.geometry.coordinates.map(this.jsonToCoordinates))
                     .flat()
                     // Remove duplicates
-                    .filter((coords, idx, arr) => idx === 0 || !arr[idx - 1].equalsTo(coords));
+                    .filter((coords, idx, arr) => idx === 0 || !arr[idx - 1].equals(coords));
 
                 leg.from = {
                     name: null,
@@ -3743,7 +3754,7 @@ class ItineraryInfoManager {
         let distanceTraveled = 0;
 
         itinerary.coords.forEach((coords, idx, arr) => {
-            if (stepId < this._steps.length && this._steps[stepId].coords.equalsTo(coords)) {
+            if (stepId < this._steps.length && this._steps[stepId].coords.equals(coords)) {
                 previousStep = this._steps[stepId];
                 nextStep = stepId === this._steps.length - 1 ? null : this._steps[stepId + 1];
                 stepId++;
@@ -3832,5 +3843,5 @@ class ItineraryInfoManager {
 
 }
 
-export { CitywayRemoteRouter$1 as CitywayRemoteRouter, Constants, DeutscheBahnRemoteRouter$1 as DeutscheBahnRemoteRouter, IdfmRemoteRouter$1 as IdfmRemoteRouter, Itinerary, ItineraryInfo, ItineraryInfoManager, Leg, LevelChange, OsrmRemoteRouter$1 as OsrmRemoteRouter, OtpRemoteRouter$1 as OtpRemoteRouter, RemoteRouterManager$1 as RemoteRouterManager, RouterResponse, Step, WemapMetaRemoteRouter$1 as WemapMetaRemoteRouter, WemapMetaRemoteRouterOptions, WemapMetaRemoteRouterPayload, WemapMetaRouter, IOMap as WemapMetaRouterIOMap, WemapMetaRouterOptions, WemapNetworkUtils, WemapRouter, WemapRouterOptions, WemapRouterUtils, getDurationFromLength, multiplyRouterResponseLevel };
+export { CitywayRemoteRouter$1 as CitywayRemoteRouter, Constants, DeutscheBahnRemoteRouter$1 as DeutscheBahnRemoteRouter, IdfmRemoteRouter$1 as IdfmRemoteRouter, Itinerary, ItineraryInfo, ItineraryInfoManager, Leg, LevelChange, OsrmRemoteRouter$1 as OsrmRemoteRouter, OtpRemoteRouter$1 as OtpRemoteRouter, RemoteRouterManager$1 as RemoteRouterManager, RemoteRouterOptions, RemoteRouterServerUnreachable, RouterResponse, Step, WemapMetaRemoteRouter$1 as WemapMetaRemoteRouter, WemapMetaRemoteRouterOptions, WemapMetaRemoteRouterPayload, WemapMetaRouter, IOMap as WemapMetaRouterIOMap, WemapMetaRouterOptions, WemapNetworkUtils, WemapRouter, WemapRouterOptions, WemapRouterUtils, getDurationFromLength, multiplyItineraryLevel, multiplyLegLevel, multiplyRouterResponseLevel };
 //# sourceMappingURL=wemap-routers.es.js.map