@wemap/routers 12.8.10 → 12.9.2

package/assets/horizontal-elevator.osm

@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<osm version='0.6' generator='JOSM'>
+  <node id='-161218670344274' action='modify' visible='true' lat='48.84835435445' lon='2.39650479554' />
+  <node id='-161218670344470' action='modify' visible='true' lat='48.84826992031' lon='2.39687830076' />
+  <way id='-921430905723165' action='modify' visible='true'>
+    <nd ref='-161218670344470' />
+    <nd ref='-161218670344274' />
+    <tag k='highway' v='elevator' />
+    <tag k='incline' v='up' />
+    <tag k='level' v='-3' />
+  </way>
+</osm>

package/assets/itinerary-info-two-points-proj.osm

@@ -1,32 +1,38 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <osm version='0.6' generator='JOSM'>
-  <node id='-441589' action='modify' visible='true' lat='43.60917006758' lon='3.88425549985'>
+  <node id='-1617378013972158' action='modify' visible='true' lat='43.60917006758' lon='3.88425549985'>
     <tag k='name' v='position 1' />
   </node>
-  <node id='-441590' action='modify' visible='true' lat='43.60911942643' lon='3.88422017836'>
+  <node id='-1617378013972159' action='modify' visible='true' lat='43.60911942643' lon='3.88422017836'>
     <tag k='name' v='n2' />
   </node>
-  <node id='-441591' action='modify' visible='true' lat='43.609172167' lon='3.88423552813'>
+  <node id='-1617378013972160' action='modify' visible='true' lat='43.609172167' lon='3.88423552813'>
     <tag k='name' v='n1' />
   </node>
-  <node id='-441592' action='modify' visible='true' lat='43.60915386783' lon='3.88424424839'>
+  <node id='-1617378013972161' action='modify' visible='true' lat='43.60915386783' lon='3.88424424839'>
     <tag k='name' v='position 2' />
   </node>
-  <node id='-441593' action='modify' visible='true' lat='43.60911497818' lon='3.88423496726'>
+  <node id='-1617378013972162' action='modify' visible='true' lat='43.60911497818' lon='3.88423496726'>
     <tag k='name' v='position 3' />
   </node>
-  <node id='-441615' action='modify' visible='true' lat='43.60916653365' lon='3.88424386215'>
-    <tag k='name' v='start' />
+  <node id='-1617378013972163' action='modify' visible='true' lat='43.60916653365' lon='3.88424386215'>
+    <tag k='name' v='origin' />
   </node>
-  <node id='-441628' action='modify' visible='true' lat='43.60912432623' lon='3.88423287343'>
-    <tag k='name' v='end' />
+  <node id='-1617378013972164' action='modify' visible='true' lat='43.60912432623' lon='3.88423287343'>
+    <tag k='name' v='destination' />
   </node>
-  <node id='-441829' action='modify' visible='true' lat='43.60916799079' lon='3.88423431239' />
-  <node id='-441831' action='modify' visible='true' lat='43.60912597253' lon='3.88422208376' />
-  <node id='-442015' action='modify' visible='true' lat='43.6091464' lon='3.884228' />
-  <way id='-441481' action='modify' visible='true'>
-    <nd ref='-441591' />
-    <nd ref='-441590' />
+  <node id='-1617378013972165' action='modify' visible='true' lat='43.60916799079' lon='3.88423431239'>
+    <tag k='name' v='porigin' />
+  </node>
+  <node id='-1617378013972166' action='modify' visible='true' lat='43.60912597256' lon='3.88422208356'>
+    <tag k='name' v='pdest' />
+  </node>
+  <node id='-1617378013972169' action='modify' visible='true' lat='43.60915590092' lon='3.884230794'>
+    <tag k='name' v='p2' />
+  </node>
+  <way id='-1617378013259620' action='modify' visible='true'>
+    <nd ref='-1617378013972160' />
+    <nd ref='-1617378013972159' />
     <tag k='highway' v='footway' />
     <tag k='name' v='w1' />
   </way>

package/assets/itinerary-info-two-points.osm

@@ -4,10 +4,10 @@
     <tag k='name' v='position 1' />
   </node>
   <node id='-441312' action='modify' visible='true' lat='43.60911942643' lon='3.88422017836'>
-    <tag k='name' v='end' />
+    <tag k='name' v='destination' />
   </node>
   <node id='-441313' action='modify' visible='true' lat='43.609172167' lon='3.88423552813'>
-    <tag k='name' v='start' />
+    <tag k='name' v='origin' />
   </node>
   <node id='-441374' action='modify' visible='true' lat='43.6091434056' lon='3.88424362043'>
     <tag k='name' v='position 2' />

