@wemap/osm 2.7.8 → 2.7.11

package/package.json

@@ -11,7 +11,7 @@
         "directory": "packages/osm"
     },
     "name": "@wemap/osm",
-    "version": "2.7.8",
+    "version": "2.7.11",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -26,11 +26,11 @@
     ],
     "license": "ISC",
     "dependencies": {
-        "@wemap/geo": "^2.7.8",
-        "@wemap/graph": "^2.7.8",
+        "@wemap/geo": "^2.7.9",
+        "@wemap/graph": "^2.7.9",
         "@wemap/logger": "^2.7.7",
         "lodash.isnumber": "^3.0.3",
         "sax": "^1.2.4"
     },
-    "gitHead": "859b08bd29d1dbcc828be931509e10437fc8cf75"
+    "gitHead": "933f7fe5b16feed45fb06f9501981b1119b2c7af"
 }

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;
+
+    });
+
+});