@wemap/routers 7.2.1 → 7.2.3

package/package.json

@@ -11,7 +11,7 @@
         "directory": "packages/routers"
     },
     "name": "@wemap/routers",
-    "version": "7.2.1",
+    "version": "7.2.3",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -34,5 +34,5 @@
         "@wemap/maths": "^7.0.0",
         "@wemap/osm": "^7.2.1"
     },
-    "gitHead": "64528ea2d1a6384ca0d33a794975960c38f25fe0"
+    "gitHead": "a80867c434ebd266c2955a61dd2c662f1728aa3d"
 }

package/src/remote/RemoteRouterOptions.js

@@ -1,6 +1,6 @@
 class RemoteRouterOptions {
 
-    /** @type {boolean} */
+    /** @type {!boolean} */
     useStairs = true;
 
     /**
@@ -16,7 +16,9 @@ class RemoteRouterOptions {
      */
     static fromJson(json) {
         const obj = new RemoteRouterOptions();
-        obj.useStairs = json.useStairs;
+        if ('useStairs' in json) {
+            obj.useStairs = json.useStairs;
+        }
         return obj;
     }
 

package/src/remote/cityway/CitywayRemoteRouter.js

@@ -93,12 +93,14 @@ class CitywayRemoteRouter extends RemoteRouter {
      */
     async getItineraries(endpointUrl, mode, waypoints) {
         const url = this.getURL(endpointUrl, mode, waypoints);
-        const res = await fetch(url);
-        if (res.status !== 200) {
+        const res = await (fetch(url).catch(() => {
             throw new RemoteRouterServerUnreachable(this.rname, url);
-        }
-        const response = await res.json();
-        return this.createRouterResponseFromJson(response);
+        }));
+
+        const jsonResponse = await res.json().catch(() => {
+            throw new RemoteRouterServerUnreachable(this.rname, url);
+        });
+        return this.createRouterResponseFromJson(jsonResponse);
     }
 
 

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

@@ -28,12 +28,14 @@ class DeutscheBahnRemoteRouter extends RemoteRouter {
      */
     async getItineraries(endpointUrl, mode, waypoints) {
         const url = this.getURL(endpointUrl, mode, waypoints);
-        const res = await fetch(url);
-        if (res.status !== 200) {
+        const res = await (fetch(url).catch(() => {
             throw new RemoteRouterServerUnreachable(this.rname, url);
-        }
-        const response = await res.json();
-        return this.createRouterResponseFromJson(response, waypoints[0], waypoints[1]);
+        }));
+
+        const jsonResponse = await res.json().catch(() => {
+            throw new RemoteRouterServerUnreachable(this.rname, url);
+        });
+        return this.createRouterResponseFromJson(jsonResponse, waypoints[0], waypoints[1]);
     }
 
     /**

package/src/remote/idfm/IdfmRemoteRouter.js

@@ -111,31 +111,23 @@ class IdfmRemoteRouter extends RemoteRouter {
         }));
 
 
-        const response = await res.json().catch(() => {
+        const jsonResponse = await res.json().catch(() => {
             throw new RemoteRouterServerUnreachable(this.rname, url);
         });
 
         // When IDFM failed to calculate an itinerary (ie. start or end
         // point is far from network), it respond a 404 with an error message
-        if (res.status === 404) {
-            let errorMessage = 'no details.';
-            if (response && 'error' in response && 'message' in response.error) {
-                errorMessage = response.error.message;
-            }
-
+        // or a 200 with an error message
+        if (jsonResponse && jsonResponse.error) {
             const routerResponse = new RouterResponse();
             routerResponse.routerName = this.rname;
             routerResponse.from = waypoints[0];
             routerResponse.to = waypoints[1];
-            routerResponse.error = errorMessage;
+            routerResponse.error = jsonResponse.error.message || 'no details.';
             return routerResponse;
         }
 
-        if (res.status !== 200) {
-            throw new RemoteRouterServerUnreachable(this.rname, url);
-        }
-
-        return this.createRouterResponseFromJson(response);
+        return this.createRouterResponseFromJson(jsonResponse);
     }
 
     /**
@@ -204,17 +196,17 @@ class IdfmRemoteRouter extends RemoteRouter {
 
         let query = '';
         switch (mode) {
-            case Constants.ROUTING_MODE.WALK:
-                query = this.getWalkingQuery();
-                break;
-            case Constants.ROUTING_MODE.BIKE:
-                query = this.getBikeQuery();
-                break;
-            case Constants.ROUTING_MODE.CAR:
-                query = this.getCarQuery();
-                break;
-            default:
-                break;
+        case Constants.ROUTING_MODE.WALK:
+            query = this.getWalkingQuery();
+            break;
+        case Constants.ROUTING_MODE.BIKE:
+            query = this.getBikeQuery();
+            break;
+        case Constants.ROUTING_MODE.CAR:
+            query = this.getCarQuery();
+            break;
+        default:
+            break;
         }
 
         url = `${url.origin}${url.pathname}${search}${query}`;

package/src/remote/osrm/OsrmRemoteRouter.js

@@ -44,11 +44,15 @@ class OsrmRemoteRouter extends RemoteRouter {
      */
     async getItineraries(endpointUrl, mode, waypoints) {
         const url = this.getURL(endpointUrl, mode, waypoints);
-        const res = await fetch(url);
-        if (res.status !== 200) {
+
+        const res = await (fetch(url).catch(() => {
             throw new RemoteRouterServerUnreachable(this.rname, url);
-        }
-        const response = await res.json();
+        }));
+
+        const response = await res.json().catch(() => {
+            throw new RemoteRouterServerUnreachable(this.rname, url);
+        });
+
         return this.createRouterResponseFromJson(response, waypoints[0], waypoints[1]);
     }
 

package/src/remote/otp/OtpRemoteRouter.js

@@ -43,12 +43,14 @@ class OtpRemoteRouter extends RemoteRouter {
      */
     async getItineraries(endpointUrl, mode, waypoints) {
         const url = this.getURL(endpointUrl, mode, waypoints);
-        const res = await fetch(url);
-        if (res.status !== 200) {
+        const res = await (fetch(url).catch(() => {
             throw new RemoteRouterServerUnreachable(this.rname, url);
-        }
-        const response = await res.json();
-        return this.createRouterResponseFromJson(response);
+        }));
+
+        const jsonResponse = await res.json().catch(() => {
+            throw new RemoteRouterServerUnreachable(this.rname, url);
+        });
+        return this.createRouterResponseFromJson(jsonResponse);
     }
 
     /**

package/src/remote/wemap-meta/WemapMetaRemoteRouter.js

@@ -37,20 +37,22 @@ class WemapMetaRemoteRouter extends RemoteRouter {
         payload.mode = mode;
         payload.options = options;
 
-        const res = await fetch(endpointUrl, {
+        const res = await (fetch(endpointUrl, {
             method: 'POST',
             headers: {
                 'Accept': 'application/json',
                 'Content-Type': 'application/json'
             },
             body: JSON.stringify(payload.toJson())
-        });
+        }).catch(() => {
+            throw new RemoteRouterServerUnreachable(this.rname, endpointUrl);
+        }));
 
-        if (res.status !== 200) {
+        const jsonResponse = await res.json().catch(() => {
             throw new RemoteRouterServerUnreachable(this.rname, endpointUrl);
-        }
-        const response = await res.json();
-        return RouterResponse.fromJson(response);
+        });
+
+        return RouterResponse.fromJson(jsonResponse);
     }
 
 }

package/src/remote/wemap-meta/WemapMetaRemoteRouterOptions.js

@@ -28,8 +28,10 @@ class WemapMetaRemoteRouterOptions extends RemoteRouterOptions {
      */
     static fromJson(json) {
         const obj = new WemapMetaRemoteRouterOptions();
-        obj.useStairs = json.useStairs;
-        obj.remoteRouters = json.remoteRouters;
+        if ('useStairs' in json) {
+            obj.useStairs = json.useStairs;
+        }
+        obj.remoteRouters = json.remoteRouters ? json.remoteRouters : [];
         obj.targetMaps = json.targetMaps ? json.targetMaps : null;
         return obj;
     }