@wemap/routers 7.5.2 → 8.0.0

package/package.json

@@ -11,7 +11,7 @@
         "directory": "packages/routers"
     },
     "name": "@wemap/routers",
-    "version": "7.5.2",
+    "version": "8.0.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": "^7.5.0",
+        "@wemap/geo": "^8.0.0",
         "@wemap/logger": "^7.0.0",
-        "@wemap/maths": "^7.5.0",
-        "@wemap/osm": "^7.5.0"
+        "@wemap/maths": "^8.0.0",
+        "@wemap/osm": "^8.0.0"
     },
-    "gitHead": "86a6d0131a7a32586d4ca8ab79adb45eec7a76c2"
+    "gitHead": "d1006725a0cff82f00d1d67907b8c4264fcd48f0"
 }

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/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

@@ -64,22 +64,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 = [];
 

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

@@ -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]);
     }
 
     /**
@@ -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/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');