@wemap/osm 4.0.13 → 4.0.15

package/package.json

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

package/src/network/OsmNetworkUtils.js

@@ -7,7 +7,12 @@ import OsmNode from '../model/OsmNode.js';
 class OsmNetworkUtils {
 
     static HIGHWAYS_PEDESTRIANS = ['footway', 'steps', 'pedestrian', 'living_street', 'path', 'track', 'sidewalk'];
-    static DEFAULT_WAY_SELECTOR = way => this.HIGHWAYS_PEDESTRIANS.includes(way.tags.highway) || way.tags.footway === 'sidewalk';
+    static DEFAULT_WAY_SELECTOR = way => {
+        return this.HIGHWAYS_PEDESTRIANS.includes(way.tags.highway)
+            || way.tags.footway === 'sidewalk'
+            || way.tags.public_transport === 'platform'
+            || way.tags.railway === 'platform';
+    };
 
     /**
      * @param {OsmModel} osmModel

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,11 +108,11 @@ export function itineraryToOsrmJson(itinerary) {
         if (levelChange !== null) {
             osrmStep.levelChange = levelChange;
         }
-        if (node.subwayEntrance) {
+        if (subwayEntrance) {
             osrmStep.name = node.name;
             osrmStep.subwayEntrance = true;
-            if (node.subwayEntranceRef) {
-                osrmStep.subwayEntranceRef = node.subwayEntranceRef;
+            if (subwayEntranceRef) {
+                osrmStep.subwayEntranceRef = subwayEntranceRef;
             }
         }
 
@@ -149,6 +149,10 @@ export function itineraryToOsrmJson(itinerary) {
     };
 }
 
+/**
+ * @param {Itinerary} itinerary
+ * @param {object} jsonSteps
+ */
 function _parseSteps(itinerary, jsonSteps) {
 
     itinerary._steps = [];
@@ -205,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
          */