@wemap/routers 8.2.1 → 9.0.0-alpha.0

package/assets/rr-wemap-meta-multi-level.json

@@ -7,13 +7,13 @@
         43.6091851,
         3.8841386,
         1.5999999999999996,
-        "2"
+        2
     ],
     "to": [
         43.6093145,
         3.8842585,
         0,
-        "1"
+        1
     ],
     "itineraries": [
         {
@@ -21,13 +21,13 @@
                 43.6091851,
                 3.8841386,
                 1.5999999999999996,
-                "2"
+                2
             ],
             "to": [
                 43.6093145,
                 3.8842585,
                 0,
-                "1"
+                1
             ],
             "distance": 42.54181917885857,
             "duration": 30.630109808778165,
@@ -40,7 +40,7 @@
                             43.6091851,
                             3.8841386,
                             1.5999999999999996,
-                            "2"
+                            2
                         ]
                     },
                     "to": {
@@ -48,7 +48,7 @@
                             43.6093145,
                             3.8842585,
                             0,
-                            "1"
+                            1
                         ]
                     },
                     "distance": 42.54181917885857,
@@ -58,67 +58,73 @@
                             43.60918687807148,
                             3.884139117496946,
                             1.5999999999999996,
-                            "2"
+                            2
                         ],
                         [
                             43.60917494597,
                             3.88421731753,
                             null,
-                            "2"
+                            2
                         ],
                         [
                             43.60927603206,
                             3.88424673798,
                             null,
-                            "2"
+                            2
                         ],
                         [
                             43.60929353543,
                             3.88425183223,
                             null,
-                            "2"
+                            2
                         ],
                         [
                             43.60930219142,
                             3.88427017086,
                             null,
-                            "2"
+                            2
                         ],
                         [
                             43.60931231268,
                             3.8842731166,
                             null,
-                            "2"
+                            2
                         ],
                         [
                             43.60932336323,
                             3.884200898,
                             null,
-                            "2"
+                            2
                         ],
                         [
                             43.6093629216,
                             3.884212726,
                             null,
-                            "1;2"
+                            [
+                                1,
+                                2
+                            ]
                         ],
                         [
                             43.60935965678,
                             3.8842335535,
                             null,
-                            "1;2"
+                            [
+                                1,
+                                2
+                            ]
                         ],
                         [
                             43.60932022256,
                             3.88422176261,
                             null,
-                            "1"
+                            1
                         ],
                         [
                             43.60931456597898,
                             3.884258519367876,
                             0,
-                            "1"
+                            1
                         ]
                     ],
                     "steps": [
@@ -128,7 +134,7 @@
                                 43.60918687807148,
                                 3.884139117496946,
                                 1.5999999999999996,
-                                "2"
+                                2
                             ],
                             "angle": 1.570796452892035,
                             "previousBearing": 0.20769475566724294,
@@ -144,7 +150,7 @@
                                 43.60917494597,
                                 3.88421731753,
                                 null,
-                                "2"
+                                2
                             ],
                             "angle": -1.5707958396207153,
                             "previousBearing": 1.7784909563650013,
@@ -159,7 +165,7 @@
                                 43.60929353543,
                                 3.88425183223,
                                 null,
-                                "2"
+                                2
                             ],
                             "angle": 2.3561946292270304,
                             "previousBearing": 0.20769440021825977,
@@ -174,7 +180,7 @@
                                 43.60930219142,
                                 3.88427017086,
                                 null,
-                                "2"
+                                2
                             ],
                             "angle": -2.35619514761237,
                             "previousBearing": 0.9930924245810223,
@@ -189,7 +195,7 @@
                                 43.60931231268,
                                 3.8842731166,
                                 null,
-                                "2"
+                                2
                             ],
                             "angle": -1.571367193550253,
                             "previousBearing": 0.20769491860359898,
@@ -204,7 +210,7 @@
                                 43.60932336323,
                                 3.884200898,
                                 null,
-                                "2"
+                                2
                             ],
                             "angle": 1.5658578729882155,
                             "previousBearing": -1.3625305414359412,
@@ -224,7 +230,7 @@
                                 43.60932022256,
                                 3.88422176261,
                                 null,
-                                "1"
+                                1
                             ],
                             "angle": -1.567016008190605,
                             "previousBearing": -2.928388068274625,
@@ -239,7 +245,7 @@
                                 43.60931456597898,
                                 3.884258519367876,
                                 0,
-                                "1"
+                                1
                             ],
                             "angle": 1.570792167125268,
                             "previousBearing": 1.780220593505773,

package/assets/rr-wemap-meta-remote-indoor-outdoor-indoor.json

@@ -12,7 +12,7 @@
         48.8772962,
         2.3584458,
         null,
