@wemap/routers 11.1.0 → 11.2.0

package/dist/index.js

@@ -1233,8 +1233,8 @@ class IdfmRemoteRouter extends RemoteRouter {
   get rname() {
     return "idfm";
   }
-  async getItineraries(endpointUrl, mode, waypoints) {
-    const url = this.getURL(endpointUrl, mode, waypoints);
+  async getItineraries(endpointUrl, mode, waypoints, options = {}) {
+    const url = this.getURL(endpointUrl, mode, waypoints, options);
     const res = await fetch(url, {
       method: "GET",
       headers: { apiKey }
@@ -1254,43 +1254,65 @@ class IdfmRemoteRouter extends RemoteRouter {
     }
     return this.createRouterResponseFromJson(jsonResponse, waypoints[0], waypoints[1]);
   }
-  getURL(endpointUrl, mode, waypoints) {
+  getURL(endpointUrl, mode, waypoints, options) {
     if (waypoints.length > 2) {
       Logger__default.default.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 = 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;
     }
-    return `${url.origin}${url.pathname}${search}${query}`;
+    [coreParams, queryParams].map((params) => {
+      for (const pair of params.entries()) {
+        console.log(pair[0], pair[1]);
+        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";
-    return `&${forbiddenTransport}&${allowCar}`;
+    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 urlSearchParams;
   }
   getWalkingQuery() {
-    const forbiddenTransport = TRANSPORT_IDS.map((id) => `forbidden_uris[]=${id}`).join("&");
-    const allowWalking = "first_section_mode[]=walking&last_section_mode[]=walking";
-    return `&${forbiddenTransport}&${allowWalking}`;
+    const urlSearchParams = new URLSearchParams();
+    TRANSPORT_IDS.forEach((id) => {
+      urlSearchParams.append("forbidden_uris[]", id);
+    });
+    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";
-    return `&${forbiddenTransport}&${allowBike}`;
+    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 urlSearchParams;
   }
   getSectionCoords(section) {
     const from = section.from.stop_point ? jsonToCoordinates$1(section.from.stop_point.coord) : jsonToCoordinates$1(section.from.address.coord);
@@ -1438,7 +1460,8 @@ class OsrmRemoteRouter extends RemoteRouter {
     });
     const from = waypoints[0];
     const to = waypoints[waypoints.length - 1];
-    return this.createRouterResponseFromJson(jsonResponse, from, to);
+    const osrmMode = inputModeCorrespondance$1.get(mode);
+    return this.createRouterResponseFromJson(jsonResponse, from, to, osrmMode);
   }
   getURL(endpointUrl, mode, waypoints) {
     const osrmMode = inputModeCorrespondance$1.get(mode);