@wemap/osm 4.0.3 → 4.0.10

package/package.json

@@ -11,7 +11,7 @@
         "directory": "packages/osm"
     },
     "name": "@wemap/osm",
-    "version": "4.0.3",
+    "version": "4.0.10",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -25,10 +25,10 @@
     ],
     "license": "ISC",
     "dependencies": {
-        "@wemap/geo": "^4.0.3",
+        "@wemap/geo": "^4.0.10",
         "@wemap/logger": "^4.0.0",
         "@wemap/maths": "^4.0.3",
         "sax": "^1.2.4"
     },
-    "gitHead": "91a82028ddda32038999582da381d1d0d8acd091"
+    "gitHead": "684e1328f164054572b32f241e3e3b85cc3b1362"
 }

package/src/network/OsmNetworkUtils.js

@@ -70,11 +70,12 @@ class OsmNetworkUtils {
 
 
     /**
-     * @param {node} node
+     * @param {Node} node
      * @param {object} tags
      */
     static _applyNodePropertiesFromTags(node, tags) {
         node.name = tags.name || null;
+        node.subwayEntrance = tags.railway === 'subway_entrance';
     }
 
     /**

package/src/osrm/OsrmUtils.js

@@ -102,24 +102,15 @@ export function itineraryToOsrmJson(itinerary) {
                 bearing_after: rad2deg(bearingAfter),
                 location: coordinatesToJson(node.coords),
                 type
-            },
-            wemap: {}
+            }
         };
 
         if (levelChange !== null) {
             osrmStep.levelChange = levelChange;
         }
-
-        const nodeProperties = node.extractProperties();
-        if (Object.keys(nodeProperties).length !== 0) {
-            osrmStep.wemap.nodeProperties = nodeProperties;
-        }
-
-        if (i !== lastStepId && nextEdge) {
-            const nextEdgeProperties = nextEdge.extractProperties();
-            if (Object.keys(nextEdgeProperties).length !== 0) {
-                osrmStep.wemap.nextEdgeProperties = nextEdgeProperties;
-            }
+        if (node.subwayEntrance) {
+            osrmStep.name = node.name;
+            osrmStep.subwayEntrance = true;
         }
 
         // The first modifier is not mandatory by OSRM.
@@ -220,21 +211,6 @@ function _parseSteps(itinerary, jsonSteps) {
         step.name = jsonStep.name;
         step.levelChange = jsonStep.levelChange ? jsonStep.levelChange : null;
 
-        /**
-         * Wemap fields
-         */
-        if (jsonStep.wemap) {
-            const firstNode = step.nodes[0];
-            if (jsonStep.wemap.nodeProperties && firstNode) {
-                firstNode.applyProperties(jsonStep.wemap.nodeProperties);
-            }
-
-            const firstEdge = step.edges[0];
-            if (jsonStep.wemap.nextEdgeProperties && firstEdge) {
-                firstEdge.applyProperties(jsonStep.wemap.nextEdgeProperties);
-            }
-        }
-
         itinerary._steps.push(step);
 
         currentNodeIndex--;

package/src/osrm/OsrmUtils.spec.js

@@ -117,7 +117,8 @@ describe('OsrmUtils - itineraryToOsrmJson', () => {
         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[4].levelChange.difference).equals(-1);
+        expect(steps[4].levelChange.type).equals('stairs');
 
         expect(steps[5].maneuver.modifier).equals('left');
         expect(steps[5].distance).be.closeTo(4.23, 0.01);
@@ -358,17 +359,9 @@ describe('OsrmUtils - itineraryToOsrmJson - createItineraryFromJson - way/node',
         const osrmJson = itineraryToOsrmJson(itinerary);
         const jsonSteps = osrmJson.routes[0].legs[0].steps;
 
-        expect(jsonSteps[0].wemap.nextEdgeProperties.name).equals('w2');
-        expect(jsonSteps[0].wemap.nextEdgeProperties.level).equals('2');
-        expect(jsonSteps[0].wemap.nodeProperties.name).equals('w2');
-
-        expect(jsonSteps[4].wemap.nextEdgeProperties.name).equals('p19');
-        expect(jsonSteps[4].wemap.nextEdgeProperties.level).equals('0;2');
-        expect(jsonSteps[4].wemap.nodeProperties.name).equals('p19');
-
+        expect(jsonSteps[0].name).equals('w2');
+        expect(jsonSteps[4].name).equals('p19');
         expect(jsonSteps[6].name).equals('p21');
-        expect(jsonSteps[6].wemap.nextEdgeProperties).is.undefined;
-        expect(jsonSteps[6].wemap.nodeProperties.name).equals('p21');
 
         const itineraryBis = createItineraryFromJson(osrmJson, start, end);
         verifyCoherence(itineraryBis);