@wemap/routers 7.5.1 → 7.5.2

package/package.json

@@ -11,7 +11,7 @@
         "directory": "packages/routers"
     },
     "name": "@wemap/routers",
-    "version": "7.5.1",
+    "version": "7.5.2",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -34,5 +34,5 @@
         "@wemap/maths": "^7.5.0",
         "@wemap/osm": "^7.5.0"
     },
-    "gitHead": "8bb7768dce76ad5aef46128c4761505725fb0105"
+    "gitHead": "86a6d0131a7a32586d4ca8ab79adb45eec7a76c2"
 }

package/src/ItineraryInfoManager.spec.js

@@ -19,7 +19,9 @@ 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 routerResponse = OtpRemoteRouter.createRouterResponseFromJson(json);
+const from = new Coordinates(45.187291, 5.723455);
+const to = new Coordinates(45.163729, 5.74085);
+const routerResponse = OtpRemoteRouter.createRouterResponseFromJson(json, from, to);
 
 let position, itineraryInfo;
 

package/src/model/RouterResponse.js

@@ -70,7 +70,7 @@ class RouterResponse {
 
     /**
      * @param {object} json
-     * @returns {!RouterResponse}
+     * @returns {RouterResponse}
      */
     static fromJson(json) {
         const routerResponse = new RouterResponse();

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);
+        return this.createRouterResponseFromJson(jsonResponse, waypoints[0], waypoints[1]);
     }
 
 
