@wemap/osm 2.7.11 → 2.7.14

package/package.json

@@ -11,7 +11,7 @@
         "directory": "packages/osm"
     },
     "name": "@wemap/osm",
-    "version": "2.7.11",
+    "version": "2.7.14",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -32,5 +32,5 @@
         "lodash.isnumber": "^3.0.3",
         "sax": "^1.2.4"
     },
-    "gitHead": "933f7fe5b16feed45fb06f9501981b1119b2c7af"
+    "gitHead": "a196bbcae92e89add1caa2d532c9ae8bf583e42e"
 }

package/src/network/OsmRouter.spec.js

@@ -87,8 +87,9 @@ describe('OsmRouter - Multi-level itinerary', () => {
     it('do not use stairs', () => {
         const itineraryWithoutStairs = router.getShortestPath(itineraryStart, itineraryEnd, { useStairs: false });
         expect(itineraryWithoutStairs.nodes.length).equal(11);
-        expect(itineraryWithoutStairs.nodes[6].data.tags.highway).equal('elevator');
-        expect(itineraryWithoutStairs.nodes[7].data.tags.highway).equal('elevator');
+        expect(itineraryWithoutStairs.nodes[6].data.isElevator).is.true;
+        expect(itineraryWithoutStairs.nodes[7].data.isElevator).is.true;
+        expect(itineraryWithoutStairs.edges[6].data.isElevator).is.true;
     });
 
 });

package/src/osrm/OsrmUtils.js

@@ -9,6 +9,9 @@ import {
     rad2deg, Utils as MathUtils, diffAngle, deg2rad
 } from '@wemap/maths';
 
+import OsmNode from '../model/OsmNode';
+import OsmWay from '../model/OsmWay';
+
 
 class OsrmUtils {
 
@@ -22,7 +25,7 @@ class OsrmUtils {
 
             const {
                 nodes, length, nextEdgeData, nextBearing, previousBearing, angle, node,
-                duration, levelChange
+                duration, levelChange, edges
             } = itinerarySteps[i];
 
             const edgeData = i !== lastStepId ? nextEdgeData : itinerary.edges[lastStepId];
@@ -56,11 +59,24 @@ class OsrmUtils {
             }
 
             if (node.data && node.data.tags) {
-                osrmStep.wemap.nodeTags = node.data.tags;
+                osrmStep.wemap.node = {
+                    id: node.data.id,
+                    tags: node.data.tags
+                };
             }
 
             if (i !== lastStepId) {
-                osrmStep.wemap.nextEdgeTags = nextEdgeData.tags;
+                osrmStep.wemap.nextEdgeData = {
+                    id: nextEdgeData.id,
+                    tags: nextEdgeData.tags
+                };
+                if (edges[0].data instanceof OsmNode) {
+                    osrmStep.wemap.nextEdgeData.type = 'node';
+                    osrmStep.wemap.nextEdgeData.coords = OsrmUtils.wgs84ToJson(edges[0].data.coords);
+                }
+                if (edges[0].data instanceof OsmWay) {
+                    osrmStep.wemap.nextEdgeData.type = 'way';
+                }
             }
 
             // The first modifier is not mandatory by OSRM.
@@ -170,7 +186,7 @@ class OsrmUtils {
                 const node = itinerary.getNodeByCoords(wgs84);
                 if (!node) {
                     throw new Error('Cannot parse these step coordinates, '
-                    + 'they are not found in main itinerary: ' + wgs84.toString());
+                        + 'they are not found in main itinerary: ' + wgs84.toString());
                 }
                 step.nodes.push(node);
 
@@ -208,17 +224,26 @@ class OsrmUtils {
              */
             if (jsonStep.wemap) {
                 const firstNode = step.nodes[0];
-                if (jsonStep.wemap.nodeTags && firstNode) {
-                    firstNode.data = { tags: jsonStep.wemap.nodeTags };
+                if (jsonStep.wemap.node && firstNode) {
+                    const {
+                        id, tags
+                    } = jsonStep.wemap.node;
+                    firstNode.data = new OsmNode(id, step.nodes[0].coords, tags);
                 }
 
                 const firstEdge = step.edges[0];
-                if (jsonStep.wemap.nextEdgeTags && firstEdge) {
-                    firstEdge.data = {
-                        tags: jsonStep.wemap.nextEdgeTags,
-                        name: jsonStep.name
-                    };
-
+                if (jsonStep.wemap.nextEdgeData && firstEdge) {
+                    const {
+                        coords, id, tags, type
+                    } = jsonStep.wemap.nextEdgeData;
+                    if (type === 'node') {
+                        firstEdge.data = new OsmNode(id, OsrmUtils.jsonToWgs84(coords), tags);
+                    } else if (type === 'way') {
+                        firstEdge.data = new OsmWay(id, tags);
+                    }
+                    if (firstEdge.data) {
+                        firstEdge.data.level = firstEdge.level;
+                    }
                 }
             }
 

package/src/osrm/OsrmUtils.spec.js

@@ -11,6 +11,7 @@ import OsmParser from '../model/OsmParser';
 import OsmRouter from '../network/OsmRouter';
 import OsmNetwork from '../network/OsmNetwork';
 import OsrmUtils from './OsrmUtils';
+import OsmNode from '../model/OsmNode';
 
 
 const load = fileName => {
@@ -297,6 +298,26 @@ describe('OsrmUtils - createItineraryFromJson', () => {
 
 });
 
+describe('OsrmUtils - itineraryToOsrmJson - createItineraryFromJson - elevator', () => {
+
+    it('With levels (Bureaux Wemap)', () => {
+
+        const { router } = load('bureaux-wemap-montpellier-network.osm');
+
+        const start = new WGS84(43.6092754, 3.8842306, null, new Level(2));
+        const end = new WGS84(43.60949854, 3.88452048, null, new Level(0));
+        const itinerary = router.getShortestPath(start, end);
+
+        const osrmJson = OsrmUtils.itineraryToOsrmJson(itinerary);
+        const jsonSteps = osrmJson.routes[0].legs[0].steps;
+
+        expect(jsonSteps[4].wemap.nextEdgeData.type).equals('node');
+
+        const itineraryBis = OsrmUtils.createItineraryFromJson(osrmJson, start, end);
+        expect(itineraryBis.steps[4].edges[0].data).instanceOf(OsmNode);
+    });
+});
+
 describe('OsrmUtils - Output JSON', () => {
 
     it('noRouteFoundJson', () => {