@wemap/routers 13.1.1 → 13.2.0

package/dist/index.mjs

@@ -2392,7 +2392,9 @@ const SURFACE_FACTORS = {
     asphalt: 1,
     // Smooth, ideal surface
     concrete: 1,
-    // Equally good as asphalt
+    // Equally good as asphalt, but slightly slower
+    paved: 1,
+    // Paved surface - ideal for wheelchairs
     paving_stones: 0.8,
     // Slightly slower due to joints/gaps
     compacted: 0.7,
@@ -2413,6 +2415,8 @@ const SURFACE_FACTORS = {
     // Ideal walking surface
     concrete: 1,
     // Equally good as asphalt
+    paved: 1,
+    // Paved surface - ideal for wheelchairs
     paving_stones: 0.9,
     // Slightly slower but good for walking
     compacted: 0.8,
@@ -3123,6 +3127,10 @@ class CitywayRemoteRouter extends RemoteRouter {
     const toPlace = `ArrivalLatitude=${destination.latitude}&ArrivalLongitude=${destination.longitude}`;
     const queryMode = `TripModes=${citywayMode}`;
     const url = new URL(endpointUrl);
+    if (routerRequest.departureTime) {
+      url.searchParams.set("Date", routerRequest.departureTime);
+      url.searchParams.set("TypeDate", "Departure");
+    }
     let { search } = url;
     search = (search ? `${search}&` : "?") + `${fromPlace}&${toPlace}&${queryMode}`;
     return `${url.origin}${url.pathname}${search}`;
@@ -3917,6 +3925,10 @@ class IdfmRemoteRouter extends RemoteRouter {
     if ((_a = routerRequest.itineraryModifiers) == null ? void 0 : _a.isWheelchair) {
       coreParams.set("wheelchair", "true");
     }
+    if (routerRequest.departureTime) {
+      coreParams.set("datetime", routerRequest.departureTime);
+      coreParams.set("datetime_represents", "departure");
+    }
     let queryParams = new URLSearchParams();
     switch (travelMode) {
       case "WALK":
@@ -4535,6 +4547,7 @@ class WemapMultiRemoteRouter extends RemoteRouter {
   }
 }
 const WemapMultiRemoteRouter$1 = new WemapMultiRemoteRouter();
+const OsrmEndpointUrl = "https://routing-osrm.getwemap.com";
 class TictactripRemoteRouter extends RemoteRouter {
   /**
    * @override
@@ -4542,6 +4555,38 @@ class TictactripRemoteRouter extends RemoteRouter {
   get rname() {
     return "tictactrip";
   }
+  async getSegmentItinerary(origin, destination) {
+    const duration = getDurationFromLength(origin.distanceTo(destination));
+    if (duration < 5 * 60) {
+      return null;
+    }
+    let itinerary = null;
+    if (duration < 30 * 60) {
+      itinerary = (await OsrmRemoteRouter$1.getItineraries(OsrmEndpointUrl, {
+        origin,
+        destination,
+        travelMode: "WALK",
+        provideItineraryAlternatives: false,
+        optimizeWaypoints: false
+      }))[0];
+    } else {
+      itinerary = (await OsrmRemoteRouter$1.getItineraries(OsrmEndpointUrl, {
+        origin,
+        destination,
+        travelMode: "CAR",
+        provideItineraryAlternatives: false,
+        optimizeWaypoints: false
+      }))[0];
+    }
+    return itinerary;
+  }
+  getItineraryFromStation(origin, destination) {
+    return OsrmRemoteRouter$1.getItineraries(OsrmEndpointUrl, {
+      origin,
+      destination,
+      travelMode: "WALK"
+    });
+  }
   async getItineraries(endpointUrl, routerRequest) {
     const bodyParams = this.getBodyParams(routerRequest);
     const url = new URL(endpointUrl);
@@ -4557,7 +4602,7 @@ class TictactripRemoteRouter extends RemoteRouter {
     const jsonResponse = await res.json().catch(() => {
       throw RemoteRoutingError.responseNotParsing(this.rname, url.toString());
     });
-    const itineraries = this.parseResponse(jsonResponse);
+    const itineraries = await this.parseResponse(jsonResponse, routerRequest);
     return itineraries;
   }
   getBodyParams(routerRequest) {
@@ -4571,14 +4616,15 @@ class TictactripRemoteRouter extends RemoteRouter {
         latitude: destination.lat,
         longitude: destination.lng
       },
-      outbound_date: (/* @__PURE__ */ new Date()).toISOString(),
+      outbound_date: routerRequest.departureTime || (/* @__PURE__ */ new Date()).toISOString(),
       passengers: [{ age: 30 }]
     };
   }
-  parseResponse(json) {
+  async parseResponse(json, routerRequest) {
     if (!json || !json.trips)
       return [];
-    return Object.values(json.trips).map((trip) => {
+    return await Promise.all(Object.values(json.trips).filter((trip) => trip.transportType === "TRAIN").map(async (trip) => {
+      var _a, _b;
       const legs = trip.segments.map((segment) => {
         const transitMode = StringUtils.toUpperCase(segment.transportType);
         const startSection = new Coordinates(segment.origin.latitude, segment.origin.longitude);
@@ -4619,15 +4665,39 @@ class TictactripRemoteRouter extends RemoteRouter {
           steps: stepsBuilder.build()
         });
       });
+      let startItinerary = null;
+      let endItinerary = null;
+      const mergedLegs = [];
+      const firstStation = (_a = trip.segments[0]) == null ? void 0 : _a.origin;
+      if (firstStation) {
+        const firstStationCoords = new Coordinates(firstStation.latitude, firstStation.longitude);
+        const origin = routerRequest.origin;
+        startItinerary = await this.getSegmentItinerary(origin, firstStationCoords).catch(() => null);
+        if (startItinerary) {
+          startItinerary.legs[0].start.name = firstStation.name;
+          mergedLegs.push(...startItinerary.legs);
+        }
+      }
+      mergedLegs.push(...legs);
+      const lastStation = (_b = trip.segments[trip.segments.length - 1]) == null ? void 0 : _b.destination;
+      if (lastStation) {
+        const lastStationCoords = new Coordinates(lastStation.latitude, lastStation.longitude);
+        const destination = routerRequest.destination;
+        endItinerary = await this.getSegmentItinerary(lastStationCoords, destination).catch(() => null);
+        if (endItinerary) {
+          endItinerary.legs[endItinerary.legs.length - 1].end.name = lastStation.name;
+          mergedLegs.push(...endItinerary.legs);
+        }
+      }
       return new Itinerary({
         origin: new Coordinates(trip.origin.latitude, trip.origin.longitude),
         destination: new Coordinates(trip.destination.latitude, trip.destination.longitude),
         duration: trip.durationMinutes * 60,
         startTime: new Date(trip.departureLocalISO).getTime(),
         endTime: new Date(trip.arrivalLocalISO).getTime(),
-        legs
+        legs: mergedLegs
       });
-    });
+    }));
   }
 }
 const TictactripRemoteRouter$1 = new TictactripRemoteRouter();