@wemap/routers 12.7.4 → 12.7.6

package/dist/index.mjs

@@ -139,6 +139,18 @@ class Graph {
     const useAcceptEdgeFn = "acceptEdgeFn" in options;
     const useMultiLevelSegments = !("useMultiLevelSegments" in options) || options.useMultiLevelSegments;
     let bestProjection = null;
+    const adaptProjectionCoords = (projCoords) => {
+      if (!(origin instanceof UserPosition))
+        return projCoords;
+      const p = origin.clone();
+      p.lat = projCoords.lat;
+      p.lng = projCoords.lng;
+      p.level = projCoords.level;
+      p.alt = projCoords.alt;
+      p.heightFromFloor = projCoords.heightFromFloor;
+      p.heightFromGround = projCoords.heightFromGround;
+      return p;
+    };
     this.edges.forEach((edge) => {
       if (useAcceptEdgeFn && !options.acceptEdgeFn(edge))
         return;
@@ -157,7 +169,7 @@ class Graph {
       if (useMaxDistance && distanceToSegment > maxDistance)
         return;
       if (distanceToSegment < ((bestProjection == null ? void 0 : bestProjection.distanceFromNearestElement) ?? Number.MAX_VALUE)) {
-        bestProjection = new GraphProjection(origin, distanceToSegment, segmentProjection, edge);
+        bestProjection = new GraphProjection(origin, distanceToSegment, adaptProjectionCoords(segmentProjection), edge);
       }
     });
     if (useMaxBearingAngle) {
@@ -175,13 +187,13 @@ class Graph {
         return;
       const distanceToVertex = vertexCoords.distanceTo(origin);
       if (distanceToVertex < Constants.EPS_MM) {
-        bestProjection = new GraphProjection(origin, 0, vertexCoords, vertex);
+        bestProjection = new GraphProjection(origin, 0, adaptProjectionCoords(vertexCoords), vertex);
         return;
       }
       if (useMaxDistance && distanceToVertex > maxDistance)
         return;
       if (distanceToVertex < ((bestProjection == null ? void 0 : bestProjection.distanceFromNearestElement) ?? Number.MAX_VALUE)) {
-        bestProjection = new GraphProjection(origin, distanceToVertex, vertexCoords, vertex);
+        bestProjection = new GraphProjection(origin, distanceToVertex, adaptProjectionCoords(vertexCoords), vertex);
       }
     });
     return bestProjection;
@@ -308,7 +320,7 @@ function isTransitModePublicTransport(transitMode) {
   ].includes(transitMode);
 }
 function areTransitAndTravelModeConsistent(transitMode, travelMode) {
-  return transitMode === travelMode || isTransitModePublicTransport(transitMode) && travelMode === "TRANSIT";
+  return transitMode === travelMode || isTransitModePublicTransport(transitMode) && travelMode === "TRANSIT" || transitMode === "WALK" && travelMode === "TRANSIT";
 }
 function stepToJson(step) {
   return {
@@ -3420,6 +3432,16 @@ class IdfmRemoteRouter extends RemoteRouter {
     }
     return outputSteps;
   }
+  findStepCoords(step, section) {
+    var _a;
+    if ("instruction_start_coordinate" in step) {
+      return jsonToCoordinates$1(step.instruction_start_coordinate);
+    }
+    const via = (_a = section.vias) == null ? void 0 : _a.find((via2) => via2.id === step.via_uri);
+    if (via) {
+      return jsonToCoordinates$1(via.access_point.coord);
+    }
+  }
   parseResponse(json) {
     var _a;
     if (!json || !json.journeys) {
@@ -3446,14 +3468,28 @@ class IdfmRemoteRouter extends RemoteRouter {
         let transportInfo;
         let transitMode = transitModeCorrespondance.get(jsonSection.mode);
         if (jsonSection.path) {
+          const useIDFMSteps = jsonSection.path.every((step) => "instruction_start_coordinate" in step || step.via_uri);
           const idfmIntermediateSteps = [];
           for (const jsonPathLink of jsonSection.path) {
-            idfmIntermediateSteps.push({
-              name: jsonPathLink.name,
-              distance: jsonPathLink.length
-            });
+            let coords;
+            if (useIDFMSteps) {
+              coords = this.findStepCoords(jsonPathLink, jsonSection);
+              const intermediateStep = {
+                name: jsonPathLink.name,
+                distance: jsonPathLink.length,
+                coords
+              };
+              stepsBuilder.addStepInfo(intermediateStep);
+            } else {
+              idfmIntermediateSteps.push({
+                name: jsonPathLink.name,
+                distance: jsonPathLink.length
+              });
+            }
+          }
+          if (!useIDFMSteps) {
+            stepsBuilder.setStepsInfo(this.findStepsCoord(legCoords, idfmIntermediateSteps));
           }
-          stepsBuilder.setStepsInfo(this.findStepsCoord(legCoords, idfmIntermediateSteps));
         }
         if (jsonSection.type === "public_transport") {
           transportInfo = {