@wemap/routers 12.7.3 → 12.7.4

package/dist/index.js

@@ -296,7 +296,7 @@ Vertices
 function getDurationFromLength(length, speed = 5) {
   return length / (speed * 1e3 / 3600);
 }
-function isTransitModePublicTransport(routingMode) {
+function isTransitModePublicTransport(transitMode) {
   return [
     "AIRPLANE",
     "BOAT",
@@ -304,9 +304,13 @@ function isTransitModePublicTransport(routingMode) {
     "FERRY",
     "FUNICULAR",
     "METRO",
+    "MULTI",
     "TRAIN",
     "TRAM"
-  ].includes(routingMode);
+  ].includes(transitMode);
+}
+function areTransitAndTravelModeConsistent(transitMode, travelMode) {
+  return transitMode === travelMode || isTransitModePublicTransport(transitMode) && travelMode === "TRANSIT";
 }
 function stepToJson(step) {
   return {
@@ -715,27 +719,24 @@ class Itinerary {
     return this.legs.map((leg) => leg.steps).flat();
   }
   set transitMode(_) {
-    throw new Error("Itinerary.mode cannot be set. They are calculated from Itinerary.legs.");
+    throw new Error("Itinerary.transitMode cannot be set. They are calculated from Itinerary.legs.");
   }
+  // Transit mode will return MULTI if there are several transit modes except WALK
+  // Else it will return the only transit mode
+  // fallback to WALK if no transit mode
   get transitMode() {
     if (!this._transitMode) {
-      let isPublicTransport = false;
-      let isBicycle = false;
-      let isDriving = false;
-      this.legs.forEach((leg) => {
-        isPublicTransport = isPublicTransport || isTransitModePublicTransport(leg.transitMode);
-        isBicycle = isBicycle || leg.transitMode === "BIKE";
-        isDriving = isDriving || leg.transitMode === "CAR";
-      });
-      if (isPublicTransport) {
+      const legTransitModes = new Set(this.legs.map((leg) => leg.transitMode));
+      legTransitModes.delete("WALK");
+      if (legTransitModes.size > 1) {
         this._transitMode = "MULTI";
-      } else if (isDriving) {
-        this._transitMode = "CAR";
-      } else if (isBicycle) {
-        this._transitMode = "BIKE";
-      } else {
-        this._transitMode = "WALK";
+        return this._transitMode;
+      }
+      if (legTransitModes.size === 1) {
+        this._transitMode = legTransitModes.values().next().value;
+        return this._transitMode;
       }
+      this._transitMode = "WALK";
     }
     return this._transitMode;
   }
@@ -3302,7 +3303,7 @@ class IdfmRemoteRouter extends RemoteRouter {
       throw RemoteRoutingError.notFound(this.rname, jsonResponse.error.message);
     }
     const itineraries = this.parseResponse(jsonResponse);
-    const sameModeFound = itineraries.some((itinerary) => itinerary.transitMode === routerRequest.travelMode);
+    const sameModeFound = itineraries.some((itinerary) => areTransitAndTravelModeConsistent(itinerary.transitMode, routerRequest.travelMode));
     if (!sameModeFound) {
       throw RemoteRoutingError.notFound(
         this.rname,
@@ -4542,6 +4543,7 @@ exports.Vertex = Vertex;
 exports.WemapMultiRemoteRouter = WemapMultiRemoteRouter$1;
 exports.WemapMultiRouter = WemapMultiRouter;
 exports.WemapMultiRoutingError = WemapMultiRoutingError;
+exports.areTransitAndTravelModeConsistent = areTransitAndTravelModeConsistent;
 exports.getDurationFromLength = getDurationFromLength;
 exports.routerRequestToJson = routerRequestToJson;
 //# sourceMappingURL=index.js.map