@wemap/osm 0.2.1 → 0.2.3

package/package.json

@@ -11,7 +11,7 @@
         "directory": "packages/osm"
     },
     "name": "@wemap/osm",
-    "version": "0.2.1",
+    "version": "0.2.3",
     "bugs": {
         "url": "https://github.com/wemap/wemap-utils-js/issues"
     },
@@ -26,10 +26,10 @@
     ],
     "license": "ISC",
     "dependencies": {
-        "@wemap/geo": "^0.3.1",
-        "@wemap/logger": "^0.1.5",
+        "@wemap/geo": "^0.3.2",
+        "@wemap/logger": "^0.1.6",
         "lodash.isnumber": "^3.0.3",
         "sax": "^1.2.4"
     },
-    "gitHead": "7b84c9d55646761f75f19235a15be8a1b73b3dbf"
+    "gitHead": "90192565937f17f5638b8b3dce9ae2bc78879b9e"
 }

package/src/network/OsmNetwork.js

@@ -60,6 +60,13 @@ class OsmNetwork extends Network {
         return this.edges.find(edge => edge.data.id === id);
     }
 
+    toString() {
+        return super.toString(
+            node => node.data.tags.name,
+            edge => edge.data.id
+        );
+    }
+
 }
 
 export default OsmNetwork;

package/src/network/OsmRouter.js

@@ -10,7 +10,7 @@ class OsmRouter extends GraphRouter {
 
         const edgeSelectionFilter = edge => {
 
-            return options.useStairs
+            return options.useStairs || !edge.data || !edge.data.tags
                 || (
                     edge.data.tags.stairs !== 'yes'
                     && edge.data.tags.highway !== 'steps'

package/src/network/OsmRouter.spec.js

@@ -3,7 +3,9 @@ import { expect } from 'chai';
 import fs from 'fs';
 import path from 'path';
 
-import { Node } from '@wemap/geo';
+import {
+    Node, WGS84, Level
+} from '@wemap/geo';
 
 import OsmParser from '../model/OsmParser';
 import OsmRouter from './OsmRouter';
@@ -61,6 +63,17 @@ describe('OsmRouter - Multi-level itinerary', () => {
     });
 
 
+    it('router returns shortest path 2', () => {
+
+        const start = new WGS84(43.609219, 3.8841743, null, new Level(2));
+        const end = new WGS84(43.6091722, 3.8842355, null, new Level(2));
+        const itinerary2 = router.getShortestPath(start, end);
+
+        expect(itinerary2.nodes.length).equal(3);
+        expect(itinerary2.nodes[1].data.tags.name).equal('p6');
+        expect(itinerary2.nodes[2].data.tags.name).equal('p5');
+    });
+
     it('No route itinerary', () => {
         const itineraryWithoutStairs = router.getShortestPath(itineraryStart, itineraryEnd, { useStairs: false });
         expect(itineraryWithoutStairs).is.undefined;

package/src/osrm/OsrmUtils.spec.js

@@ -14,7 +14,7 @@ import {
     itineraryStart, itineraryEnd
 } from '../../../geo/tests/CommonTest';
 
-describe('OsmRouter - Multi-level itinerary', () => {
+describe('OsrmUtils', () => {
 
 
     it('OSRM JSON to Itinerary', () => {