@wemap/osm 2.7.2 → 2.7.5

package/assets/bureaux-wemap-montpellier-network.osm

@@ -108,9 +108,8 @@
     <nd ref='-440488' />
     <nd ref='-440490' />
     <nd ref='-440492' />
-    <tag k='highway' v='footway' />
+    <tag k='highway' v='steps' />
     <tag k='level' v='1;2' />
-    <tag k='stairs' v='yes' />
   </way>
   <way id='-440503' action='modify' visible='true'>
     <nd ref='-440484' />

package/package.json

@@ -11,7 +11,7 @@
         "directory": "packages/osm"
     },
     "name": "@wemap/osm",
-    "version": "2.7.2",
+    "version": "2.7.5",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -26,11 +26,11 @@
     ],
     "license": "ISC",
     "dependencies": {
-        "@wemap/geo": "^2.7.2",
-        "@wemap/graph": "^2.7.2",
+        "@wemap/geo": "^2.7.4",
+        "@wemap/graph": "^2.7.4",
         "@wemap/logger": "^2.7.0",
         "lodash.isnumber": "^3.0.3",
         "sax": "^1.2.4"
     },
-    "gitHead": "ec928b7890e3c37be2a32b1ba1c108aeba9e15b7"
+    "gitHead": "5d60aa9ae789520ef5adeb34a8e4d3e5973ed0b2"
 }

package/src/network/OsmRouter.spec.js

