@wemap/routers 12.0.0-alpha.2 → 12.0.0-alpha.3

package/dist/index.js

@@ -1528,8 +1528,8 @@ class CitywayRemoteRouter extends RemoteRouter {
    * @throws {transitModeCorrespondanceNotFound}
    * @throws {RemoteRouterServerUnreachable}
    */
-  async getItineraries(endpointUrl, mode, waypoints) {
-    const url = this.getURL(endpointUrl, mode, waypoints);
+  async getItineraries(endpointUrl, travelMode, travelModePreference, waypoints) {
+    const url = this.getURL(endpointUrl, travelMode, waypoints);
     const res = await fetch(url).catch(() => {
       throw new RemoteRouterServerUnreachable(this.rname, url);
     });
@@ -1714,8 +1714,8 @@ class DeutscheBahnRemoteRouter extends RemoteRouter {
    * @override
    * @throws {RemoteRouterServerUnreachable}
    */
-  async getItineraries(endpointUrl, mode, waypoints) {
-    const url = this.getURL(endpointUrl, mode, waypoints);
+  async getItineraries(endpointUrl, travelMode, travelModePreference, waypoints) {
+    const url = this.getURL(endpointUrl, travelMode, waypoints);
     const res = await fetch(url).catch(() => {
       throw new RemoteRouterServerUnreachable(this.rname, url);
     });
@@ -1834,8 +1834,8 @@ class IdfmRemoteRouter extends RemoteRouter {
    * @throws {IdfmRemoteRouterTokenError}
    * @throws {RemoteRouterServerUnreachable}
    */
-  async getItineraries(endpointUrl, mode, waypoints, options = {}) {
-    const url = this.getURL(endpointUrl, mode, waypoints, options);
+  async getItineraries(endpointUrl, travelMode, travelModePreference, waypoints, options = {}) {
+    const url = this.getURL(endpointUrl, travelMode, waypoints, options);
     const res = await fetch(url, {
       method: "GET",
       headers: { apiKey }
@@ -1854,7 +1854,7 @@ class IdfmRemoteRouter extends RemoteRouter {
       });
     }
     const routerResponse = this.createRouterResponseFromJson(jsonResponse, waypoints[0], waypoints[1]);
-    const sameModeFound = routerResponse.itineraries.some((itinerary) => itinerary.mode === mode);
+    const sameModeFound = routerResponse.itineraries.some((itinerary) => itinerary.mode === travelMode);
     if (!sameModeFound) {
       return new RouterResponse({
         routerName: this.rname,
@@ -2062,18 +2062,26 @@ class TravelModeCorrespondanceNotFound extends Error {
     this.transitMode = transitMode;
   }
 }
-const inputModeCorrespondance$1 = /* @__PURE__ */ new Map();
-inputModeCorrespondance$1.set("CAR", "driving");
-inputModeCorrespondance$1.set("WALK", "walking");
-inputModeCorrespondance$1.set("BIKE", "bike-safest");
-inputModeCorrespondance$1.set("BIKE-SAFEST", "bike-safest");
-inputModeCorrespondance$1.set("BIKE-FASTEST", "bike-fastest");
+const inputModeCorrespondance$1 = (travelMode, preference) => {
+  if (travelMode === "WALK")
+    return "walking";
+  if (travelMode === "BIKE") {
+    if (preference === "FASTEST")
+      return "bike-fastest";
+    if (preference === "SAFEST")
+      return "bike-safest";
+    if (preference === "TOURISM")
+      return "bike-safest";
+    return "bike-safest";
+  }
+  if (travelMode === "CAR")
+    return "driving";
+  throw new TravelModeCorrespondanceNotFound("osrm", travelMode);
+};
 const outputModeCorrespondance = /* @__PURE__ */ new Map();
 outputModeCorrespondance.set("driving", "CAR");
 outputModeCorrespondance.set("walking", "WALK");
-outputModeCorrespondance.set("bike-safest", "BIKE");
-outputModeCorrespondance.set("bike-safest", "BIKE");
-outputModeCorrespondance.set("bike-fastest", "BIKE");
+outputModeCorrespondance.set("bike", "BIKE");
 class OsrmRemoteRouter extends RemoteRouter {
   /**
    * @override
@@ -2085,8 +2093,8 @@ class OsrmRemoteRouter extends RemoteRouter {
    * @throws {RemoteRouterServerUnreachable}
    * @throws {TravelModeCorrespondanceNotFound}
    */
-  async getItineraries(endpointUrl, mode, waypoints, options = {}) {
-    const url = this.getURL(endpointUrl, mode, waypoints, options);
+  async getItineraries(endpointUrl, travelMode, travelModePreference, waypoints, options = {}) {
+    const url = this.getURL(endpointUrl, travelMode, travelModePreference, waypoints, options);
     const res = await fetch(url).catch(() => {
       throw new RemoteRouterServerUnreachable(this.rname, url);
     });
@@ -2095,17 +2103,14 @@ class OsrmRemoteRouter extends RemoteRouter {
     });
     const from = waypoints[0];
     const to = waypoints[waypoints.length - 1];
-    const osrmMode = inputModeCorrespondance$1.get(mode);
+    const osrmMode = inputModeCorrespondance$1(travelMode, travelModePreference);
     return this.createRouterResponseFromJson(jsonResponse, from, to, osrmMode);
   }
   /**
    * @throws {TravelModeCorrespondanceNotFound}
    */
-  getURL(endpointUrl, mode, waypoints, options = {}) {
-    let osrmMode = inputModeCorrespondance$1.get(mode);
-    if (!osrmMode) {
-      throw new TravelModeCorrespondanceNotFound(this.rname, mode);
-    }
+  getURL(endpointUrl, travelMode, travelModePreference, waypoints, options = {}) {
+    let osrmMode = inputModeCorrespondance$1(travelMode, travelModePreference);
     if ("useStairs" in options && !options.useStairs) {
       osrmMode = "pmr";
     }
@@ -2293,8 +2298,8 @@ class OtpRemoteRouter extends RemoteRouter {
    * @throws {RemoteRouterServerUnreachable}
    * @throws {TravelModeCorrespondanceNotFound}
    */
-  async getItineraries(endpointUrl, mode, waypoints) {
-    const url = this.getURL(endpointUrl, mode, waypoints);
+  async getItineraries(endpointUrl, travelMode, travelModePreference, waypoints) {
+    const url = this.getURL(endpointUrl, travelMode, waypoints);
     const res = await fetch(url).catch(() => {
       throw new RemoteRouterServerUnreachable(this.rname, url);
     });
@@ -2423,10 +2428,10 @@ class WemapMultiRemoteRouter extends RemoteRouter {
   get rname() {
     return "wemap-multi";
   }
-  async getItineraries(endpointUrl, mode, waypoints, options) {
+  async getItineraries(endpointUrl, travelMode, travelModePreference, waypoints, options) {
     const payload = new WemapMultiRemoteRouterPayload(
       waypoints,
-      mode,
+      travelMode,
       options
     );
     const res = await fetch(endpointUrl, {
@@ -2463,22 +2468,22 @@ class RemoteRouterManager {
    * @throws {TravelModeCorrespondanceNotFound}
    * @throws {IdfmRemoteRouterTokenError}
    */
-  async getItineraries(name, endpointUrl, mode, waypoints, options) {
+  async getItineraries(name, endpointUrl, travelMode, travelModePreference, waypoints, options) {
     const router = this.getRouterByName(name);
     if (!router) {
       throw new Error(`Unknown "${name}" remote router`);
     }
-    return router.getItineraries(endpointUrl, mode, waypoints, options);
+    return router.getItineraries(endpointUrl, travelMode, travelModePreference, waypoints, options);
   }
   /**
    * @throws {RemoteRouterServerUnreachable}
    * @throws {TravelModeCorrespondanceNotFound}
    * @throws {IdfmRemoteRouterTokenError}
    */
-  async getItinerariesWithFallback(remoteRouters2, mode, waypoints, options) {
+  async getItinerariesWithFallback(remoteRouters2, travelMode, travelModePreference, waypoints, options) {
     let routerResponse;
     for (const { name, endpointUrl } of remoteRouters2) {
-      routerResponse = await this.getItineraries(name, endpointUrl, mode, waypoints, options);
+      routerResponse = await this.getItineraries(name, endpointUrl, travelMode, travelModePreference, waypoints, options);
       if (routerResponse.itineraries.length) {
         return routerResponse;
       }
@@ -2577,7 +2582,7 @@ class WemapMultiRouter {
       itineraries: ends.map((end) => Itinerary.fromGraphRoute(routes.route(end)))
     };
   }
-  async getItineraries(mode, waypoints, options = null) {
+  async getItineraries(travelMode, travelModePreference, waypoints, options = null) {
     var _a;
     if (waypoints.length > 2) {
       Logger.warn(`WemapMultiRouter uses only the first 2 waypoints (asked ${waypoints.length})`);
@@ -2593,7 +2598,7 @@ class WemapMultiRouter {
     const ioMapsToTest = this.getIoMapsFromOptions(options);
     if (!ioMapsToTest.length) {
       try {
-        return await RemoteRouterManager$1.getItinerariesWithFallback(remoteRouters2, mode, waypoints, options || void 0);
+        return await RemoteRouterManager$1.getItinerariesWithFallback(remoteRouters2, travelMode, travelModePreference, waypoints, options || void 0);
       } catch (e) {
         if (!isRoutingError(e)) {
           throw e;
@@ -2624,7 +2629,7 @@ class WemapMultiRouter {
     let remoteRouterResponse;
     if (!mapWithStart && !mapWithEnd) {
       try {
-        return await RemoteRouterManager$1.getItinerariesWithFallback(remoteRouters2, mode, waypoints, options || void 0);
+        return await RemoteRouterManager$1.getItinerariesWithFallback(remoteRouters2, travelMode, travelModePreference, waypoints, options || void 0);
       } catch (e) {
         if (!isRoutingError(e)) {
           throw e;
@@ -2643,7 +2648,8 @@ class WemapMultiRouter {
         ioMapRoute = mapWithStart.getBestRouteFromStartToEntryPoints(start, end, routerOptions);
         remoteRouterResponse = await RemoteRouterManager$1.getItinerariesWithFallback(
           remoteRouters2,
-          mode,
+          travelMode,
+          travelModePreference,
           [ioMapRoute.end, end],
           options || void 0
         );
@@ -2674,7 +2680,8 @@ class WemapMultiRouter {
         ioMapRoute = mapWithEnd.getBestRouteFromEntryPointsToEnd(start, end, routerOptions);
         remoteRouterResponse = await RemoteRouterManager$1.getItinerariesWithFallback(
           remoteRouters2,
-          mode,
+          travelMode,
+          travelModePreference,
           [start, ioMapRoute.start],
           options || void 0
         );
@@ -2714,7 +2721,8 @@ class WemapMultiRouter {
         ioMapRoute2 = mapWithEnd.getBestRouteFromEntryPointsToEnd(start, end, routerOptions);
         remoteRouterResponse = await RemoteRouterManager$1.getItinerariesWithFallback(
           remoteRouters2,
-          mode,
+          travelMode,
+          travelModePreference,
           [ioMapRoute1.end, ioMapRoute2.start],
           options || void 0
         );