-        "0"
+        0
     ],
     "itineraries": [
         {
@@ -24,7 +24,7 @@
                 48.8772962,
                 2.3584458,
                 null,
-                "0"
+                0
             ],
             "distance": 1623.567209158486,
             "duration": 1188.9963905941102,
@@ -556,7 +556,7 @@
                             48.8774156,
                             2.3581551,
                             null,
-                            "0"
+                            0
                         ]
                     },
                     "to": {
@@ -564,7 +564,7 @@
                             48.8772962,
                             2.3584458,
                             null,
-                            "0"
+                            0
                         ]
                     },
                     "distance": 30.909140939457533,
@@ -574,61 +574,61 @@
                             48.8774156,
                             2.3581551,
                             null,
-                            "0"
+                            0
                         ],
                         [
                             48.8774031,
                             2.3582059,
                             null,
-                            "0"
+                            0
                         ],
                         [
                             48.87739408877,
                             2.3582397815,
                             null,
-                            "0"
+                            0
                         ],
                         [
                             48.87738003272,
                             2.35829263106,
                             null,
-                            "0"
+                            0
                         ],
                         [
                             48.87737740687,
                             2.35830250403,
                             null,
-                            "0"
+                            0
                         ],
                         [
                             48.87736050007,
                             2.35836607217,
                             null,
-                            "0"
+                            0
                         ],
                         [
                             48.8773552,
                             2.358386,
                             null,
-                            "0"
+                            0
                         ],
                         [
                             48.87734966973,
                             2.35840668389,
                             null,
-                            "0"
+                            0
                         ],
                         [
                             48.87732716148,
                             2.35849104813,
                             null,
-                            "0"
+                            0
                         ],
                         [
                             48.87729021362492,
                             2.3584691138693743,
                             null,
-                            "0"
+                            0
                         ]
                     ],
                     "steps": [
@@ -638,7 +638,7 @@
                                 48.8774156,
                                 2.3581551,
                                 null,
-                                "0"
+                                0
                             ],
                             "angle": 1.2127782103969411,
                             "previousBearing": 0,
@@ -653,7 +653,7 @@
                                 48.87732716148,
                                 2.35849104813,
                                 null,
-                                "0"
+                                0
                             ],
                             "angle": 1.5839505274258527,
                             "previousBearing": 1.9561807173237418,
@@ -668,7 +668,7 @@
                                 48.87729021362492,
                                 2.3584691138693743,
                                 null,
-                                "0"
+                                0
                             ],
                             "angle": 1.570800373779623,
                             "previousBearing": -2.769362463691904,

package/package.json

@@ -11,7 +11,7 @@
         "directory": "packages/routers"
     },
     "name": "@wemap/routers",
-    "version": "8.2.1",
+    "version": "9.0.0-alpha.0",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -29,10 +29,10 @@
         "@turf/boolean-point-in-polygon": "^6.5.0",
         "@turf/convex": "^6.5.0",
         "@turf/helpers": "^6.5.0",
-        "@wemap/geo": "^8.1.0",
+        "@wemap/geo": "^9.0.0-alpha.0",
         "@wemap/logger": "^8.0.1",
         "@wemap/maths": "^8.1.0",
-        "@wemap/osm": "^8.1.0"
+        "@wemap/osm": "^9.0.0-alpha.0"
     },
-    "gitHead": "6f0d3c90242a914f3daf7fcee165a4283c459fef"
+    "gitHead": "fc17cf617195c987813ede500bf67dd0f135cf34"
 }

package/src/ItineraryInfoManager.spec.js

@@ -19,9 +19,7 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const filePath = path.resolve(__dirname, '../assets/itinerary-grenoble-otp-1.json');
 const fileString = fs.readFileSync(filePath, 'utf8');
 const json = JSON.parse(fileString);
-const from = new Coordinates(45.187291, 5.723455);
-const to = new Coordinates(45.163729, 5.74085);
-const routerResponse = OtpRemoteRouter.createRouterResponseFromJson(json, from, to);
+const routerResponse = OtpRemoteRouter.createRouterResponseFromJson(json);
 
 let position, itineraryInfo;
 

package/src/Utils.js

@@ -1,5 +1,6 @@
 
 import RouterResponse from './model/RouterResponse.js';
