@wemap/routers 11.8.3 → 11.8.5

package/package.json

@@ -12,7 +12,7 @@
         "directory": "packages/routers"
     },
     "name": "@wemap/routers",
-    "version": "11.8.3",
+    "version": "11.8.5",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -52,5 +52,5 @@
         },
         "./helpers/*": "./helpers/*"
     },
-    "gitHead": "397bf109830445141c90a8222bbcde98bc567f01"
+    "gitHead": "b811f47998e121da18d85857c9a1ddd1ae25c53b"
 }

package/src/remote/idfm/IdfmRemoteRouter.ts

@@ -54,6 +54,9 @@ type IdfmJson = {
     }[],
     context: {
         timezone: string
+    };
+    error: {
+        message?: string;
     }
 };
 
@@ -172,7 +175,7 @@ class IdfmRemoteRouter extends RemoteRouter {
         }));
 
 
-        const jsonResponse = await res.json().catch(() => {
+        const jsonResponse: IdfmJson = await res.json().catch(() => {
             throw new RemoteRouterServerUnreachable(this.rname, url);
         });
 
@@ -188,7 +191,19 @@ class IdfmRemoteRouter extends RemoteRouter {
             });
         }
 
-        return this.createRouterResponseFromJson(jsonResponse, waypoints[0], waypoints[1]);
+        const routerResponse = this.createRouterResponseFromJson(jsonResponse, waypoints[0], waypoints[1]);
+
+        const sameModeFound = routerResponse.itineraries.some((itinerary) => itinerary.legs.every((leg) => leg.mode === mode));
+        if (!sameModeFound) {
+            return new RouterResponse({
+                routerName: this.rname,
+                from: waypoints[0],
+                to: waypoints[1],
+                error: 'Selected mode of transport was not found for this itinerary.'
+            });
+        }
+        
+        return routerResponse;
     }
 
     getURL(endpointUrl: string, mode: RoutingMode, waypoints: Coordinates[], options: RemoteRouterOptions) {

package/src/wemap-multi/WemapMultiRouter.ts

@@ -115,13 +115,17 @@ class WemapMultiRouter {
                 throw Error(`Cannot handle this itineraries, because two points are on different maps (${mapOfThisWaypoint} and ${mapOfWaypoints}). ` +
                     `Multi-map multiple destinations are not implemented.`)
             }
-            return mapOfThisWaypoint
+            return mapOfThisWaypoint || map
         }, null as CustomNetworkMap | null);
 
+        if (mapOfWaypoints === null) {
+            throw Error(`No map found for this itineraries.`)
+        }
+
         // Create WemapOsmRouterOptions from WemapMultiRouterOptions
         const wemapOsmRouterOptions = this.convertOptionsToWemapOsmOptions(options);
 
-        const itineraries = mapOfWaypoints!.getItinerariesMultipleDestinationsInsideMap(start, ends, wemapOsmRouterOptions);
+        const itineraries = mapOfWaypoints.getItinerariesMultipleDestinationsInsideMap(start, ends, wemapOsmRouterOptions);
 
         return {
             routerName: this.rname,