@wemap/routers 11.0.3 → 11.1.1

package/dist/index.mjs

@@ -7,7 +7,7 @@ var __publicField = (obj, key, value) => {
 import { Level, Coordinates, Utils, GeoGraph, GeoGraphEdge, GeoGraphVertex, GeoGraphRouter, GeoGraphItinerary, NoRouteFoundError, GeoGraphProjectionHandler } from "@wemap/geo";
 import { deg2rad, diffAngle, rad2deg, positiveMod } from "@wemap/maths";
 import salesman from "@wemap/salesman.js";
-import { OsmNode, OsmWay, OsmParser } from "@wemap/osm";
+import { OsmWay, OsmParser } from "@wemap/osm";
 import Logger from "@wemap/logger";
 import Polyline from "@mapbox/polyline";
 import pointInPolygon from "@turf/boolean-point-in-polygon";
@@ -28,19 +28,20 @@ function generateSteps(leg, rules) {
     const edgeLevel = Level.union(currentCoords.level, nextCoords.level);
     const nextBearing = currentCoords.bearingTo(nextCoords);
     const angle = diffAngle(previousBearing, nextBearing + Math.PI);
-    let splitByAngle = Math.abs(diffAngle(Math.PI, angle)) >= SKIP_STEP_ANGLE_MAX;
-    const splitByLevel = Level.isRange(edgeLevel) && !Level.isRange(currentCoords.level);
-    splitByAngle = splitByAngle && !(currentCoords.level && 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(diffAngle(Math.PI, angle)) >= SKIP_STEP_ANGLE_MAX;
+    const splitByLevel = Level.isRange(edgeLevel) && !Level.isRange(currentCoords.level) || (customRules == null ? void 0 : customRules.forceLevelChange);
+    splitByAngle = splitByAngle && !(currentCoords.level && Level.isRange(currentCoords.level));
+    const splitByEndOfLevelChange = (previousStep == null ? void 0 : previousStep.levelChange) && !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 = 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 };
       }
@@ -693,7 +694,7 @@ __publicField(OsmGraph, "HIGHWAYS_PEDESTRIANS", HIGHWAYS_PEDESTRIANS);
 __publicField(OsmGraph, "DEFAULT_WAY_SELECTOR", DEFAULT_WAY_SELECTOR);
 const DEFAULT_OPTIONS = Object.assign({}, GeoGraphRouter.DEFAULT_OPTIONS, {
   weightEdgeFn: (edge) => {
-    if (edge.data instanceof OsmNode && edge.data.isElevator) {
+    if (edge.data.isElevator) {
       return 90;
     }
     let duration = getDurationFromLength(edge.length, 4);
@@ -731,10 +732,10 @@ const buildStepsRules = (graphItinerary) => (currentCoords, nextCoords, previous
   } else if (edge.data instanceof OsmWay && edge.data.areStairs) {
     levelChangeType = "stairs";
   }
+  let forceLevelChange;
   const edgeTags = edge.data.tags || {};
-  let levelChangeDirection = null;
   if (edge.data instanceof 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;
@@ -746,10 +747,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 OsmWay && ["up", "down"].includes(previousEdgeTags.incline) && previousEdge.data.areStairs && edge.data instanceof OsmWay && (!["up", "down"].includes(edgeTags.incline) || !edge.data.areStairs)
+  );
+  const createNewStep = isSubwayEntrance;
   return {
     createNewStep,
     stepName: (_d = edge.data) == null ? void 0 : _d.tags.name,
@@ -760,7 +766,8 @@ const buildStepsRules = (graphItinerary) => (currentCoords, nextCoords, previous
       ...isGate && { isGate: true }
     },
     ...levelChangeType && { levelChangeType },
-    ...levelChangeDirection && { levelChangeDirection }
+    ...forceLevelChange && { forceLevelChange },
+    ...forceEndOfLevelChange && { forceEndOfLevelChange }
   };
 };
 class WemapOsmRouter extends GeoGraphRouter {
@@ -1423,7 +1430,8 @@ class OsrmRemoteRouter extends RemoteRouter {
     });
     const from = waypoints[0];
     const to = waypoints[waypoints.length - 1];
-    return this.createRouterResponseFromJson(jsonResponse, from, to);
+    const osrmMode = inputModeCorrespondance$1.get(mode);
+    return this.createRouterResponseFromJson(jsonResponse, from, to, osrmMode);
   }
   getURL(endpointUrl, mode, waypoints) {
     const osrmMode = inputModeCorrespondance$1.get(mode);