package/dist/index.js

@@ -379,7 +379,7 @@ class GraphRoute extends Graph {
     return new GraphRoute(start, end, graph.vertices, graph.edges, edgesWeights);
   }
   get hasRoute() {
-    return Boolean(this.edges.length);
+    return Boolean(this.vertices.length);
   }
 }
 const SKIP_STEP_ANGLE_MAX = maths.deg2rad(20);
@@ -710,7 +710,16 @@ class Itinerary {
     this.origin = origin;
     this.destination = destination;
     this.legs = legs;
-    this.duration = typeof duration === "number" ? duration : this.legs.reduce((dur, leg) => dur + leg.duration, 0);
+    if (typeof duration === "number") {
+      this.duration = duration;
+    } else {
+      const firstCoords = this.legs[0].coords[0];
+      const lastLeg = this.legs[this.legs.length - 1];
+      const lastCoords = lastLeg.coords[lastLeg.coords.length - 1];
+      const originProjectionDuration = getDurationFromLength(this.origin.distanceTo(firstCoords));
+      const destinationProjectionDuration = getDurationFromLength(this.destination.distanceTo(lastCoords));
+      this.duration = this.legs.reduce((dur, leg) => dur + leg.duration, originProjectionDuration + destinationProjectionDuration);
+    }
     this.startTime = typeof startTime === "number" ? startTime : null;
     this.endTime = typeof endTime === "number" ? endTime : null;
     this.updateStepsFromLegs();
@@ -757,7 +766,7 @@ class Itinerary {
   }
   get distance() {
     if (this._distance === null) {
-      this._distance = geo.Utils.calcDistance(this.coords);
+      this._distance = geo.Utils.calcDistance([this.origin, ...this.coords, this.destination]);
     }
     return this._distance;
   }
@@ -765,17 +774,10 @@ class Itinerary {
     return Graph.fromCoordinatesSegments([this.coords]);
   }
   static fromItineraries(...itineraries) {
-    let duration = 0;
-    const legs = [];
-    itineraries.forEach((_itinerary) => {
-      duration += _itinerary.duration;
-      legs.push(..._itinerary.legs);
-    });
     return new Itinerary({
       origin: itineraries[0].origin,
       destination: itineraries[itineraries.length - 1].destination,
-      duration,
-      legs
+      legs: itineraries.map((itinerary) => itinerary.legs).flat()
     });
   }
   /**
@@ -845,7 +847,6 @@ class Itinerary {
     return new Itinerary({
       origin: graphRoute.start,
       destination: graphRoute.end,
-      duration: leg.duration,
       legs: [leg]
     });
   }
@@ -2832,7 +2833,7 @@ const _OsmGraphUtils = class _OsmGraphUtils {
       }
     });
     let fakeOsmNodeId = -1;
-    osmModel.ways.filter((way) => way.isElevator).forEach((way) => {
+    osmModel.ways.filter((way) => way.isElevator && way.isGeometryClosed).forEach((way) => {
       const entryVertices = way.nodes.map((node) => verticesMapping.filter(([osmId]) => osmId === node.id).map((vm) => vm[1])).flat();
       const elevatorCenter = way.nodes.reduce((acc, node) => [acc[0] + node.coords.lat, acc[1] + node.coords.lng], [0, 0]).map((val) => val / way.nodes.length);
       const elevatorLevel = entryVertices.reduce((acc, v) => geo.Level.union(acc, v.coords.level), null);
@@ -2899,7 +2900,7 @@ class WemapMultiRoutingError extends RoutingError {
     this.mapName = mapName;
   }
   static notFound(mapName, details) {
-    return new WemapMultiRoutingError(StatusCode.NOT_FOUND, mapName, `Cannot found an itinerary in map ${mapName}. Details: ${details}`);
+    return new WemapMultiRoutingError(StatusCode.NOT_FOUND, mapName, `Cannot found an itinerary in map ${mapName}. Details: ${details || "No details"}`);
   }
 }
 class RemoteRoutingError extends RoutingError {
@@ -2910,7 +2911,7 @@ class RemoteRoutingError extends RoutingError {
     this.routerName = routerName;
   }
   static notFound(routerName, details) {
-    return new RemoteRoutingError(StatusCode.NOT_FOUND, routerName, `Cannot found an itinerary with ${routerName}. Details: ${details}`);
+    return new RemoteRoutingError(StatusCode.NOT_FOUND, routerName, `Cannot found an itinerary with ${routerName}. Details: ${details || "No details"}`);
   }
   static missingApiKey(routerName, details) {
     return new RemoteRoutingError(StatusCode.UNAUTHENTICATED, routerName, `API key is missing for ${routerName}. Details: ${details}`);
@@ -4755,7 +4756,8 @@ class CustomGraphMap {
     return null;
   }
   getRouteInsideMap(start, end, options) {
-    return this.router.calculateShortestPath(start, end, options).route();
+    const route = this.router.calculateShortestPath(start, end, options).route();
+    return route.hasRoute ? route : null;
   }
   getTripInsideMap(waypoints, options) {
     return this.router.getShortestTrip(waypoints, options);
@@ -4822,6 +4824,7 @@ class ItineraryInfoManager {
     __publicField(this, "_coordsPreviousStep", []);
     __publicField(this, "_coordsDistanceTraveled", []);
     __publicField(this, "_coordsLeg", []);
+    __publicField(this, "_itineraryDistanceWithoutProjections", 0);
     this.itinerary = itinerary;
   }
   get itinerary() {
@@ -4839,6 +4842,9 @@ class ItineraryInfoManager {
     this._coordsPreviousStep = new Array(itinerary.coords.length);
     this._coordsDistanceTraveled = new Array(itinerary.coords.length);
     this._coordsLeg = new Array(itinerary.coords.length);
+    const originProjectionDistance = this._itinerary.origin.distanceTo(this._itinerary.coords[0]);
+    const destinationProjectionDistance = this._itinerary.destination.distanceTo(this._itinerary.coords[this._itinerary.coords.length - 1]);
+    this._itineraryDistanceWithoutProjections = itinerary.distance - originProjectionDistance - destinationProjectionDistance;
     let stepId = 0;
     let previousStep = null;
     let nextStep = this._steps[0];
@@ -4874,17 +4880,22 @@ class ItineraryInfoManager {
       if (idx === -1) {
         throw new Error("ItineraryInfoManager: could not find projection in itinerary (Node)");
       }
-      const traveledDistance = this._coordsDistanceTraveled[idx];
-      const remainingDistance = this._itinerary.distance - traveledDistance;
+      const traveledDistanceOnItinerary = this._coordsDistanceTraveled[idx];
+      const traveledDistance = traveledDistanceOnItinerary;
+      const remainingDistanceOnItinerary = this._itineraryDistanceWithoutProjections - traveledDistanceOnItinerary;
+      const remainingDistance = projection.distanceFromNearestElement + remainingDistanceOnItinerary;
+      const distanceForPercentage = traveledDistance + remainingDistance;
+      const traveledPercentage = traveledDistance / distanceForPercentage;
+      const remainingPercentage = 1 - traveledPercentage;
       itineraryInfo = {
         nextStep: this._coordsNextStep[idx],
         previousStep: this._coordsPreviousStep[idx],
         projection,
         leg: this._coordsLeg[idx],
-        traveledDistance,
+        traveledDistance: traveledDistanceOnItinerary,
         remainingDistance,
-        traveledPercentage: traveledDistance / this._itinerary.distance,
-        remainingPercentage: remainingDistance / this._itinerary.distance
+        traveledPercentage,
+        remainingPercentage
       };
     } else if (projection.nearestElement instanceof Edge) {
       let firstNode = projection.nearestElement.vertex1.coords;
@@ -4896,8 +4907,13 @@ class ItineraryInfoManager {
         firstNode = projection.nearestElement.vertex2.coords;
         idx--;
       }
-      const traveledDistance = this._coordsDistanceTraveled[idx] + projection.coords.distanceTo(firstNode);
-      const remainingDistance = this._itinerary.distance - traveledDistance;
+      const traveledDistanceOnItinerary = this._coordsDistanceTraveled[idx] + projection.coords.distanceTo(firstNode);
+      const traveledDistance = traveledDistanceOnItinerary;
+      const remainingDistanceOnItinerary = this._itineraryDistanceWithoutProjections - traveledDistanceOnItinerary;
+      const remainingDistance = projection.distanceFromNearestElement + remainingDistanceOnItinerary;
+      const distanceForPercentage = traveledDistance + remainingDistance;
+      const traveledPercentage = traveledDistance / distanceForPercentage;
+      const remainingPercentage = 1 - traveledPercentage;
       itineraryInfo = {
         nextStep: this._coordsNextStep[idx + 1],
         previousStep: this._coordsPreviousStep[idx + 1],
@@ -4905,8 +4921,8 @@ class ItineraryInfoManager {
         leg: this._coordsLeg[idx + 1],
         traveledDistance,
         remainingDistance,
-        traveledPercentage: traveledDistance / this._itinerary.distance,
-        remainingPercentage: remainingDistance / this._itinerary.distance
+        traveledPercentage,
+        remainingPercentage
       };
     }
     return itineraryInfo;