@wemap/routers 12.10.1 → 12.10.3

package/package.json

@@ -12,7 +12,7 @@
         "directory": "packages/routers"
     },
     "name": "@wemap/routers",
-    "version": "12.10.1",
+    "version": "12.10.3",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -53,5 +53,5 @@
         },
         "./helpers/*": "./helpers/*"
     },
-    "gitHead": "5c2e798da24231b5643f1e1ed306b729e1e87354"
+    "gitHead": "910c64e846fe88b4e9c7a0b1f52fb3e2b96d4f46"
 }

package/src/ItineraryInfoManager.ts

@@ -54,11 +54,7 @@ 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;
+        this._itineraryDistanceWithoutProjections = itinerary.distance;
 
         let stepId = 0;
         let previousStep: Step | null = null;

package/src/model/Itinerary.ts

@@ -64,13 +64,7 @@ export default class Itinerary {
         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];
-            // Projection duration is calculated using walking mode 
-            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.duration = this.legs.reduce((dur, leg) => dur + leg.duration, 0);
         }
         this.startTime = typeof startTime === 'number' ? startTime : null;
         this.endTime = typeof endTime === 'number' ? endTime : null;
@@ -139,7 +133,7 @@ export default class Itinerary {
 
     get distance() {
         if (this._distance === null) {
-            this._distance = GeoUtils.calcDistance([this.origin, ...this.coords, this.destination]);
+            this._distance = GeoUtils.calcDistance(this.coords);
         }
         return this._distance;
 
@@ -338,12 +332,12 @@ export default class Itinerary {
     }
 
     /**
+     * TODO: Remove it in router v3
      * Update steps info thanks to the coordinates of the whole itinerary.
      * This method will update:
      * - all steps number
      * - first/last steps
      * - previousBearing/nextBearing/angle of first and last step of each leg
-     * - distance/duration of first and last step of each leg
      */
     updateStepsFromLegs() {
 
@@ -368,25 +362,9 @@ export default class Itinerary {
             step.nextBearing = step.coords.bearingTo(coordsAfterStep);
             step.angle = diffAngle(step.previousBearing, step.nextBearing + Math.PI);
 
-            const stepDistanceBefore = step.distance;
-            step.distance = 0;
-            const coordsToStopCalculation = stepId !== steps.length - 1
-                ? steps[stepId + 1].coords
-                : itineraryCoords[itineraryCoords.length - 1];
-            let currentCoordsId = coordsId;
-            while (!itineraryCoords[currentCoordsId].equals(coordsToStopCalculation)) {
-                step.distance += itineraryCoords[currentCoordsId].distanceTo(itineraryCoords[currentCoordsId + 1]);
-                currentCoordsId++;
-            }
-            if (currentCoordsId === itineraryCoords.length - 1) {
-                step.distance += itineraryCoords[currentCoordsId].distanceTo(this.destination);
-            }
-
             step.number = stepId + 1;
             step.firstStep = stepId === 0;
             step.lastStep = stepId === steps.length - 1;
-
-            step.duration += getDurationFromLength(step.distance - stepDistanceBefore)
         });
     }
 }

package/src/remote/cityway/CitywayRemoteRouter.spec.ts

@@ -31,7 +31,7 @@ describe('CitywayRemoteRouter - parseResponse', () => {
         const itinerary1 = itineraries[0];
         expect(itinerary1.origin.equals(new Coordinates(49.515093882362159, 0.093417496193663158))).true;
         expect(itinerary1.destination.equals(new Coordinates(49.5067090188444, 0.16948421154178309))).true;
-        expect(itinerary1.distance).to.be.closeTo(6919, 1);
+        expect(itinerary1.distance).to.be.closeTo(6887, 1);
         expect(itinerary1.duration).equal(2379);
         expect(itinerary1.transitMode).equal('BUS');
         // Do not work because of the input time format

package/src/remote/geovelo/GeoveloRemoteRouter.spec.ts

@@ -31,7 +31,7 @@ describe('GeoveloRouter - parseResponse', () => {
         const itinerary1 = itineraries[0];
         expect(itinerary1.origin.equals(new Coordinates(43.596949, 3.877772))).true;
         expect(itinerary1.destination.equals(new Coordinates(43.609609, 3.914684))).true;
-        expect(itinerary1.distance).to.be.closeTo(4031, 1);
+        expect(itinerary1.distance).to.be.closeTo(4029, 1);
         expect(itinerary1.duration).equal(1053);
         expect(itinerary1.transitMode).equal('BIKE');
         // Do not work because of the input time format

package/src/remote/osrm/OsrmRemoteRouter.spec.ts

@@ -37,7 +37,7 @@ describe('OsrmRemoteRouter - parseResponse', () => {
         const itinerary1 = itineraries[0];
         expect(itinerary1.origin.equals(origin)).true;
         expect(itinerary1.destination.equals(destination)).true;
-        expect(itinerary1.distance).closeTo(429, 1);
+        expect(itinerary1.distance).closeTo(400, 1);
         expect(itinerary1.duration).equal(287.8);
         expect(itinerary1.startTime).is.null;
         expect(itinerary1.endTime).is.null;