@wemap/routers 9.0.0-alpha.1 → 9.0.0-alpha.2

package/dist/wemap-routers.es.js

@@ -1751,7 +1751,7 @@ class CitywayRemoteRouter 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]);
     }
 
 
@@ -1783,18 +1783,21 @@ class CitywayRemoteRouter extends RemoteRouter {
     /**
      * Generate multi itineraries from Cityway JSON
      * @param {object} json JSON file provided by Cityway.
-     * @returns {?RouterResponse}
+     * @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) {
-
-        if (json.StatusCode !== 200 || !json.Data || !json.Data.length) {
-            return null;
-        }
+    createRouterResponseFromJson(json, from, to) {
 
         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) => {
@@ -1953,9 +1956,6 @@ class CitywayRemoteRouter extends RemoteRouter {
             generateStepsMetadata(itinerary);
         }
 
-        routerResponse.from = routerResponse.itineraries[0].from;
-        routerResponse.to = routerResponse.itineraries[routerResponse.itineraries.length - 1].to;
-
         return routerResponse;
     }
 
@@ -2094,24 +2094,22 @@ class DeutscheBahnRemoteRouter extends RemoteRouter {
     /**
      * Generate multi itineraries from the DB JSON
      * @param {object} json JSON file provided by the DB.
-     * @param {Coordinates} from itinerary start
-     * @param {Coordinates} to itinerary end
-     * @returns {?RouterResponse}
+     * @param {Coordinates} from
+     * @param {Coordinates} to
+     * @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 = [];
 
@@ -2291,7 +2289,7 @@ class IdfmRemoteRouter extends RemoteRouter {
             return routerResponse;
         }
 
-        return this.createRouterResponseFromJson(jsonResponse);
+        return this.createRouterResponseFromJson(jsonResponse, waypoints[0], waypoints[1]);
     }
 
     /**
@@ -2489,19 +2487,20 @@ class IdfmRemoteRouter extends RemoteRouter {
     /**
      * Generate multi itineraries from OTP JSON
      * @param {object} json JSON file provided by OTP.
-     * @returns {?RouterResponse}
+     * @param {Coordinates} from
+     * @param {Coordinates} to
+     * @returns {!RouterResponse}
      */
-    createRouterResponseFromJson(json) {
-
-        if (!json || !json.journeys) {
-            return null;
-        }
+    createRouterResponseFromJson(json, from, to) {
 
         const routerResponse = new RouterResponse();
         routerResponse.routerName = this.rname;
+        routerResponse.from = from;
+        routerResponse.to = to;
 
-        routerResponse.from = this.getSectionCoords(json.journeys[0].sections[0]).from;
-        routerResponse.to = this.getSectionCoords(last(json.journeys[0].sections)).to;
+        if (!json || !json.journeys) {
+            return routerResponse;
+        }
 
         const timeZone = json.context.timezone;
 
@@ -2512,8 +2511,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);
@@ -2526,7 +2525,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);
@@ -2536,12 +2535,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
@@ -2649,7 +2648,9 @@ class OsrmRemoteRouter extends RemoteRouter {
             throw new RemoteRouterServerUnreachable(this.rname, url);
         });
 
-        return this.createRouterResponseFromJson(jsonResponse, waypoints[0], waypoints[1]);
+        const from = waypoints[0];
+        const to = waypoints[waypoints.length - 1];
+        return this.createRouterResponseFromJson(jsonResponse, from, to);
     }
 
     /**
@@ -2861,10 +2862,15 @@ class OsrmRemoteRouter extends RemoteRouter {
      * @returns {?RouterResponse}
      */
     createRouterResponseFromJson(json, from, to, routingMode = 'walking') {
-        const { routes: jsonRoutes } = json;
 
+        const routerResponse = new RouterResponse();
+        routerResponse.routerName = this.rname;
+        routerResponse.from = from;
+        routerResponse.to = to;
+
+        const { routes: jsonRoutes } = json;
         if (!jsonRoutes) {
-            return null;
+            return routerResponse;
         }
 
         const routingModeCorrespondance = new Map();
@@ -2873,12 +2879,6 @@ 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();
@@ -2968,7 +2968,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]);
     }
 
     /**
@@ -3045,21 +3045,24 @@ class OtpRemoteRouter extends RemoteRouter {
     /**
      * Generate multi itineraries from OTP JSON
      * @param {object} json JSON file provided by OTP.
-     * @returns {?RouterResponse}
+     * @param {Coordinates} from
+     * @param {Coordinates} to
+     * @returns {!RouterResponse}
      */
-    createRouterResponseFromJson(json) {
+    createRouterResponseFromJson(json, from, to) {
 
-        const { plan: jsonPlan } = json;
+        const routerResponse = new RouterResponse();
+        routerResponse.routerName = this.rname;
+        routerResponse.from = from;
+        routerResponse.to = to;
 
+        const { plan: jsonPlan } = json;
         if (!jsonPlan) {
-            return null;
+            return routerResponse;
         }
 
-        const routerResponse = new RouterResponse();
-        routerResponse.routerName = this.rname;
-
-        routerResponse.from = this.jsonToCoordinates(jsonPlan.from);
-        routerResponse.to = this.jsonToCoordinates(jsonPlan.to);
+        const itinerariesFrom = this.jsonToCoordinates(jsonPlan.from);
+        const itinerariesTo = this.jsonToCoordinates(jsonPlan.to);
 
         for (const jsonItinerary of jsonPlan.itineraries) {
 
@@ -3068,8 +3071,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);