@wemap/routers 11.0.1 → 11.0.3

package/dist/index.js

@@ -700,11 +700,23 @@ 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) => edge.data instanceof osm.OsmNode && edge.data.isElevator ? 90 : getDurationFromLength(edge.length)
+  weightEdgeFn: (edge) => {
+    if (edge.data instanceof osm.OsmNode && edge.data.isElevator) {
+      return 90;
+    }
+    let duration = getDurationFromLength(edge.length, 4);
+    if (edge.data instanceof osm.OsmWay && edge.data.areStairs) {
+      duration *= 3;
+    }
+    return duration;
+  }
 });
 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;
@@ -789,14 +801,14 @@ class WemapOsmRouter extends geo.GeoGraphRouter {
     }
     return { direction, directionExtra };
   }
-  getShortestTrip(waypoints, options = DEFAULT_OPTIONS) {
+  getShortestTrip(waypoints, options = DEFAULT_TRIP_OPTIONS) {
     const points = waypoints.map((waypoint) => {
       const point = new salesman__default.default.Point(0, 0);
       point.coords = waypoint;
       return point;
     });
     const cache = [];
-    const solution = salesman__default.default.solve(points, 0.9, void 0, (p, q) => {
+    const solution = salesman__default.default.solve(points, options.tspTempCoeff, void 0, (p, q) => {
       const osmItinerary = this.getShortestPath(
         p.coords,
         q.coords,
@@ -807,9 +819,9 @@ class WemapOsmRouter extends geo.GeoGraphRouter {
     });
     const orderedPoints = solution.map((i) => points[i]);
     const orderedItineraries = [];
-    for (let i = 0; i < orderedPoints.length - 1; i++) {
+    for (let i = 0; i < orderedPoints.length; i++) {
       const p = orderedPoints[i];
-      const q = orderedPoints[i + 1];
+      const q = orderedPoints[(i + 1) % orderedPoints.length];
       let cachedItinerary = cache.find((itinerary) => itinerary.start === p.coords && itinerary.end === q.coords || itinerary.end === p.coords && itinerary.start === q.coords);
       if (cachedItinerary.end === p.coords) {
         cachedItinerary = geo.GeoGraphItinerary.fromGraphVertices(
@@ -823,7 +835,7 @@ class WemapOsmRouter extends geo.GeoGraphRouter {
     }
     return orderedItineraries;
   }
-  getTripItinerary(waypoints, options = DEFAULT_OPTIONS) {
+  getTripItinerary(waypoints, options = DEFAULT_TRIP_OPTIONS) {
     const shortestTrip = this.getShortestTrip(waypoints, options);
     return new Itinerary({
       from: shortestTrip[0].start,
@@ -1814,7 +1826,11 @@ class WemapMultiRouter {
     return ioMapsToTest;
   }
   convertOptionsToWemapOsmOptions(options) {
-    return !options || !("useStairs" in options) || options.useStairs ? WemapOsmRouter.DEFAULT_OPTIONS : WemapOsmRouter.WITHOUT_STAIRS_OPTIONS;
+    const outputOptions = !options || !("useStairs" in options) || options.useStairs ? WemapOsmRouter.DEFAULT_OPTIONS : WemapOsmRouter.WITHOUT_STAIRS_OPTIONS;
+    if (typeof (options == null ? void 0 : options.tspTempCoeff) !== "undefined") {
+      outputOptions.tspTempCoeff = options.tspTempCoeff;
+    }
+    return outputOptions;
   }
   async getTrip(mode, waypoints, options = null) {
     const ioMapsToTest = this.getIoMapsFromOptions(options);