+import { Level } from '@wemap/geo';
 
 /**
  * Get route duration
@@ -17,46 +18,30 @@ export function getDurationFromLength(length, speed = 5) {
  * @param {Number} levelFactor
  */
 export function multiplyRouterResponseLevel(routerResponse, levelFactor) {
-    if (routerResponse.from.level) {
-        routerResponse.from.level.multiplyBy(levelFactor);
-    }
-    if (routerResponse.to.level) {
-        routerResponse.to.level.multiplyBy(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) {
-        if (itinerary.from.level) {
-            itinerary.from.level.multiplyBy(levelFactor);
-        }
-        if (itinerary.to.level) {
-            itinerary.to.level.multiplyBy(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) {
-            if (leg.from.coords.level) {
-                leg.from.coords.level.multiplyBy(levelFactor);
-            }
-            if (leg.to.coords.level) {
-                leg.to.coords.level.multiplyBy(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) {
-                if (coords.level) {
-                    coords.level.multiplyBy(levelFactor);
-                }
+                coords.level = Level.multiplyBy(coords.level, levelFactor);
             }
             if (leg.steps) {
                 for (const step of leg.steps) {
-                    if (step.coords.level) {
-                        step.coords.level.multiplyBy(levelFactor);
-                    }
+                    step.coords.level = Level.multiplyBy(step.coords.level, levelFactor);
                 }
             }
         }
 
         if (itinerary._coords) {
             for (const coords of itinerary._coords) {
-                if (coords.level) {
-                    coords.level.multiplyBy(levelFactor);
-                }
+                coords.level = Level.multiplyBy(coords.level, levelFactor);
             }
         }
     }

package/src/Utils.spec.js

@@ -23,34 +23,33 @@ describe('Routers Utils', () => {
         const routerResponse = RouterResponse.fromJson(json);
         multiplyRouterResponseLevel(routerResponse, 5);
 
-        expect(routerResponse.from.level.val).equal(10);
-        expect(routerResponse.to.level.val).equal(5);
+        expect(routerResponse.from.level).equal(10);
+        expect(routerResponse.to.level).equal(5);
 
         const itinerary = routerResponse.itineraries[0];
-        expect(itinerary.from.level.val).equal(10);
-        expect(itinerary.to.level.val).equal(5);
+        expect(itinerary.from.level).equal(10);
+        expect(itinerary.to.level).equal(5);
 
         const leg = itinerary.legs[0];
-        expect(leg.from.coords.level.val).equal(10);
-        expect(leg.to.coords.level.val).equal(5);
+        expect(leg.from.coords.level).equal(10);
+        expect(leg.to.coords.level).equal(5);
 
         for (let i = 0; i < leg.coords.length; i++) {
             if (i <= 6) {
-                expect(leg.coords[i].level.val).equal(10);
+                expect(leg.coords[i].level).equal(10);
             } else if (i <= 8) {
-                expect(leg.coords[i].level.up).equal(10);
-                expect(leg.coords[i].level.low).equal(5);
+                expect(leg.coords[i].level).deep.equal([5, 10]);
             } else {
-                expect(leg.coords[i].level.val).equal(5);
+                expect(leg.coords[i].level).equal(5);
             }
         }
 
         const { steps } = leg;
         for (let i = 0; i < steps.length; i++) {
             if (i <= 5) {
-                expect(steps[i].coords.level.val).equal(10);
+                expect(steps[i].coords.level).equal(10);
             } else {
-                expect(steps[i].coords.level.val).equal(5);
+                expect(steps[i].coords.level).equal(5);
             }
         }
     });

package/src/remote/cityway/CitywayRemoteRouter.js

@@ -100,7 +100,7 @@ class CitywayRemoteRouter extends RemoteRouter {
         const jsonResponse = await res.json().catch(() => {
             throw new RemoteRouterServerUnreachable(this.rname, url);
         });
-        return this.createRouterResponseFromJson(jsonResponse, waypoints[0], waypoints[1]);
+        return this.createRouterResponseFromJson(jsonResponse);
     }
 
 
@@ -132,21 +132,18 @@ class CitywayRemoteRouter extends RemoteRouter {
     /**
      * Generate multi itineraries from Cityway JSON
      * @param {object} json JSON file provided by Cityway.
-     * @param {Coordinates} from
-     * @param {Coordinates} to
-     * @returns {!RouterResponse}
+     * @returns {?RouterResponse}
      * @example https://preprod.api.lia2.cityway.fr/journeyplanner/api/opt/PlanTrips/json?DepartureLatitude=49.51509388236216&DepartureLongitude=0.09341749619366316&ArrivalLatitude=49.5067090188444&ArrivalLongitude=0.1694842115417831&DepartureType=COORDINATES&ArrivalType=COORDINATES
      */
-    createRouterResponseFromJson(json, from, to) {
+    createRouterResponseFromJson(json) {
+
+        if (json.StatusCode !== 200 || !json.Data || !json.Data.length) {
+            return null;
+        }
 
         const routerResponse = new RouterResponse();
         routerResponse.routerName = this.rname;
-        routerResponse.from = from;
-        routerResponse.to = to;
 
-        if (json.StatusCode !== 200 || !json.Data || !json.Data.length) {
-            return routerResponse;
-        }
 
         // Do not know if it the best approach, but it works...
         const allJsonTrips = json.Data.reduce((acc, dataObj) => {
@@ -305,6 +302,9 @@ class CitywayRemoteRouter extends RemoteRouter {
             generateStepsMetadata(itinerary);
         }
 
+        routerResponse.from = routerResponse.itineraries[0].from;
+        routerResponse.to = routerResponse.itineraries[routerResponse.itineraries.length - 1].to;
+
         return routerResponse;
     }
 

package/src/remote/cityway/CitywayRemoteRouter.spec.js

@@ -24,9 +24,7 @@ describe('CitywayRemoteRouter - createRouterResponseFromJson', () => {
         const fileString = fs.readFileSync(filePath, 'utf8');
         const json = JSON.parse(fileString);
 
-        const from = new Coordinates(49.515093882362159, 0.093417496193663158);
-        const to = new Coordinates(49.5067090188444, 0.16948421154178309);
-        const routerResponse = CitywayRemoteRouter.createRouterResponseFromJson(json, from, to);
+        const routerResponse = CitywayRemoteRouter.createRouterResponseFromJson(json);
         checkRouterResponseType(routerResponse);
 
         expect(routerResponse.routerName).equal('cityway');
@@ -64,14 +62,12 @@ describe('CitywayRemoteRouter - createRouterResponseFromJson', () => {
         expect(itinerary1leg2.transportInfo.directionName).equal('Graville');
     });
 
-    const fakeCoords = new Coordinates(0, 0);
-
     it('RouterResponse - 2', () => {
         const filePath = path.resolve(assetsPath, 'itinerary-lehavre-cityway-2.json');
         const fileString = fs.readFileSync(filePath, 'utf8');
         const json = JSON.parse(fileString);
 
-        const routerResponse = CitywayRemoteRouter.createRouterResponseFromJson(json, fakeCoords, fakeCoords);
+        const routerResponse = CitywayRemoteRouter.createRouterResponseFromJson(json);
         checkRouterResponseType(routerResponse);
 
         expect(routerResponse.itineraries.length).equal(1);
@@ -83,7 +79,7 @@ describe('CitywayRemoteRouter - createRouterResponseFromJson', () => {
         const fileString = fs.readFileSync(filePath, 'utf8');
         const json = JSON.parse(fileString);
 
-        const routerResponse = CitywayRemoteRouter.createRouterResponseFromJson(json, fakeCoords, fakeCoords);
+        const routerResponse = CitywayRemoteRouter.createRouterResponseFromJson(json);
         checkRouterResponseType(routerResponse);
 
         expect(routerResponse.itineraries[0].mode).equal('PT');
@@ -95,7 +91,7 @@ describe('CitywayRemoteRouter - createRouterResponseFromJson', () => {
         const fileString = fs.readFileSync(filePath, 'utf8');
         const json = JSON.parse(fileString);
 
-        const routerResponse = CitywayRemoteRouter.createRouterResponseFromJson(json, fakeCoords, fakeCoords);
+        const routerResponse = CitywayRemoteRouter.createRouterResponseFromJson(json);
         checkRouterResponseType(routerResponse);
 
         expect(routerResponse.itineraries[0].mode).equal('BIKE');
@@ -107,7 +103,7 @@ describe('CitywayRemoteRouter - createRouterResponseFromJson', () => {
         const fileString = fs.readFileSync(filePath, 'utf8');
         const json = JSON.parse(fileString);
 
-        const routerResponse = CitywayRemoteRouter.createRouterResponseFromJson(json, fakeCoords, fakeCoords);
+        const routerResponse = CitywayRemoteRouter.createRouterResponseFromJson(json);
         checkRouterResponseType(routerResponse);
 
         expect(routerResponse.itineraries[1].mode).equal('PT');

package/src/remote/deutsche-bahn/DeutscheBahnRemoteRouter.js

@@ -47,12 +47,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(';');
 
@@ -64,22 +62,24 @@ class DeutscheBahnRemoteRouter extends RemoteRouter {
     /**
      * Generate multi itineraries from the DB JSON
      * @param {object} json JSON file provided by the DB.
-     * @param {Coordinates} from
-     * @param {Coordinates} to
-     * @returns {!RouterResponse}
+     * @param {Coordinates} from itinerary start
+     * @param {Coordinates} to itinerary end
+     * @returns {?RouterResponse}
      */
     createRouterResponseFromJson(json, from, to) {
 
+        const { segments: jsonSegments } = json;
+
+        if (!jsonSegments) {
+            return null;
+        }
+
         const routerResponse = new RouterResponse();
         routerResponse.routerName = this.rname;
+
         routerResponse.from = from;
         routerResponse.to = to;
 
-        const { segments: jsonSegments } = json;
-        if (!jsonSegments) {
-            return routerResponse;
-        }
-
         /** @type {GraphEdge<OsmElement>[]} */
         const edges = [];
 
@@ -92,7 +92,9 @@ 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) {

package/src/remote/deutsche-bahn/DeutscheBahnRemoteRouter.spec.js

@@ -5,7 +5,7 @@ import fs from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
 
-import { Coordinates, Level } from '@wemap/geo';
+import { Coordinates } from '@wemap/geo';
 
 import DeutscheBahnRemoteRouter from './DeutscheBahnRemoteRouter.js';
 
@@ -26,8 +26,8 @@ describe('DeutscheBahnRemoteRouter - createRouterResponseFromJson', () => {
         const fileString = fs.readFileSync(filePath, 'utf8');
         const json = JSON.parse(fileString);
 
-        const from = new Coordinates(52.5258473, 13.3683657, null, new Level(-10));
-        const to = new Coordinates(52.52499085853664, 13.369467296949914, null, new Level(0));
+        const from = new Coordinates(52.5258473, 13.3683657, null, -10);
+        const to = new Coordinates(52.52499085853664, 13.369467296949914, null, 0);
 
         const routerResponse = DeutscheBahnRemoteRouter.createRouterResponseFromJson(json, from, to);
         checkRouterResponseType(routerResponse);

package/src/remote/idfm/IdfmRemoteRouter.js

@@ -127,7 +127,7 @@ class IdfmRemoteRouter extends RemoteRouter {
             return routerResponse;
         }
 
-        return this.createRouterResponseFromJson(jsonResponse, waypoints[0], waypoints[1]);
+        return this.createRouterResponseFromJson(jsonResponse);
     }
 
     /**
@@ -327,20 +327,19 @@ class IdfmRemoteRouter extends RemoteRouter {
     /**
      * Generate multi itineraries from OTP JSON
      * @param {object} json JSON file provided by OTP.
-     * @param {Coordinates} from
-     * @param {Coordinates} to
-     * @returns {!RouterResponse}
+     * @returns {?RouterResponse}
      */
-    createRouterResponseFromJson(json, from, to) {
+    createRouterResponseFromJson(json) {
+
+        if (!json || !json.journeys) {
+            return null;
+        }
 
         const routerResponse = new RouterResponse();
         routerResponse.routerName = this.rname;
-        routerResponse.from = from;
-        routerResponse.to = to;
 
-        if (!json || !json.journeys) {
-            return routerResponse;
-        }
+        routerResponse.from = this.getSectionCoords(json.journeys[0].sections[0]).from;
+        routerResponse.to = this.getSectionCoords(last(json.journeys[0].sections)).to;
 
         const timeZone = json.context.timezone;
 
@@ -351,8 +350,8 @@ class IdfmRemoteRouter extends RemoteRouter {
             itinerary.duration = jsonItinerary.duration;
             itinerary.startTime = this.dateStringToTimestamp(jsonItinerary.departure_date_time, timeZone);
             itinerary.endTime = this.dateStringToTimestamp(jsonItinerary.arrival_date_time, timeZone);
-            itinerary.from = this.getSectionCoords(jsonItinerary.sections[0]).from;
-            itinerary.to = this.getSectionCoords(last(jsonItinerary.sections)).to;
+            itinerary.from = routerResponse.from;
+            itinerary.to = routerResponse.to;
             itinerary.distance = 0;
 
             routerResponse.itineraries.push(itinerary);
@@ -365,7 +364,7 @@ class IdfmRemoteRouter extends RemoteRouter {
 
                 const leg = new Leg();
                 let existingCoords = [];
-                const { from: fromSection, to: toSection } = this.getSectionCoords(jsonSection);
+                const { from, to } = this.getSectionCoords(jsonSection);
 
                 leg.distance = 0;
                 leg.mode = routingModeCorrespondance.get(jsonSection.mode);
@@ -375,12 +374,12 @@ class IdfmRemoteRouter extends RemoteRouter {
 
                 leg.from = {
                     name: jsonSection.from.name,
-                    coords: fromSection
+                    coords: from
                 };
 
                 leg.to = {
                     name: jsonSection.to.name,
-                    coords: toSection
+                    coords: to
                 };
 
                 // A section can have multiple same coordinates, we need to remove them

package/src/remote/idfm/IdfmRemoteRouter.spec.js

@@ -24,17 +24,15 @@ describe('IdfmRouter - createRouterResponseFromJson', () => {
         const fileString = fs.readFileSync(filePath, 'utf8');
         const json = JSON.parse(fileString);
 
-        const from = new Coordinates(48.875877, 2.301357);
-        const to = new Coordinates(48.877877, 2.351929);
-        const routerResponse = IdfmRemoteRouter.createRouterResponseFromJson(json, from, to);
+        const routerResponse = IdfmRemoteRouter.createRouterResponseFromJson(json);
         checkRouterResponseType(routerResponse);
 
         expect(routerResponse.routerName).equal('idfm');
         expect(routerResponse.itineraries.length).equal(5);
+        expect(routerResponse.from.equalsTo(new Coordinates(48.875877, 2.301357))).true;
+        expect(routerResponse.to.equalsTo(new Coordinates(48.877877, 2.351929))).true;
 
         const itinerary1 = routerResponse.itineraries[0];
-        expect(itinerary1.from.equalsTo(new Coordinates(48.875877, 2.301357))).true;
-        expect(itinerary1.to.equalsTo(new Coordinates(48.877877, 2.351929))).true;
         expect(itinerary1.distance).to.be.closeTo(1242, 1);
         expect(itinerary1.duration).equal(1842);
         expect(itinerary1.mode).equal('PT');

package/src/remote/osrm/OsrmRemoteRouter.js

@@ -1,6 +1,6 @@
 /* eslint-disable max-statements */
 
-import { Level, Coordinates } from '@wemap/geo';
+import { Coordinates } from '@wemap/geo';
 import { rad2deg, positiveMod } from '@wemap/maths';
 
 import Itinerary from '../../model/Itinerary.js';
@@ -53,9 +53,7 @@ class OsrmRemoteRouter extends RemoteRouter {
             throw new RemoteRouterServerUnreachable(this.rname, url);
         });
 
-        const from = waypoints[0];
-        const to = waypoints[waypoints.length - 1];
-        return this.createRouterResponseFromJson(jsonResponse, from, to);
+        return this.createRouterResponseFromJson(jsonResponse, waypoints[0], waypoints[1]);
     }
 
     /**
@@ -85,7 +83,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;
     }
@@ -97,7 +95,7 @@ class OsrmRemoteRouter extends RemoteRouter {
     jsonToCoordinates(json) {
         const output = new Coordinates(json[1], json[0]);
         if (json.length > 2) {
-            output.level = Level.fromString(json[2]);
+            output.level = json[2];
         }
         return output;
     }
@@ -267,15 +265,10 @@ class OsrmRemoteRouter extends RemoteRouter {
      * @returns {?RouterResponse}
      */
     createRouterResponseFromJson(json, from, to, routingMode = 'walking') {
-
-        const routerResponse = new RouterResponse();
-        routerResponse.routerName = this.rname;
-        routerResponse.from = from;
-        routerResponse.to = to;
-
         const { routes: jsonRoutes } = json;
+
         if (!jsonRoutes) {
-            return routerResponse;
+            return null;
         }
 
         const routingModeCorrespondance = new Map();
@@ -284,6 +277,12 @@ class OsrmRemoteRouter extends RemoteRouter {
         routingModeCorrespondance.set('bicycle', 'BIKE');
         const mode = routingModeCorrespondance.get(routingMode) || null;
 
+        const routerResponse = new RouterResponse();
+        routerResponse.routerName = this.rname;
+
+        routerResponse.from = from;
+        routerResponse.to = to;
+
         for (const jsonItinerary of jsonRoutes) {
 
             const itinerary = new Itinerary();

package/src/remote/osrm/OsrmRemoteRouter.spec.js

@@ -44,8 +44,8 @@ const assetsPath = path.resolve(__dirname, '../../../assets');
 //             network, router
 //         } = load('bureaux-wemap-montpellier-network.osm');
 
-//         wemapIndoorStart = new Coordinates(43.6092754, 3.8842306, null, new Level(2));
-//         wemapIndoorEnd = new Coordinates(43.6092602, 3.8842669, null, new Level(1));
+//         wemapIndoorStart = new Coordinates(43.6092754, 3.8842306, null, 2);
+//         wemapIndoorEnd = new Coordinates(43.6092602, 3.8842669, null, 1);
 //         const itinerary = router.getShortestPath(wemapIndoorStart, wemapIndoorEnd);
 //         wemapIndoorItinerary = itinerary;
 
@@ -350,8 +350,8 @@ const assetsPath = path.resolve(__dirname, '../../../assets');
 
 //         const { router } = load('bureaux-wemap-montpellier-network.osm');
 
-//         const start = new Coordinates(43.6092754, 3.8842306, null, new Level(2));
-//         const end = new Coordinates(43.60949854, 3.88452048, null, new Level(0));
+//         const start = new Coordinates(43.6092754, 3.8842306, null, 2);
+//         const end = new Coordinates(43.60949854, 3.88452048, null, 0);
 //         const itinerary = router.getShortestPath(start, end);
 
 //         const osrmJson = itineraryToOsrmJson(itinerary);

package/src/remote/otp/OtpRemoteRouter.js

@@ -50,7 +50,7 @@ class OtpRemoteRouter extends RemoteRouter {
         const jsonResponse = await res.json().catch(() => {
             throw new RemoteRouterServerUnreachable(this.rname, url);
         });
-        return this.createRouterResponseFromJson(jsonResponse, waypoints[0], waypoints[1]);
+        return this.createRouterResponseFromJson(jsonResponse);
     }
 
     /**
@@ -127,24 +127,21 @@ class OtpRemoteRouter extends RemoteRouter {
     /**
      * Generate multi itineraries from OTP JSON
      * @param {object} json JSON file provided by OTP.
-     * @param {Coordinates} from
-     * @param {Coordinates} to
-     * @returns {!RouterResponse}
+     * @returns {?RouterResponse}
      */
-    createRouterResponseFromJson(json, from, to) {
-
-        const routerResponse = new RouterResponse();
-        routerResponse.routerName = this.rname;
-        routerResponse.from = from;
-        routerResponse.to = to;
+    createRouterResponseFromJson(json) {
 
         const { plan: jsonPlan } = json;
+
         if (!jsonPlan) {
-            return routerResponse;
+            return null;
         }
 
-        const itinerariesFrom = this.jsonToCoordinates(jsonPlan.from);
-        const itinerariesTo = this.jsonToCoordinates(jsonPlan.to);
+        const routerResponse = new RouterResponse();
+        routerResponse.routerName = this.rname;
+
+        routerResponse.from = this.jsonToCoordinates(jsonPlan.from);
+        routerResponse.to = this.jsonToCoordinates(jsonPlan.to);
 
         for (const jsonItinerary of jsonPlan.itineraries) {
 
@@ -153,8 +150,8 @@ class OtpRemoteRouter extends RemoteRouter {
             itinerary.duration = jsonItinerary.duration;
             itinerary.startTime = jsonItinerary.startTime;
             itinerary.endTime = jsonItinerary.endTime;
-            itinerary.from = itinerariesFrom;
-            itinerary.to = itinerariesTo;
+            itinerary.from = routerResponse.from;
+            itinerary.to = routerResponse.to;
 
             routerResponse.itineraries.push(itinerary);
 

package/src/remote/otp/OtpRemoteRouter.spec.js

@@ -26,17 +26,15 @@ describe('OtpRouter - createRouterResponseFromJson', () => {
         const fileString = fs.readFileSync(filePath, 'utf8');
         const json = JSON.parse(fileString);
 
-        const from = new Coordinates(45.187291, 5.723455);
-        const to = new Coordinates(45.163729, 5.74085);
-        const routerResponse = OtpRemoteRouter.createRouterResponseFromJson(json, from, to);
+        const routerResponse = OtpRemoteRouter.createRouterResponseFromJson(json);
         checkRouterResponseType(routerResponse);
 
         expect(routerResponse.routerName).equal('otp');
         expect(routerResponse.itineraries.length).equal(2);
+        expect(routerResponse.from.equalsTo(new Coordinates(45.187291, 5.723455))).true;
+        expect(routerResponse.to.equalsTo(new Coordinates(45.163729, 5.74085))).true;
 
         const itinerary1 = routerResponse.itineraries[0];
-        expect(itinerary1.from.equalsTo(new Coordinates(45.187291, 5.723455))).true;
-        expect(itinerary1.to.equalsTo(new Coordinates(45.163729, 5.74085))).true;
         expect(itinerary1.coords.length).equal(162);
         expect(itinerary1.duration).equal(1206);
         expect(itinerary1.startTime).equal(1614607210000);
@@ -72,16 +70,14 @@ describe('OtpRouter - createRouterResponseFromJson', () => {
         const fileString = fs.readFileSync(filePath, 'utf8');
         const json = JSON.parse(fileString);
 
-        const from = new Coordinates(45.192514856662456, 5.731452541397871);
-        const to = new Coordinates(45.18544, 5.73123);
-        const routerResponse = OtpRemoteRouter.createRouterResponseFromJson(json, from, to);
+        const routerResponse = OtpRemoteRouter.createRouterResponseFromJson(json);
         checkRouterResponseType(routerResponse);
 
         expect(routerResponse.itineraries.length).equal(2);
+        expect(routerResponse.from.equalsTo(new Coordinates(45.192514856662456, 5.731452541397871))).true;
+        expect(routerResponse.to.equalsTo(new Coordinates(45.18544, 5.73123))).true;
 
         const itinerary1 = routerResponse.itineraries[0];
-        expect(itinerary1.from.equalsTo(new Coordinates(45.192514856662456, 5.731452541397871))).true;
-        expect(itinerary1.to.equalsTo(new Coordinates(45.18544, 5.73123))).true;
         expect(itinerary1.legs.length).equal(5);
 
         expect(itinerary1.mode).equal('PT');

package/src/remote/wemap-meta/WemapMetaRemoteRouter.spec.js

@@ -3,7 +3,7 @@ import fs from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
 
-import { Coordinates, Level } from '@wemap/geo';
+import { Coordinates } from '@wemap/geo';
 
 import Constants from '../../Constants.js';
 import WemapMetaRemoteRouter from './WemapMetaRemoteRouter.js';
@@ -83,7 +83,7 @@ describe('WemapMetaRemoteRouter', () => {
 
     it('indoor to outdoor to indoor', async () => {
         const start = new Coordinates(48.8725992, 2.343431);
-        const end = new Coordinates(48.8772962, 2.3584458, null, new Level(0));
+        const end = new Coordinates(48.8772962, 2.3584458, null, 0);
         mockFetchWithJsonAsset('rr-wemap-meta-remote-indoor-outdoor-indoor.json');
         const routerResponse = await WemapMetaRemoteRouter.getItineraries(
             endpointUrl, Constants.ROUTING_MODE.WALK, [start, end], options

package/src/wemap/WemapNetworkUtils.js

@@ -67,7 +67,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');
         }
 
@@ -87,10 +87,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);

package/src/wemap/WemapRouter.spec.js

@@ -5,9 +5,7 @@ import fs from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
 
-import {
-    Level, Coordinates, GraphNode, Network, GraphItinerary
-} from '@wemap/geo';
+import { Coordinates, GraphNode, Network, GraphItinerary } from '@wemap/geo';
 import { OsmElement, OsmParser } from '@wemap/osm';
 
 
@@ -32,8 +30,8 @@ const getNodesNames = _itinerary => {
 };
 
 
-const itineraryStart = new Coordinates(43.6092754, 3.8842306, null, new Level(2));
-const itineraryEnd = new Coordinates(43.6092602, 3.8842669, null, new Level(1));
+const itineraryStart = new Coordinates(43.6092754, 3.8842306, null, 2);
+const itineraryEnd = new Coordinates(43.6092602, 3.8842669, null, 1);
 
 
 /**
@@ -125,8 +123,8 @@ describe('WemapRouter - Multi-level itinerary', () => {
 
     it('router returns shortest path 2', () => {
 
-        const start = new Coordinates(43.609219, 3.8841743, null, new Level(2));
-        const end = new Coordinates(43.60917216742, 3.8842355275, null, new Level(2));
+        const start = new Coordinates(43.609219, 3.8841743, null, 2);
+        const end = new Coordinates(43.60917216742, 3.8842355275, null, 2);
         const itinerary2 = router.getShortestPath(start, end);
 
         expect(getNodesNames(itinerary2)).deep.equals(['w1', 'p6', 'p5']);
@@ -184,8 +182,8 @@ describe('WemapRouter - Conveying', () => {
 
     it('do not use oneway conveying', () => {
 
-        const start = new Coordinates(48.8445715, 2.3718927, null, new Level(0));
-        const end = new Coordinates(48.84443728652394, 2.3721685669363524, null, new Level(-1));
+        const start = new Coordinates(48.8445715, 2.3718927, null, 0);
+        const end = new Coordinates(48.84443728652394, 2.3721685669363524, null, -1);
 
         const itinerary = router.getShortestPath(start, end);
         expect(itinerary).is.not.undefined;

package/src/wemap/WemapStepsGeneration.js

@@ -37,9 +37,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;
 

package/src/wemap-meta/WemapMetaRouter.spec.js

@@ -4,7 +4,7 @@ import fs from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
 
-import { Level, Coordinates } from '@wemap/geo';
+import { Coordinates } from '@wemap/geo';
 import Logger from '@wemap/logger';
 
 import IOMap from './IOMap.js';
@@ -118,7 +118,7 @@ describe('WemapMetaRouter', () => {
 
         options.targetMaps.push(garedelestMap.name);
         const start = new Coordinates(48.8725992, 2.343431);
-        const end = new Coordinates(48.8772962, 2.3584458, null, new Level(0));
+        const end = new Coordinates(48.8772962, 2.3584458, null, 0);
         mockFetchWithJsonAsset('rr-wemap-meta-indoor-outdoor-indoor.json');
 
         const routerResponse = await router.getItineraries(mode, [start, end], options);