@@ -58,13 +58,16 @@ describe('OsmRouter - Multi-level itinerary', () => {
     it('Verify steps', () => {
 
         const steps = itinerary.steps;
-        expect(steps.length).equal(10);
+        expect(steps.length).equal(8);
 
         verifyNodesOrder(steps[0].nodes, [null, 'p7', 'p8']);
-        for (let i = 2; i <= 9; i++) {
-            verifyNodesOrder(steps[i - 1].nodes, ['p' + [i + 6], 'p' + [i + 7]]);
-        }
-        verifyNodesOrder(steps[9].nodes, ['p16']);
+        verifyNodesOrder(steps[1].nodes, ['p8', 'p9']);
+        verifyNodesOrder(steps[2].nodes, ['p9', 'p10']);
+        verifyNodesOrder(steps[3].nodes, ['p10', 'p11']);
+        verifyNodesOrder(steps[4].nodes, ['p11', 'p12', 'p13', 'p14']);
+        verifyNodesOrder(steps[5].nodes, ['p14', 'p15']);
+        verifyNodesOrder(steps[6].nodes, ['p15', 'p16']);
+        verifyNodesOrder(steps[7].nodes, ['p16']);
     });
 
 

package/src/osrm/OsrmUtils.js

@@ -42,7 +42,8 @@ class OsrmUtils {
         for (let i = 0; i <= lastStepId; i++) {
 
             const {
-                nodes, length, nextEdgeData, nextBearing, previousBearing, angle, node, duration
+                nodes, length, nextEdgeData, nextBearing, previousBearing, angle, node,
+                duration, levelChange
             } = itinerarySteps[i];
 
             const edgeData = i !== lastStepId ? nextEdgeData : itinerary.edges[lastStepId];
@@ -71,6 +72,10 @@ class OsrmUtils {
                 wemap: {}
             };
 
+            if (levelChange !== null) {
+                osrmStep.levelChange = levelChange;
+            }
+
             if (node.data && node.data.tags) {
                 osrmStep.wemap.nodeTags = node.data.tags;
             }
@@ -226,9 +231,12 @@ class OsrmUtils {
                 }
                 step.nodes.push(node);
 
+                const isFirstNode = coordinates[0] === coords;
                 const isLastNode = coordinates[coordinates.length - 1] === coords;
-                if (!isLastNode || step.lastStep) {
+                if (isFirstNode) {
                     itinerary._nextStepsIndexes.push(i);
+                } else if (!isLastNode) {
+                    itinerary._nextStepsIndexes.push(i + 1);
                 }
 
                 if (previousNode) {
@@ -250,17 +258,18 @@ class OsrmUtils {
                 : deg2rad(jsonStep.maneuver.bearing_after);
             step.angle = diffAngle(step.previousBearing, step.nextBearing + Math.PI);
             step.name = jsonStep.name;
+            step.levelChange = jsonStep.levelChange ? jsonStep.levelChange : null;
 
             /**
              * Wemap fields
              */
             if (jsonStep.wemap) {
-                const firstNode = itinerary.nodes[0];
+                const firstNode = step.nodes[0];
                 if (jsonStep.wemap.nodeTags && firstNode) {
                     firstNode.data = { tags: jsonStep.wemap.nodeTags };
                 }
 
-                const firstEdge = itinerary.edges[0];
+                const firstEdge = step.edges[0];
                 if (jsonStep.wemap.nextEdgeTags && firstEdge) {
                     firstEdge.data = {
                         tags: jsonStep.wemap.nextEdgeTags,

package/src/osrm/OsrmUtils.spec.js

@@ -85,13 +85,13 @@ describe('OsrmUtils', () => {
         expect(step.name).equals('Rue du Docteur Louis Perrier');
 
         expect(itinerary._nextStepsIndexes.length).equals(itinerary.nodes.length);
-        for (let i = 0; i <= 4; i++) {
-            expect(itinerary._nextStepsIndexes[i]).equals(0);
-        }
-        for (let i = 5; i <= 15; i++) {
+        expect(itinerary._nextStepsIndexes[0]).equals(0);
+        for (let i = 1; i <= 5; i++) {
             expect(itinerary._nextStepsIndexes[i]).equals(1);
         }
-        expect(itinerary._nextStepsIndexes[16]).equals(2);
+        for (let i = 6; i <= 16; i++) {
+            expect(itinerary._nextStepsIndexes[i]).equals(2);
+        }
         expect(itinerary._nextStepsIndexes[17]).equals(3);
         expect(itinerary._nextStepsIndexes[18]).equals(4);
     });
@@ -172,28 +172,23 @@ describe('OsrmUtils', () => {
         expect(steps[3].maneuver.bearing_after).be.closeTo(281.93, 0.01);
 
         expect(steps[4].maneuver.modifier).equals('right');
-        expect(steps[4].distance).be.closeTo(4.51, 0.01);
+        expect(steps[4].distance).be.closeTo(10.71, 0.01);
         expect(steps[4].maneuver.bearing_after).be.closeTo(12.22, 0.01);
+        expect(steps[4].levelChange).is.not.null;
+        expect(steps[4].levelChange.direction).equals('down');
+        expect(steps[4].levelChange.diff).equals(-1);
 
-        expect(steps[5].maneuver.modifier).equals('right');
-        expect(steps[5].distance).be.closeTo(1.72, 0.01);
-        expect(steps[5].maneuver.bearing_after).be.closeTo(102.22, 0.01);
+        expect(steps[5].maneuver.modifier).equals('left');
+        expect(steps[5].distance).be.closeTo(4.23, 0.01);
+        expect(steps[5].maneuver.bearing_after).be.closeTo(102.00, 0.01);
 
         expect(steps[6].maneuver.modifier).equals('right');
-        expect(steps[6].distance).be.closeTo(4.49, 0.01);
-        expect(steps[6].maneuver.bearing_after).be.closeTo(192.22, 0.01);
+        expect(steps[6].distance).be.closeTo(5.03, 0.01);
+        expect(steps[6].maneuver.bearing_after).be.closeTo(191.75, 0.01);
 
         expect(steps[7].maneuver.modifier).equals('left');
-        expect(steps[7].distance).be.closeTo(4.23, 0.01);
-        expect(steps[7].maneuver.bearing_after).be.closeTo(102.00, 0.01);
-
-        expect(steps[8].maneuver.modifier).equals('right');
-        expect(steps[8].distance).be.closeTo(5.03, 0.01);
-        expect(steps[8].maneuver.bearing_after).be.closeTo(191.75, 0.01);
-
-        expect(steps[9].maneuver.modifier).equals('left');
-        expect(steps[9].distance).be.closeTo(0, 0.01);
-        expect(steps[9].maneuver.bearing_after).be.closeTo(0, 0.01);
+        expect(steps[7].distance).be.closeTo(0, 0.01);
+        expect(steps[7].maneuver.bearing_after).be.closeTo(0, 0.01);
 
     });