@wemap/routers 11.3.2 → 11.4.0

package/dist/index.js

@@ -718,7 +718,7 @@ const buildStepsRules = (graphItinerary) => (currentCoords, nextCoords, previous
   if (edge.data.isElevator) {
     levelChangeType = "elevator";
   } else if (edge.data instanceof osm.OsmWay && edge.data.isConveying && edge.data.areStairs) {
-    levelChangeType = "conveyor";
+    levelChangeType = "escalator";
   } else if (edge.data instanceof osm.OsmWay && edge.data.areStairs) {
     levelChangeType = "stairs";
   } else if (edge.data instanceof osm.OsmWay && edge.data.isConveying) {
@@ -726,20 +726,22 @@ const buildStepsRules = (graphItinerary) => (currentCoords, nextCoords, previous
   }
   let forceLevelChange;
   const edgeTags = edge.data.tags || {};
-  if (edge.data instanceof osm.OsmWay && edge.data.areStairs && ["up", "down"].includes(edgeTags.incline) && !(previousStep == null ? void 0 : previousStep.levelChange)) {
+  if ((edge.data instanceof osm.OsmWay && edge.data.areStairs || edge.data.isElevator) && ["up", "down"].includes(edgeTags.incline) && !(previousStep == null ? void 0 : previousStep.levelChange)) {
     forceLevelChange = edgeTags.incline;
-    for (const n of edge.data.nodes) {
-      if (n !== vertex.data)
-        continue;
-    }
-    const isReversed = edge.data.nodes.reduce((acc, n, idx, arr) => {
-      if (n !== vertex.data)
+    if (edge.data instanceof osm.OsmWay) {
+      for (const n of edge.data.nodes) {
+        if (n !== vertex.data)
+          continue;
+      }
+      const isReversed = edge.data.nodes.reduce((acc, n, idx, arr) => {
+        if (n !== vertex.data)
+          return acc;
+        acc = !(idx + 1 < arr.length && arr[idx + 1] === nextVertex.data);
         return acc;
-      acc = !(idx + 1 < arr.length && arr[idx + 1] === nextVertex.data);
-      return acc;
-    }, null);
-    if (isReversed) {
-      forceLevelChange = forceLevelChange === "up" ? "down" : "up";
+      }, null);
+      if (isReversed) {
+        forceLevelChange = forceLevelChange === "up" ? "down" : "up";
+      }
     }
   }
   const previousEdge = edgeId > 0 && edges.length ? edges[edgeId - 1] : null;
@@ -1473,8 +1475,8 @@ class OsrmRemoteRouter extends RemoteRouter {
   get rname() {
     return "osrm";
   }
-  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).catch(() => {
       throw new RemoteRouterServerUnreachable(this.rname, url);
     });
@@ -1486,11 +1488,14 @@ class OsrmRemoteRouter extends RemoteRouter {
     const osrmMode = inputModeCorrespondance$1.get(mode);
     return this.createRouterResponseFromJson(jsonResponse, from, to, osrmMode);
   }
-  getURL(endpointUrl, mode, waypoints) {
-    const osrmMode = inputModeCorrespondance$1.get(mode);
+  getURL(endpointUrl, mode, waypoints, options = {}) {
+    let osrmMode = inputModeCorrespondance$1.get(mode);
     if (!osrmMode) {
       throw new RoutingModeCorrespondanceNotFound(this.rname, mode);
     }
+    if ("useStairs" in options && !options.useStairs) {
+      osrmMode = "pmr";
+    }
     let url = endpointUrl + "/route/v1/" + osrmMode + "/";
     url += waypoints.map((waypoint) => [waypoint.longitude + "," + waypoint.latitude]).join(";");
     url += "?geometries=geojson&overview=full&steps=true";
@@ -1928,7 +1933,7 @@ class WemapMultiRouter {
     const ioMapsToTest = this.getIoMapsFromOptions(options);
     if (!ioMapsToTest.length) {
       try {
-        return await RemoteRouterManager$1.getItinerariesWithFallback(remoteRouters2, mode, waypoints);
+        return await RemoteRouterManager$1.getItinerariesWithFallback(remoteRouters2, mode, waypoints, options || void 0);
       } catch (e) {
         if (!isRoutingError(e)) {
           throw e;
@@ -1958,7 +1963,7 @@ class WemapMultiRouter {
     let remoteRouterResponse;
     if (!mapWithStart && !mapWithEnd) {
       try {
-        return await RemoteRouterManager$1.getItinerariesWithFallback(remoteRouters2, mode, waypoints);
+        return await RemoteRouterManager$1.getItinerariesWithFallback(remoteRouters2, mode, waypoints, options || void 0);
       } catch (e) {
         if (!isRoutingError(e)) {
           throw e;
@@ -1978,7 +1983,8 @@ class WemapMultiRouter {
         remoteRouterResponse = await RemoteRouterManager$1.getItinerariesWithFallback(
           remoteRouters2,
           mode,
-          [ioMapItinerary.to, end]
+          [ioMapItinerary.to, end],
+          options || void 0
         );
         if (!remoteRouterResponse.itineraries.length) {
           throw new geo.NoRouteFoundError(ioMapItinerary.to, end, remoteRouterResponse.error);
@@ -2007,7 +2013,8 @@ class WemapMultiRouter {
         remoteRouterResponse = await RemoteRouterManager$1.getItinerariesWithFallback(
           remoteRouters2,
           mode,
-          [start, ioMapItinerary.from]
+          [start, ioMapItinerary.from],
+          options || void 0
         );
         if (!remoteRouterResponse.itineraries.length) {
           throw new geo.NoRouteFoundError(start, ioMapItinerary.from, remoteRouterResponse.error);
@@ -2045,7 +2052,8 @@ class WemapMultiRouter {
         remoteRouterResponse = await RemoteRouterManager$1.getItinerariesWithFallback(
           remoteRouters2,
           mode,
-          [ioMapItinerary1.to, ioMapItinerary2.from]
+          [ioMapItinerary1.to, ioMapItinerary2.from],
+          options || void 0
         );
         if (!remoteRouterResponse.itineraries.length) {
           throw new geo.NoRouteFoundError(ioMapItinerary1.to, ioMapItinerary2.from, remoteRouterResponse.error);