@wemap/routers 11.2.4 → 11.3.1

package/dist/index.js

@@ -700,28 +700,6 @@ const _OsmGraph = class extends geo.GeoGraph {
 let OsmGraph = _OsmGraph;
 __publicField(OsmGraph, "HIGHWAYS_PEDESTRIANS", HIGHWAYS_PEDESTRIANS);
 __publicField(OsmGraph, "DEFAULT_WAY_SELECTOR", DEFAULT_WAY_SELECTOR);
-const DEFAULT_OPTIONS = Object.assign({}, geo.GeoGraphRouter.DEFAULT_OPTIONS, {
-  weightEdgeFn: (edge) => {
-    if (edge.data.isElevator) {
-      return 90;
-    }
-    let duration = getDurationFromLength(edge.length, 4);
-    if (edge.data instanceof osm.OsmWay && edge.data.areStairs) {
-      duration *= 3;
-    }
-    return duration;
-  },
-  acceptEdgeFn: (edge) => {
-    const accessTag = edge.data.tags.access;
-    return typeof accessTag === "undefined" || accessTag === "yes";
-  }
-});
-const WITHOUT_STAIRS_OPTIONS = Object.assign({}, DEFAULT_OPTIONS, {
-  acceptEdgeFn: (edge) => edge.data.tags.highway !== "steps"
-});
-const DEFAULT_TRIP_OPTIONS = Object.assign({}, {
-  tspTempCoeff: 0.99
-}, geo.GeoGraphRouter.DEFAULT_OPTIONS);
 const buildStepsRules = (graphItinerary) => (currentCoords, nextCoords, previousStep) => {
   var _a, _b, _c, _d, _e;
   const edges = graphItinerary.edges;
@@ -739,10 +717,12 @@ const buildStepsRules = (graphItinerary) => (currentCoords, nextCoords, previous
   let levelChangeType = null;
   if (edge.data.isElevator) {
     levelChangeType = "elevator";
-  } else if (edge.data.isConveying) {
+  } else if (edge.data instanceof osm.OsmWay && edge.data.isConveying && edge.data.areStairs) {
     levelChangeType = "conveyor";
   } else if (edge.data instanceof osm.OsmWay && edge.data.areStairs) {
     levelChangeType = "stairs";
+  } else if (edge.data instanceof osm.OsmWay && edge.data.isConveying) {
+    levelChangeType = "moving walkway";
   }
   let forceLevelChange;
   const edgeTags = edge.data.tags || {};
@@ -782,17 +762,17 @@ const buildStepsRules = (graphItinerary) => (currentCoords, nextCoords, previous
     ...forceEndOfLevelChange && { forceEndOfLevelChange }
   };
 };
-class WemapOsmRouter extends geo.GeoGraphRouter {
+const _WemapOsmRouter = class extends geo.GeoGraphRouter {
   constructor(graph) {
     super(graph);
   }
   static get rname() {
     return "wemap-osm";
   }
-  getShortestPath(start, end, options = DEFAULT_OPTIONS) {
+  getShortestPath(start, end, options = _WemapOsmRouter.DEFAULT_OPTIONS) {
     return super.getShortestPath(start, end, options);
   }
-  getItinerary(start, end, options = DEFAULT_OPTIONS) {
+  getItinerary(start, end, options = _WemapOsmRouter.DEFAULT_OPTIONS) {
     const graphItinerary = this.getShortestPath(start, end, options);
     return Itinerary.fromGraphItinerary(graphItinerary, "WALK", buildStepsRules(graphItinerary));
   }
@@ -812,7 +792,7 @@ class WemapOsmRouter extends geo.GeoGraphRouter {
     }
     return { direction, directionExtra };
   }
-  getShortestTrip(waypoints, options = DEFAULT_TRIP_OPTIONS) {
+  getShortestTrip(waypoints, options = _WemapOsmRouter.DEFAULT_TRIP_OPTIONS) {
     const points = waypoints.map((waypoint) => {
       const point = new salesman__default.default.Point(0, 0);
       point.coords = waypoint;
@@ -846,7 +826,7 @@ class WemapOsmRouter extends geo.GeoGraphRouter {
     }
     return orderedItineraries;
   }
-  getTripItinerary(waypoints, options = DEFAULT_TRIP_OPTIONS) {
+  getTripItinerary(waypoints, options = _WemapOsmRouter.DEFAULT_TRIP_OPTIONS) {
     const shortestTrip = this.getShortestTrip(waypoints, options);
     return new Itinerary({
       from: shortestTrip[0].start,
@@ -854,9 +834,49 @@ class WemapOsmRouter extends geo.GeoGraphRouter {
       legs: shortestTrip.map((graphItinerary) => Leg.fromGraphItinerary(graphItinerary))
     });
   }
-}
-__publicField(WemapOsmRouter, "DEFAULT_OPTIONS", DEFAULT_OPTIONS);
-__publicField(WemapOsmRouter, "WITHOUT_STAIRS_OPTIONS", WITHOUT_STAIRS_OPTIONS);
+  static buildOptions(options) {
+    const weightEdgeFn = (edge) => {
+      var _a;
+      if ((_a = edge.data) == null ? void 0 : _a.isElevator) {
+        return 90;
+      }
+      let duration = getDurationFromLength(edge.length, 4);
+      if (edge.data instanceof osm.OsmWay && edge.data.areStairs) {
+        duration *= 3;
+      }
+      return duration;
+    };
+    const acceptEdgeFn = (edge) => {
+      var _a, _b, _c;
+      const accessTag = (_b = (_a = edge.data) == null ? void 0 : _a.tags) == null ? void 0 : _b.access;
+      if (typeof accessTag !== "undefined" && accessTag !== "yes")
+        return false;
+      if (typeof (options == null ? void 0 : options.useStairs) !== "undefined" && !(options == null ? void 0 : options.useStairs) && edge.data instanceof osm.OsmWay && edge.data.areStairs && !edge.data.isConveying)
+        return false;
+      if (typeof (options == null ? void 0 : options.useEscalator) !== "undefined" && !(options == null ? void 0 : options.useEscalator) && edge.data instanceof osm.OsmWay && edge.data.areStairs && edge.data.isConveying)
+        return false;
+      if (typeof (options == null ? void 0 : options.useElevator) !== "undefined" && !(options == null ? void 0 : options.useElevator) && ((_c = edge.data) == null ? void 0 : _c.isElevator))
+        return false;
+      return true;
+    };
+    return {
+      weightEdgeFn,
+      acceptEdgeFn,
+      projectionMaxDistance: geo.GeoGraphRouter.DEFAULT_OPTIONS.projectionMaxDistance
+    };
+  }
+  static buildTripOptions(options) {
+    return Object.assign(
+      {},
+      _WemapOsmRouter.buildOptions(options),
+      { tspTempCoeff: 0.99 }
+    );
+  }
+};
+let WemapOsmRouter = _WemapOsmRouter;
+__publicField(WemapOsmRouter, "DEFAULT_OPTIONS", _WemapOsmRouter.buildOptions());
+__publicField(WemapOsmRouter, "WITHOUT_STAIRS_OPTIONS", _WemapOsmRouter.buildOptions({ useStairs: false }));
+__publicField(WemapOsmRouter, "DEFAULT_TRIP_OPTIONS", _WemapOsmRouter.buildTripOptions());
 class RemoteRouter {
 }
 class RemoteRouterServerUnreachable extends Error {
@@ -1858,8 +1878,8 @@ class WemapMultiRouter {
     }
     return ioMapsToTest;
   }
-  convertOptionsToWemapOsmOptions(options) {
-    const outputOptions = !options || !("useStairs" in options) || options.useStairs ? WemapOsmRouter.DEFAULT_OPTIONS : WemapOsmRouter.WITHOUT_STAIRS_OPTIONS;
+  convertOptionsToWemapOsmOptions(options = null) {
+    const outputOptions = WemapOsmRouter.buildOptions(options ? options : {});
     if (typeof (options == null ? void 0 : options.tspTempCoeff) !== "undefined") {
       outputOptions.tspTempCoeff = options.tspTempCoeff;
     }