@wemap/routers 11.1.1 → 11.2.1

package/package.json

@@ -12,7 +12,7 @@
         "directory": "packages/routers"
     },
     "name": "@wemap/routers",
-    "version": "11.1.1",
+    "version": "11.2.1",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -52,5 +52,5 @@
         },
         "./helpers/*": "./helpers/*"
     },
-    "gitHead": "1fe2ac803a61d5cdb1e3f26185aaeb431bfb482f"
+    "gitHead": "e8ba0bc0c26f2167896f7c5ce4b0ebfd39aa2f13"
 }

package/src/remote/idfm/IdfmRemoteRouter.ts

@@ -10,6 +10,7 @@ import RemoteRouter from '../RemoteRouter.js';
 import RemoteRouterServerUnreachable from '../RemoteRouterServerUnreachable.js';
 import { RoutingMode } from '../../model/RoutingMode.js';
 import { MinStepInfo } from '../../model/Step.js';
+import { RemoteRouterOptions } from '../RemoteRouterOptions.js';
 
 type IdfmCoordinates = { lat: number, lon: number };
 type IdfmSection = {
@@ -160,8 +161,8 @@ class IdfmRemoteRouter extends RemoteRouter {
      * @throws {IdfmRemoteRouterTokenError}
      * @throws {RemoteRouterServerUnreachable}
      */
-    async getItineraries(endpointUrl: string, mode: RoutingMode, waypoints: Coordinates[]) {
-        const url = this.getURL(endpointUrl, mode, waypoints);
+    async getItineraries(endpointUrl: string, mode: RoutingMode, waypoints: Coordinates[], options: RemoteRouterOptions = {}) {
+        const url = this.getURL(endpointUrl, mode, waypoints, options);
 
         const res = await (fetch(url, {
             method: 'GET',
@@ -190,56 +191,85 @@ class IdfmRemoteRouter extends RemoteRouter {
         return this.createRouterResponseFromJson(jsonResponse, waypoints[0], waypoints[1]);
     }
 
-    getURL(endpointUrl: string, mode: RoutingMode, waypoints: Coordinates[]) {
+    getURL(endpointUrl: string, mode: RoutingMode, waypoints: Coordinates[], options: RemoteRouterOptions) {
 
         if (waypoints.length > 2) {
             Logger.warn(`${this.rname} router uses only the first 2 waypoints (asked ${waypoints.length})`);
         }
 
-        const fromPlace = `from=${waypoints[0].longitude};${waypoints[0].latitude}`;
-        const toPlace = `to=${waypoints[1].longitude};${waypoints[1].latitude}`;
-
         const url = new URL(endpointUrl);
-        let { search } = url;
-        search = (search ? `${search}&` : '?') + `${fromPlace}&${toPlace}`;
 
-        let query = '';
+        const coreParams = new URLSearchParams();
+        coreParams.set('from', `${waypoints[0].longitude};${waypoints[0].latitude}`);
+        coreParams.set('to', `${waypoints[1].longitude};${waypoints[1].latitude}`);
+
+        if ('useStairs' in options && !options.useStairs) {
+            coreParams.set('wheelchair', 'true')
+        }
+
+        let queryParams: URLSearchParams = new URLSearchParams();
         switch (mode) {
             case 'WALK':
-                query = this.getWalkingQuery();
+                queryParams = this.getWalkingQuery();
                 break;
             case 'BIKE':
-                query = this.getBikeQuery();
+                queryParams = this.getBikeQuery();
                 break;
             case 'CAR':
-                query = this.getCarQuery();
+                queryParams = this.getCarQuery();
                 break;
             default:
                 break;
         }
 
-        return `${url.origin}${url.pathname}${search}${query}`;
+        [coreParams, queryParams].map(params => {
+            for (const pair of params.entries()) {
+                url.searchParams.append(pair[0], pair[1]);
+            }
+        });
+
+        return url.toString();
     }
 
     getCarQuery() {
-        const forbiddenTransport = TRANSPORT_IDS.map((id) => `forbidden_uris[]=${id}`).join('&');
-        const allowCar = 'first_section_mode[]=walking&first_section_mode[]=car&last_section_mode[]=walking&last_section_mode[]=car';
+        const urlSearchParams = new URLSearchParams();
+
+        TRANSPORT_IDS.forEach((id) => {
+            urlSearchParams.append('forbidden_uris[]', id);
+        });
+
+        urlSearchParams.append('first_section_mode[]', 'walking');
+        urlSearchParams.append('first_section_mode[]', 'car');
+        urlSearchParams.append('last_section_mode[]', 'walking');
+        urlSearchParams.append('last_section_mode[]', 'car');
 
-        return `&${forbiddenTransport}&${allowCar}`;
+        return urlSearchParams;
     }
 
     getWalkingQuery() {
-        const forbiddenTransport = TRANSPORT_IDS.map((id) => `forbidden_uris[]=${id}`).join('&');
-        const allowWalking = 'first_section_mode[]=walking&last_section_mode[]=walking';
+        const urlSearchParams = new URLSearchParams();
+
+        TRANSPORT_IDS.forEach((id) => {
+            urlSearchParams.append('forbidden_uris[]', id);
+        });
 
-        return `&${forbiddenTransport}&${allowWalking}`;
+        urlSearchParams.append('first_section_mode[]', 'walking');
+        urlSearchParams.append('last_section_mode[]', 'walking');
+
+        return urlSearchParams;
     }
 
     getBikeQuery() {
-        const forbiddenTransport = TRANSPORT_IDS.map((id) => `forbidden_uris[]=${id}`).join('&');
-        const allowBike = 'first_section_mode[]=bike&last_section_mode[]=bike';
+        const urlSearchParams = new URLSearchParams();
+
+        TRANSPORT_IDS.forEach((id) => {
+            urlSearchParams.append('forbidden_uris[]', id);
+        });
+
+        urlSearchParams.append('first_section_mode[]', 'bike');
+        urlSearchParams.append('last_section_mode[]', 'bike');
 
-        return `&${forbiddenTransport}&${allowBike}`;
+        return urlSearchParams;
     }