@wemap/routers 11.0.2 → 11.1.0

package/dist/index.js

@@ -36,19 +36,20 @@ function generateSteps(leg, rules) {
     const edgeLevel = geo.Level.union(currentCoords.level, nextCoords.level);
     const nextBearing = currentCoords.bearingTo(nextCoords);
     const angle = maths.diffAngle(previousBearing, nextBearing + Math.PI);
-    let splitByAngle = Math.abs(maths.diffAngle(Math.PI, angle)) >= SKIP_STEP_ANGLE_MAX;
-    const splitByLevel = geo.Level.isRange(edgeLevel) && !geo.Level.isRange(currentCoords.level);
-    splitByAngle = splitByAngle && !(currentCoords.level && geo.Level.isRange(currentCoords.level));
     const previousStep = steps.length ? steps[steps.length - 1] : null;
     const customRules = rules == null ? void 0 : rules(currentCoords, nextCoords, previousStep);
-    const splitStepCondition = splitByAngle || splitByLevel || (customRules == null ? void 0 : customRules.createNewStep);
+    let splitByAngle = Math.abs(maths.diffAngle(Math.PI, angle)) >= SKIP_STEP_ANGLE_MAX;
+    const splitByLevel = geo.Level.isRange(edgeLevel) && !geo.Level.isRange(currentCoords.level) || (customRules == null ? void 0 : customRules.forceLevelChange);
+    splitByAngle = splitByAngle && !(currentCoords.level && geo.Level.isRange(currentCoords.level));
+    const splitByEndOfLevelChange = (previousStep == null ? void 0 : previousStep.levelChange) && !geo.Level.isRange(currentCoords.level) || (customRules == null ? void 0 : customRules.forceEndOfLevelChange);
+    const splitStepCondition = splitByAngle || splitByLevel || splitByEndOfLevelChange || (customRules == null ? void 0 : customRules.createNewStep);
     if (isFirstStep || splitStepCondition) {
       let levelChange;
-      if (splitByLevel || (customRules == null ? void 0 : customRules.levelChangeType)) {
+      if (splitByLevel) {
         const difference = geo.Level.diff(currentCoords.level, nextCoords.level) || 0;
         let direction = difference > 0 ? "up" : "down";
-        if (difference === 0 && (customRules == null ? void 0 : customRules.levelChangeDirection)) {
-          direction = customRules.levelChangeDirection;
+        if (customRules == null ? void 0 : customRules.forceLevelChange) {
+          direction = customRules == null ? void 0 : customRules.forceLevelChange;
         }
         levelChange = { difference, direction, type: customRules == null ? void 0 : customRules.levelChangeType };
       }
@@ -700,7 +701,16 @@ 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.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"
@@ -730,10 +740,10 @@ const buildStepsRules = (graphItinerary) => (currentCoords, nextCoords, previous
   } else if (edge.data instanceof osm.OsmWay && edge.data.areStairs) {
     levelChangeType = "stairs";
   }
+  let forceLevelChange;
   const edgeTags = edge.data.tags || {};
-  let levelChangeDirection = null;
   if (edge.data instanceof osm.OsmWay && edge.data.areStairs && ["up", "down"].includes(edgeTags.incline) && !(previousStep == null ? void 0 : previousStep.levelChange)) {
-    levelChangeDirection = edgeTags.incline;
+    forceLevelChange = edgeTags.incline;
     for (const n of edge.data.nodes) {
       if (n !== vertex.data)
         continue;
@@ -745,10 +755,15 @@ const buildStepsRules = (graphItinerary) => (currentCoords, nextCoords, previous
       return acc;
     }, null);
     if (isReversed) {
-      levelChangeDirection = levelChangeDirection === "up" ? "down" : "up";
+      forceLevelChange = forceLevelChange === "up" ? "down" : "up";
     }
   }
-  const createNewStep = isSubwayEntrance || levelChangeDirection;
+  const previousEdge = edgeId > 0 && edges.length ? edges[edgeId - 1] : null;
+  const previousEdgeTags = (previousEdge == null ? void 0 : previousEdge.data.tags) || {};
+  const forceEndOfLevelChange = Boolean(
+    previousEdge && previousEdge.data instanceof osm.OsmWay && ["up", "down"].includes(previousEdgeTags.incline) && previousEdge.data.areStairs && edge.data instanceof osm.OsmWay && (!["up", "down"].includes(edgeTags.incline) || !edge.data.areStairs)
+  );
+  const createNewStep = isSubwayEntrance;
   return {
     createNewStep,
     stepName: (_d = edge.data) == null ? void 0 : _d.tags.name,
@@ -759,7 +774,8 @@ const buildStepsRules = (graphItinerary) => (currentCoords, nextCoords, previous
       ...isGate && { isGate: true }
     },
     ...levelChangeType && { levelChangeType },
-    ...levelChangeDirection && { levelChangeDirection }
+    ...forceLevelChange && { forceLevelChange },
+    ...forceEndOfLevelChange && { forceEndOfLevelChange }
   };
 };
 class WemapOsmRouter extends geo.GeoGraphRouter {