@@ -132,22 +132,22 @@ class CitywayRemoteRouter extends RemoteRouter {
     /**
      * Generate multi itineraries from Cityway JSON
      * @param {object} json JSON file provided by Cityway.
-     * @param {Array<Coordinates>} waypoints
+     * @param {Coordinates} from
+     * @param {Coordinates} to
      * @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, waypoints) {
+    createRouterResponseFromJson(json, from, to) {
 
         const routerResponse = new RouterResponse();
         routerResponse.routerName = this.rname;
-        routerResponse.from = waypoints[0];
-        routerResponse.to = waypoints[1];
+        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) => {
             acc.push(...dataObj.response.trips.Trip.map(trip => ({

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

@@ -24,7 +24,9 @@ describe('CitywayRemoteRouter - createRouterResponseFromJson', () => {
         const fileString = fs.readFileSync(filePath, 'utf8');
         const json = JSON.parse(fileString);
 
-        const routerResponse = CitywayRemoteRouter.createRouterResponseFromJson(json);
+        const from = new Coordinates(49.515093882362159, 0.093417496193663158);
+        const to = new Coordinates(49.5067090188444, 0.16948421154178309);
+        const routerResponse = CitywayRemoteRouter.createRouterResponseFromJson(json, from, to);
         checkRouterResponseType(routerResponse);
 
         expect(routerResponse.routerName).equal('cityway');
@@ -62,12 +64,14 @@ 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);
+        const routerResponse = CitywayRemoteRouter.createRouterResponseFromJson(json, fakeCoords, fakeCoords);
         checkRouterResponseType(routerResponse);
 
         expect(routerResponse.itineraries.length).equal(1);
@@ -79,7 +83,7 @@ describe('CitywayRemoteRouter - createRouterResponseFromJson', () => {
         const fileString = fs.readFileSync(filePath, 'utf8');
         const json = JSON.parse(fileString);
 
-        const routerResponse = CitywayRemoteRouter.createRouterResponseFromJson(json);
+        const routerResponse = CitywayRemoteRouter.createRouterResponseFromJson(json, fakeCoords, fakeCoords);
         checkRouterResponseType(routerResponse);
 
         expect(routerResponse.itineraries[0].mode).equal('PT');
@@ -91,7 +95,7 @@ describe('CitywayRemoteRouter - createRouterResponseFromJson', () => {
         const fileString = fs.readFileSync(filePath, 'utf8');
         const json = JSON.parse(fileString);
 
-        const routerResponse = CitywayRemoteRouter.createRouterResponseFromJson(json);
+        const routerResponse = CitywayRemoteRouter.createRouterResponseFromJson(json, fakeCoords, fakeCoords);
         checkRouterResponseType(routerResponse);
 
         expect(routerResponse.itineraries[0].mode).equal('BIKE');
@@ -103,7 +107,7 @@ describe('CitywayRemoteRouter - createRouterResponseFromJson', () => {
         const fileString = fs.readFileSync(filePath, 'utf8');
         const json = JSON.parse(fileString);
 
-        const routerResponse = CitywayRemoteRouter.createRouterResponseFromJson(json);
+        const routerResponse = CitywayRemoteRouter.createRouterResponseFromJson(json, fakeCoords, fakeCoords);
         checkRouterResponseType(routerResponse);
 
         expect(routerResponse.itineraries[1].mode).equal('PT');

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

@@ -64,23 +64,22 @@ class DeutscheBahnRemoteRouter extends RemoteRouter {
     /**
      * Generate multi itineraries from the DB JSON
      * @param {object} json JSON file provided by the DB.
-     * @param {Coordinates[]} waypoints
+     * @param {Coordinates} from
+     * @param {Coordinates} to
      * @returns {!RouterResponse}
      */
-    createRouterResponseFromJson(json, waypoints) {
+    createRouterResponseFromJson(json, from, to) {
 
         const routerResponse = new RouterResponse();
         routerResponse.routerName = this.rname;
-        routerResponse.from = waypoints[0];
-        routerResponse.to = waypoints[1];
+        routerResponse.from = from;
+        routerResponse.to = to;
 
         const { segments: jsonSegments } = json;
-
         if (!jsonSegments) {
             return routerResponse;
         }
 
-
         /** @type {GraphEdge<OsmElement>[]} */
         const edges = [];
 
@@ -128,7 +127,7 @@ class DeutscheBahnRemoteRouter extends RemoteRouter {
         graphItinerary.end = nodes[nodes.length - 1].coords;
 
         const points = nodes.map(node => node.coords);
-        const itinerary = Itinerary.fromOrderedCoordinates(points, waypoints[0], waypoints[1]);
+        const itinerary = Itinerary.fromOrderedCoordinates(points, from, to);
         itinerary.legs[0].steps = StepsGeneration.fromGraphItinerary(graphItinerary);
         itinerary.legs[0].steps.map((step, idx) => (step._idCoordsInLeg = idx));
 

package/src/remote/idfm/IdfmRemoteRouter.js

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

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

@@ -24,15 +24,17 @@ describe('IdfmRouter - createRouterResponseFromJson', () => {
         const fileString = fs.readFileSync(filePath, 'utf8');
         const json = JSON.parse(fileString);
 
-        const routerResponse = IdfmRemoteRouter.createRouterResponseFromJson(json);
+        const from = new Coordinates(48.875877, 2.301357);
+        const to = new Coordinates(48.877877, 2.351929);
+        const routerResponse = IdfmRemoteRouter.createRouterResponseFromJson(json, from, to);
         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

@@ -53,7 +53,9 @@ class OsrmRemoteRouter extends RemoteRouter {
             throw new RemoteRouterServerUnreachable(this.rname, url);
         });
 
-        return this.createRouterResponseFromJson(jsonResponse, waypoints);
+        const from = waypoints[0];
+        const to = waypoints[waypoints.length - 1];
+        return this.createRouterResponseFromJson(jsonResponse, from, to);
     }
 
     /**
@@ -259,16 +261,17 @@ class OsrmRemoteRouter extends RemoteRouter {
     /**
      * Generate multi itineraries from OSRM JSON
      * @param {object} json JSON file provided by OSRM.
-     * @param {Coordinates[]} waypoints
+     * @param {Coordinates} from itinerary start
+     * @param {Coordinates} to itinerary end
      * @param {?string} routingMode [walking|driving|bicycle]
-     * @returns {!RouterResponse}
+     * @returns {?RouterResponse}
      */
-    createRouterResponseFromJson(json, waypoints, routingMode = 'walking') {
+    createRouterResponseFromJson(json, from, to, routingMode = 'walking') {
 
         const routerResponse = new RouterResponse();
         routerResponse.routerName = this.rname;
-        routerResponse.from = waypoints[0];
-        routerResponse.to = waypoints[1];
+        routerResponse.from = from;
+        routerResponse.to = to;
 
         const { routes: jsonRoutes } = json;
         if (!jsonRoutes) {
@@ -288,8 +291,8 @@ class OsrmRemoteRouter extends RemoteRouter {
             // itinerary.coords = jsonItinerary.geometry.coordinates.map(jsonToCoordinates);
             itinerary.distance = jsonItinerary.distance;
             itinerary.duration = jsonItinerary.duration;
-            itinerary.from = waypoints[0];
-            itinerary.to = waypoints[1];
+            itinerary.from = from;
+            itinerary.to = to;
 
             routerResponse.itineraries.push(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);
+        return this.createRouterResponseFromJson(jsonResponse, waypoints[0], waypoints[1]);
     }
 
     /**
@@ -127,21 +127,25 @@ class OtpRemoteRouter extends RemoteRouter {
     /**
      * Generate multi itineraries from OTP JSON
      * @param {object} json JSON file provided by OTP.
-     * @param {Coordinates[]} waypoints
-     * @returns {?RouterResponse}
+     * @param {Coordinates} from
+     * @param {Coordinates} to
+     * @returns {!RouterResponse}
      */
-    createRouterResponseFromJson(json, waypoints) {
+    createRouterResponseFromJson(json, from, to) {
 
         const routerResponse = new RouterResponse();
         routerResponse.routerName = this.rname;
-        routerResponse.from = waypoints[0];
-        routerResponse.to = waypoints[1];
+        routerResponse.from = from;
+        routerResponse.to = to;
 
         const { plan: jsonPlan } = json;
         if (!jsonPlan) {
             return routerResponse;
         }
 
+        const itinerariesFrom = this.jsonToCoordinates(jsonPlan.from);
+        const itinerariesTo = this.jsonToCoordinates(jsonPlan.to);
+
         for (const jsonItinerary of jsonPlan.itineraries) {
 
             const itinerary = new Itinerary();
@@ -149,8 +153,8 @@ class OtpRemoteRouter extends RemoteRouter {
             itinerary.duration = jsonItinerary.duration;
             itinerary.startTime = jsonItinerary.startTime;
             itinerary.endTime = jsonItinerary.endTime;
-            itinerary.from = routerResponse.from;
-            itinerary.to = routerResponse.to;
+            itinerary.from = itinerariesFrom;
+            itinerary.to = itinerariesTo;
 
             routerResponse.itineraries.push(itinerary);
 

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

@@ -26,15 +26,17 @@ describe('OtpRouter - createRouterResponseFromJson', () => {
         const fileString = fs.readFileSync(filePath, 'utf8');
         const json = JSON.parse(fileString);
 
-        const routerResponse = OtpRemoteRouter.createRouterResponseFromJson(json);
+        const from = new Coordinates(45.187291, 5.723455);
+        const to = new Coordinates(45.163729, 5.74085);
+        const routerResponse = OtpRemoteRouter.createRouterResponseFromJson(json, from, to);
         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);
@@ -70,14 +72,16 @@ describe('OtpRouter - createRouterResponseFromJson', () => {
         const fileString = fs.readFileSync(filePath, 'utf8');
         const json = JSON.parse(fileString);
 
-        const routerResponse = OtpRemoteRouter.createRouterResponseFromJson(json);
+        const from = new Coordinates(45.192514856662456, 5.731452541397871);
+        const to = new Coordinates(45.18544, 5.73123);
+        const routerResponse = OtpRemoteRouter.createRouterResponseFromJson(json, from, to);
         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/wemap-meta/WemapMetaRouter.js

@@ -44,7 +44,7 @@ class WemapMetaRouter {
      * @param {string} mode see Constants.ROUTING_MODE
      * @param {Coordinates[]} waypoints
      * @param {WemapMetaRouterOptions} options
-     * @returns {!RouterResponse}
+     * @returns {RouterResponse}
      */
     async getItineraries(mode, waypoints, options) {