@wemap/geo 0.3.0 → 0.3.1

package/package.json

@@ -12,7 +12,7 @@
         "directory": "packages/geo"
     },
     "name": "@wemap/geo",
-    "version": "0.3.0",
+    "version": "0.3.1",
     "bugs": {
         "url": "https://github.com/wemap/wemap-utils-js/issues"
     },
@@ -27,9 +27,9 @@
     ],
     "license": "ISC",
     "dependencies": {
-        "@wemap/maths": "^0.2.0",
+        "@wemap/maths": "^0.2.1",
         "lodash.isnumber": "^3.0.3",
         "lodash.isstring": "^4.0.1"
     },
-    "gitHead": "1175cf4c2faf2506e2fafa03f2eec7cbd632a5de"
+    "gitHead": "7b84c9d55646761f75f19235a15be8a1b73b3dbf"
 }

package/src/graph/Itinerary.js

@@ -202,7 +202,7 @@ class Itinerary extends Network {
             return null;
         }
 
-        const projection = this.mapMatching.getProjection(position, false, false);
+        const projection = this.mapMatching.getProjection(position);
         if (!projection) {
             return null;
         }
@@ -240,7 +240,7 @@ class Itinerary extends Network {
         return {
             nextStep,
             previousStep,
-            projection: projection,
+            projection,
             traveledDistance,
             traveledPercentage: traveledDistance / totalDistance,
             remainingDistance: totalDistance - traveledDistance,
@@ -345,12 +345,17 @@ class Itinerary extends Network {
                 previousStep = currentStep;
 
                 currentStep = new Step();
+                currentStep.number = this._steps.length + 1;
                 currentStep.angle = angle;
                 currentStep.previousBearing = previousBearing;
                 currentStep.nextBearing = bearing;
                 currentStep.nodes.push(node);
                 this._steps.push(currentStep);
 
+                if (!previousStep) {
+                    currentStep.firstStep = true;
+                }
+
                 const indexOfCurrentStep = this._steps.length - 1;
                 const numberOfNodesToFill = previousStep ? previousStep.nodes.length - 1 : 1;
                 for (let j = 0; j < numberOfNodesToFill; j++) {
@@ -372,18 +377,26 @@ class Itinerary extends Network {
         if (lastNode.coords !== this.end) {
 
             const lastStep = new Step();
+            lastStep.number = this._steps.length + 1;
             lastStep._length = 0;
             lastStep.nextBearing = lastNode.coords.bearingTo(this.end);
             lastStep.previousBearing = previousBearing;
+            lastStep.lastStep = true;
             lastStep.angle = diffAngle(lastStep.previousBearing, lastStep.nextBearing + Math.PI);
             lastStep.nodes.push(lastNode);
             this._steps.push(lastStep);
 
+            if (!currentStep) {
+                lastStep.firstStep = true;
+            }
+
             const indexOfCurrentStep = this._steps.length - 1;
             const numberOfNodesToFill = currentStep ? currentStep.nodes.length - 1 : 1;
             for (let j = 0; j < numberOfNodesToFill; j++) {
                 this._nextStepsIndexes.push(indexOfCurrentStep);
             }
+        } else {
+            currentStep.lastStep = true;
         }
 
     }

package/src/graph/MapMatching.js

@@ -35,7 +35,7 @@ class MapMatching {
         this.network = network;
     }
 
-    getProjection(location, useDistance = true, useBearing = true, useMultiLevelSegments = true, acceptEdgeFn = () => true) {
+    getProjection(location, useDistance = false, useBearing = false, useMultiLevelSegments = true, acceptEdgeFn = () => true) {
 
         if (!this.network) {
             return null;

package/src/graph/MapMatching.spec.js

@@ -16,7 +16,7 @@ describe('MapMatching', () => {
     const location = new WGS84UserPosition(43.6091762, 3.8841239, null, new Level(2));
 
     it('without bearing', () => {
-        const result = mapMatching.getProjection(location, true, false).projection;
+        const result = mapMatching.getProjection(location).projection;
         const expected = new WGS84(43.609176389330685, 3.8841226728537976, null, new Level(2));
         expect(result.distanceTo(expected)).to.below(0.01);
         expect(Level.equalsTo(expected.level, result.level)).true;
@@ -25,7 +25,7 @@ describe('MapMatching', () => {
     it('with bearing', () => {
         mapMatching.maxAngleBearing = 30;
         location.bearing = 101.9;
-        const result = mapMatching.getProjection(location).projection;
+        const result = mapMatching.getProjection(location, true, true).projection;
         const expected = new WGS84(43.60918861773314, 3.8841274925288447, null, new Level(2));
         expect(result.distanceTo(expected)).to.below(0.01);
         expect(Level.equalsTo(expected.level, result.level)).true;

package/src/graph/Step.js

@@ -2,12 +2,15 @@ import Itinerary from './Itinerary';
 
 class Step {
 
+    number;
     nodes = [];
     edges = [];
     angle;
     _length = 0;
     previousBearing;
     nextBearing;
+    firstStep = false;
+    lastStep = false;
 
     get node() {
         return this.nodes[0];