@wemap/osm 4.0.12 → 4.0.14

package/package.json

@@ -11,7 +11,7 @@
         "directory": "packages/osm"
     },
     "name": "@wemap/osm",
-    "version": "4.0.12",
+    "version": "4.0.14",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -25,10 +25,10 @@
     ],
     "license": "ISC",
     "dependencies": {
-        "@wemap/geo": "^4.0.11",
+        "@wemap/geo": "^4.0.14",
         "@wemap/logger": "^4.0.0",
         "@wemap/maths": "^4.0.3",
         "sax": "^1.2.4"
     },
-    "gitHead": "bdfa84dc63ba94e2b4fc2e9d542691177e8d1a3e"
+    "gitHead": "0b7188383438fcb1dd498dd117799076115dfee6"
 }

package/src/network/OsmNetworkUtils.js

@@ -76,6 +76,9 @@ class OsmNetworkUtils {
     static _applyNodePropertiesFromTags(node, tags) {
         node.name = tags.name || null;
         node.subwayEntrance = tags.railway === 'subway_entrance';
+        if (node.subwayEntrance && tags.ref) {
+            node.subwayEntranceRef = tags.ref;
+        }
     }
 
     /**

package/src/osrm/OsrmUtils.js

@@ -78,7 +78,7 @@ export function itineraryToOsrmJson(itinerary) {
 
         const {
             nodes, length, nextEdge, nextBearing, previousBearing, angle, node,
-            duration, levelChange
+            duration, levelChange, subwayEntrance, subwayEntranceRef
         } = itinerarySteps[i];
 
         const name = (i === lastStepId ? node.name : nextEdge.name) || '';
@@ -108,9 +108,12 @@ export function itineraryToOsrmJson(itinerary) {
         if (levelChange !== null) {
             osrmStep.levelChange = levelChange;
         }
-        if (node.subwayEntrance) {
+        if (subwayEntrance) {
             osrmStep.name = node.name;
             osrmStep.subwayEntrance = true;
+            if (subwayEntranceRef) {
+                osrmStep.subwayEntranceRef = subwayEntranceRef;
+            }
         }
 
         // The first modifier is not mandatory by OSRM.
@@ -146,6 +149,10 @@ export function itineraryToOsrmJson(itinerary) {
     };
 }
 
+/**
+ * @param {Itinerary} itinerary
+ * @param {object} jsonSteps
+ */
 function _parseSteps(itinerary, jsonSteps) {
 
     itinerary._steps = [];
@@ -202,6 +209,17 @@ function _parseSteps(itinerary, jsonSteps) {
             currentNodeIndex++;
         }
 
+
+        const firstStepNode = step.nodes[0];
+        if (jsonStep.subwayEntrance === true) {
+            firstStepNode.subwayEntrance = true;
+            step.subwayEntrance = true;
+            if (jsonStep.subwayEntranceRef) {
+                firstStepNode.subwayEntranceRef = jsonStep.subwayEntranceRef;
+                step.subwayEntranceRef = jsonStep.subwayEntranceRef;
+            }
+        }
+
         /**
          * Add common fields
          */