@wemap/routers 7.5.1 → 8.0.0-alpha.0

package/package.json

@@ -11,7 +11,7 @@
         "directory": "packages/routers"
     },
     "name": "@wemap/routers",
-    "version": "7.5.1",
+    "version": "8.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": "^7.5.0",
+        "@wemap/geo": "^8.0.0-alpha.0",
         "@wemap/logger": "^7.0.0",
-        "@wemap/maths": "^7.5.0",
-        "@wemap/osm": "^7.5.0"
+        "@wemap/maths": "^8.0.0-alpha.0",
+        "@wemap/osm": "^8.0.0-alpha.0"
     },
-    "gitHead": "8bb7768dce76ad5aef46128c4761505725fb0105"
+    "gitHead": "b5cfa73ad766f0763ab980127281a561ecb9ddac"
 }

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);
     }
 
 
@@ -132,21 +132,18 @@ class CitywayRemoteRouter extends RemoteRouter {
     /**
      * Generate multi itineraries from Cityway JSON
      * @param {object} json JSON file provided by Cityway.
-     * @param {Array<Coordinates>} waypoints
-     * @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, waypoints) {
-
-        const routerResponse = new RouterResponse();
-        routerResponse.routerName = this.rname;
-        routerResponse.from = waypoints[0];
-        routerResponse.to = waypoints[1];
+    createRouterResponseFromJson(json) {
 
         if (json.StatusCode !== 200 || !json.Data || !json.Data.length) {
-            return routerResponse;
+            return null;
         }
 
+        const routerResponse = new RouterResponse();
+        routerResponse.routerName = this.rname;
+
 
         // 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/deutsche-bahn/DeutscheBahnRemoteRouter.js

@@ -64,22 +64,23 @@ class DeutscheBahnRemoteRouter extends RemoteRouter {
     /**
      * Generate multi itineraries from the DB JSON
      * @param {object} json JSON file provided by the DB.
-     * @param {Coordinates[]} waypoints
-     * @returns {!RouterResponse}
+     * @param {Coordinates} from itinerary start
+     * @param {Coordinates} to itinerary end
+     * @returns {?RouterResponse}
      */
-    createRouterResponseFromJson(json, waypoints) {
-
-        const routerResponse = new RouterResponse();
-        routerResponse.routerName = this.rname;
-        routerResponse.from = waypoints[0];
-        routerResponse.to = waypoints[1];
+    createRouterResponseFromJson(json, from, to) {
 
         const { segments: jsonSegments } = json;
 
         if (!jsonSegments) {
-            return routerResponse;
+            return null;
         }
 
+        const routerResponse = new RouterResponse();
+        routerResponse.routerName = this.rname;
+
+        routerResponse.from = from;
+        routerResponse.to = to;
 
         /** @type {GraphEdge<OsmElement>[]} */
         const edges = [];
@@ -128,7 +129,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);
     }
 
     /**
@@ -327,20 +327,19 @@ class IdfmRemoteRouter extends RemoteRouter {
     /**
      * Generate multi itineraries from OTP JSON
      * @param {object} json JSON file provided by OTP.
-     * @param {Coordinates[]} waypoints
      * @returns {?RouterResponse}
      */
-    createRouterResponseFromJson(json, waypoints) {
-
-        const routerResponse = new RouterResponse();
-        routerResponse.routerName = this.rname;
-        routerResponse.from = waypoints[0];
-        routerResponse.to = waypoints[1];
+    createRouterResponseFromJson(json) {
 
         if (!json || !json.journeys) {
-            return routerResponse;
+            return null;
         }
 
+        const routerResponse = new RouterResponse();
+        routerResponse.routerName = this.rname;
+
+        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;
 

package/src/remote/osrm/OsrmRemoteRouter.js

@@ -53,7 +53,7 @@ class OsrmRemoteRouter extends RemoteRouter {
             throw new RemoteRouterServerUnreachable(this.rname, url);
         });
 
-        return this.createRouterResponseFromJson(jsonResponse, waypoints);
+        return this.createRouterResponseFromJson(jsonResponse, waypoints[0], waypoints[1]);
     }
 
     /**
@@ -259,20 +259,16 @@ 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') {
-
-        const routerResponse = new RouterResponse();
-        routerResponse.routerName = this.rname;
-        routerResponse.from = waypoints[0];
-        routerResponse.to = waypoints[1];
-
+    createRouterResponseFromJson(json, from, to, routingMode = 'walking') {
         const { routes: jsonRoutes } = json;
+
         if (!jsonRoutes) {
-            return routerResponse;
+            return null;
         }
 
         const routingModeCorrespondance = new Map();
@@ -281,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();
@@ -288,8 +290,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

@@ -127,21 +127,22 @@ class OtpRemoteRouter extends RemoteRouter {
     /**
      * Generate multi itineraries from OTP JSON
      * @param {object} json JSON file provided by OTP.
-     * @param {Coordinates[]} waypoints
      * @returns {?RouterResponse}
      */
-    createRouterResponseFromJson(json, waypoints) {
-
-        const routerResponse = new RouterResponse();
-        routerResponse.routerName = this.rname;
-        routerResponse.from = waypoints[0];
-        routerResponse.to = waypoints[1];
+    createRouterResponseFromJson(json) {
 
         const { plan: jsonPlan } = json;
+
         if (!jsonPlan) {
-            return routerResponse;
+            return null;
         }
 
+        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) {
 
             const itinerary = new Itinerary();

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) {