@wemap/osm 3.1.3 → 3.1.5

package/package.json

@@ -11,7 +11,7 @@
         "directory": "packages/osm"
     },
     "name": "@wemap/osm",
-    "version": "3.1.3",
+    "version": "3.1.5",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -26,11 +26,11 @@
     ],
     "license": "ISC",
     "dependencies": {
-        "@wemap/geo": "^3.0.0",
-        "@wemap/graph": "^3.0.0",
+        "@wemap/geo": "^3.1.4",
+        "@wemap/graph": "^3.1.4",
         "@wemap/logger": "^3.0.0",
         "lodash.isnumber": "^3.0.3",
         "sax": "^1.2.4"
     },
-    "gitHead": "27369985b8587f537718a8851e3bca7d7a0ed48e"
+    "gitHead": "3b3a9809debd83f27cdcf07152569ee64af7f867"
 }

package/src/osrm/OsrmUtils.js

@@ -238,12 +238,12 @@ class OsrmUtils {
                     } = jsonStep.wemap.nextEdgeData;
                     if (type === 'node') {
                         firstEdge.data = new OsmNode(id, OsrmUtils.jsonToCoordinates(coords), tags);
-                    } else if (type === 'way') {
+                    } else {
+                        // if (type === 'way')
                         firstEdge.data = new OsmWay(id, tags);
                     }
-                    if (firstEdge.data) {
-                        firstEdge.data.level = firstEdge.level;
-                    }
+
+                    firstEdge.data.level = firstEdge.level;
                 }
             }
 

package/src/osrm/OsrmUtils.spec.js

@@ -12,6 +12,7 @@ import OsmRouter from '../network/OsmRouter';
 import OsmNetwork from '../network/OsmNetwork';
 import OsrmUtils from './OsrmUtils';
 import OsmNode from '../model/OsmNode';
+import OsmWay from '../model/OsmWay';
 
 
 const load = fileName => {
@@ -26,7 +27,8 @@ const load = fileName => {
     };
 };
 
