@wemap/routers 7.2.2 → 7.3.0

package/package.json

@@ -11,7 +11,7 @@
         "directory": "packages/routers"
     },
     "name": "@wemap/routers",
-    "version": "7.2.2",
+    "version": "7.3.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.2.1",
+        "@wemap/geo": "^7.3.0",
         "@wemap/logger": "^7.0.0",
         "@wemap/maths": "^7.0.0",
-        "@wemap/osm": "^7.2.1"
+        "@wemap/osm": "^7.3.0"
     },
-    "gitHead": "5ce542abeeef3e58f5e3c3afaadc435ea0ceff17"
+    "gitHead": "c79062ac53248f45aead5d4edd45b3efbc79755e"
 }

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,23 +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
         // or a 200 with an error message
-        if (response && response.error) {
+        if (jsonResponse && jsonResponse.error) {
             const routerResponse = new RouterResponse();
             routerResponse.routerName = this.rname;
             routerResponse.from = waypoints[0];
             routerResponse.to = waypoints[1];
-            routerResponse.error = response.error.message || 'no details.';
+            routerResponse.error = jsonResponse.error.message || 'no details.';
             return routerResponse;
         }
 
-        return this.createRouterResponseFromJson(response);
+        return this.createRouterResponseFromJson(jsonResponse);
     }
 
     /**

package/src/remote/osrm/OsrmRemoteRouter.js

@@ -44,12 +44,16 @@ 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();
-        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/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;
     }