@wemap/osm 2.7.9 → 2.7.13

package/package.json

@@ -11,7 +11,7 @@
         "directory": "packages/osm"
     },
     "name": "@wemap/osm",
-    "version": "2.7.9",
+    "version": "2.7.13",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -32,5 +32,5 @@
         "lodash.isnumber": "^3.0.3",
         "sax": "^1.2.4"
     },
-    "gitHead": "a43db34e902c6c4d34051444bb385b82add08068"
+    "gitHead": "bbe3d0a45f1260fcc8c50a62cda4b849ca82ca05"
 }

package/src/model/OsmNode.js

@@ -9,6 +9,14 @@ class OsmNode extends OsmElement {
         super(id, tags);
         this.coords = coords;
     }
+
+    get isElevator() {
+        return this.tags.highway === 'elevator';
+    }
+
+    get isConveying() {
+        return this.isElevator;
+    }
 }
 
 export default OsmNode;

package/src/model/OsmNode.spec.js

@@ -11,4 +11,20 @@ describe('OsmNode', () => {
         expect(() => new OsmNode(0, new WGS84(0, 0))).not.throw(Error);
     });
 
+    it('getters', () => {
+        let node;
+
+        node = new OsmNode(0);
+        expect(node.isElevator).is.false;
+        expect(node.isConveying).is.false;
+
+        node = new OsmNode(0, null, { highway: 'elevator' });
+        expect(node.isElevator).is.true;
+        expect(node.isConveying).is.true;
+
+        node = new OsmNode(0, null, { highway: 'stop' });
+        expect(node.isElevator).is.false;
+        expect(node.isConveying).is.false;
+    });
+
 });

package/src/model/OsmWay.js

@@ -9,6 +9,21 @@ class OsmWay extends OsmElement {
         super(id, tags);
     }
 
+    get areStairs() {
+        return this.tags.highway === 'steps';
+    }
+
+    get isConveying() {
+        return this.tags.hasOwnProperty('conveying');
+    }
+
+    get isEscalator() {
+        return this.areStairs && this.isConveying;
+    }
+
+    get isMovingWalkway() {
+        return !this.areStairs && this.isConveying;
+    }
 }
 
 export default OsmWay;

package/src/model/OsmWay.spec.js

@@ -0,0 +1,59 @@
+/* eslint-disable max-statements */
+import { expect } from 'chai';
+
+import OsmWay from './OsmWay';
+
+describe('OsmNode', () => {
+
+    it('creation', () => {
+        expect(() => new OsmWay(0)).not.throw(Error);
+    });
+
+    it('getters', () => {
+        let way;
+
+        way = new OsmWay(0);
+        expect(way.areStairs).is.false;
+        expect(way.isConveying).is.false;
+        expect(way.isEscalator).is.false;
+        expect(way.isMovingWalkway).is.false;
+
+        way = new OsmWay(0, { highway: 'stop' });
+        expect(way.areStairs).is.false;
+        expect(way.isConveying).is.false;
+        expect(way.isEscalator).is.false;
+        expect(way.isMovingWalkway).is.false;
+
+        way = new OsmWay(0, { highway: 'steps' });
+        expect(way.areStairs).is.true;
+        expect(way.isConveying).is.false;
+        expect(way.isEscalator).is.false;
+        expect(way.isMovingWalkway).is.false;
+
+        way = new OsmWay(0, {
+            highway: 'steps',
+            conveying: 'yes'
+        });
+        expect(way.areStairs).is.true;
+        expect(way.isConveying).is.true;
+        expect(way.isEscalator).is.true;
+        expect(way.isMovingWalkway).is.false;
+
+        way = new OsmWay(0, { highway: 'footway' });
+        expect(way.areStairs).is.false;
+        expect(way.isConveying).is.false;
+        expect(way.isEscalator).is.false;
+        expect(way.isMovingWalkway).is.false;
+
+        way = new OsmWay(0, {
+            highway: 'footway',
+            conveying: 'yes'
+        });
+        expect(way.areStairs).is.false;
+        expect(way.isConveying).is.true;
+        expect(way.isEscalator).is.false;
+        expect(way.isMovingWalkway).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 {
 
@@ -56,11 +59,17 @@ 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.nextWay = {
+                    id: nextEdgeData.id,
+                    tags: nextEdgeData.tags
+                };
             }
 
             // The first modifier is not mandatory by OSRM.
@@ -170,7 +179,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 +217,20 @@ 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.nextWay && firstEdge) {
+                    const {
+                        id, tags
+                    } = jsonStep.wemap.nextWay;
+                    firstEdge.data = new OsmWay(id, tags);
+                    firstEdge.data.level = firstEdge.level;
                 }
             }