-let wemapItinerary, wemapJsonItinerary, wemapStart, wemapEnd;
+let wemapIndoorItinerary, wemapIndoorJsonItinerary, wemapIndoorStart, wemapIndoorEnd;
+let wemapOutdoorItinerary, wemapOutdoorJsonItinerary, wemapOutdoorStart, wemapOutdoorEnd;
 
 describe('OsrmUtils - itineraryToOsrmJson', () => {
 
@@ -36,13 +38,13 @@ describe('OsrmUtils - itineraryToOsrmJson', () => {
             network, router
         } = load('bureaux-wemap-montpellier-network.osm');
 
-        wemapStart = new Coordinates(43.6092754, 3.8842306, null, new Level(2));
-        wemapEnd = new Coordinates(43.6092602, 3.8842669, null, new Level(1));
-        const itinerary = router.getShortestPath(wemapStart, wemapEnd);
-        wemapItinerary = itinerary;
+        wemapIndoorStart = new Coordinates(43.6092754, 3.8842306, null, new Level(2));
+        wemapIndoorEnd = new Coordinates(43.6092602, 3.8842669, null, new Level(1));
+        const itinerary = router.getShortestPath(wemapIndoorStart, wemapIndoorEnd);
+        wemapIndoorItinerary = itinerary;
 
         const osrmJson = OsrmUtils.itineraryToOsrmJson(itinerary);
-        wemapJsonItinerary = osrmJson;
+        wemapIndoorJsonItinerary = osrmJson;
         const itinerarySteps = itinerary.steps;
 
         const {
@@ -133,8 +135,12 @@ describe('OsrmUtils - itineraryToOsrmJson', () => {
         const end = network.getNodeByName('p3');
 
         const itinerary = router.getShortestPath(start, end);
-        expect(() => OsrmUtils.itineraryToOsrmJson(itinerary)).not.throw(Error);
 
+        wemapOutdoorJsonItinerary = OsrmUtils.itineraryToOsrmJson(itinerary);
+
+        wemapOutdoorStart = start.coords;
+        wemapOutdoorEnd = end.coords;
+        wemapOutdoorItinerary = itinerary;
     });
 
     it('Itinerary with modifiers', () => {
@@ -235,6 +241,31 @@ describe('OsrmUtils - createItineraryFromJson', () => {
     });
 
 
+    it('Without levels (from itineraryToOsrmJson)', () => {
+
+        const itinerary = OsrmUtils.createItineraryFromJson(wemapOutdoorJsonItinerary,
+            wemapOutdoorStart, wemapOutdoorEnd);
+
+        expect(itinerary.nodes.length).equal(wemapOutdoorItinerary.nodes.length);
+        for (let i = 0; i < itinerary.nodes.length; i++) {
+            const itineraryNode = itinerary.nodes[i];
+            const wemapItineraryNode = wemapOutdoorItinerary.nodes[i];
+            expect(itineraryNode.coords.equalsTo(wemapItineraryNode.coords)).true;
+        }
+
+        expect(itinerary.edges.length).equal(wemapOutdoorItinerary.edges.length);
+        for (let i = 0; i < itinerary.edges.length; i++) {
+            const itineraryEdge = itinerary.edges[i];
+            const wemapItineraryEdge = wemapOutdoorItinerary.edges[i];
+            const firstNode = wemapItineraryEdge[wemapOutdoorItinerary._edgesDirectionReversed[i] ? 'node2' : 'node1'];
+            const secondNode = wemapItineraryEdge[wemapOutdoorItinerary._edgesDirectionReversed[i] ? 'node1' : 'node2'];
+            expect(itineraryEdge.node1.coords.equalsTo(firstNode.coords)).true;
+            expect(itineraryEdge.node2.coords.equalsTo(secondNode.coords)).true;
+            expect(Level.equalsTo(itineraryEdge.level, wemapItineraryEdge.level)).true;
+        }
+
+    });
+
     it('Without steps (Montpellier outdoor)', () => {
 
         const filePath = path.resolve(__dirname,
@@ -259,22 +290,22 @@ describe('OsrmUtils - createItineraryFromJson', () => {
 
     it('With levels (from itineraryToOsrmJson)', () => {
 
-        const itinerary = OsrmUtils.createItineraryFromJson(wemapJsonItinerary,
-            wemapStart, wemapEnd);
+        const itinerary = OsrmUtils.createItineraryFromJson(wemapIndoorJsonItinerary,
+            wemapIndoorStart, wemapIndoorEnd);
 
-        expect(itinerary.nodes.length).equal(wemapItinerary.nodes.length);
+        expect(itinerary.nodes.length).equal(wemapIndoorItinerary.nodes.length);
         for (let i = 0; i < itinerary.nodes.length; i++) {
             const itineraryNode = itinerary.nodes[i];
-            const wemapItineraryNode = wemapItinerary.nodes[i];
+            const wemapItineraryNode = wemapIndoorItinerary.nodes[i];
             expect(itineraryNode.coords.equalsTo(wemapItineraryNode.coords)).true;
         }
 
-        expect(itinerary.edges.length).equal(wemapItinerary.edges.length);
+        expect(itinerary.edges.length).equal(wemapIndoorItinerary.edges.length);
         for (let i = 0; i < itinerary.edges.length; i++) {
             const itineraryEdge = itinerary.edges[i];
-            const wemapItineraryEdge = wemapItinerary.edges[i];
-            const firstNode = wemapItineraryEdge[wemapItinerary._edgesDirectionReversed[i] ? 'node2' : 'node1'];
-            const secondNode = wemapItineraryEdge[wemapItinerary._edgesDirectionReversed[i] ? 'node1' : 'node2'];
+            const wemapItineraryEdge = wemapIndoorItinerary.edges[i];
+            const firstNode = wemapItineraryEdge[wemapIndoorItinerary._edgesDirectionReversed[i] ? 'node2' : 'node1'];
+            const secondNode = wemapItineraryEdge[wemapIndoorItinerary._edgesDirectionReversed[i] ? 'node1' : 'node2'];
             expect(itineraryEdge.node1.coords.equalsTo(firstNode.coords)).true;
             expect(itineraryEdge.node2.coords.equalsTo(secondNode.coords)).true;
             expect(Level.equalsTo(itineraryEdge.level, wemapItineraryEdge.level)).true;
@@ -298,7 +329,7 @@ describe('OsrmUtils - createItineraryFromJson', () => {
 
 });
 
-describe('OsrmUtils - itineraryToOsrmJson - createItineraryFromJson - elevator', () => {
+describe('OsrmUtils - itineraryToOsrmJson - createItineraryFromJson - way/node', () => {
 
     it('With levels (Bureaux Wemap)', () => {
 
@@ -311,10 +342,12 @@ describe('OsrmUtils - itineraryToOsrmJson - createItineraryFromJson - elevator',
         const osrmJson = OsrmUtils.itineraryToOsrmJson(itinerary);
         const jsonSteps = osrmJson.routes[0].legs[0].steps;
 
+        expect(jsonSteps[0].wemap.nextEdgeData.type).equals('way');
         expect(jsonSteps[4].wemap.nextEdgeData.type).equals('node');
 
         const itineraryBis = OsrmUtils.createItineraryFromJson(osrmJson, start, end);
         expect(itineraryBis.steps[4].edges[0].data).instanceOf(OsmNode);
+        expect(itineraryBis.steps[0].edges[0].data).instanceOf(OsmWay);
     });
 });