@wemap/osm 0.2.11 → 0.3.1

package/assets/bureaux-wemap-montpellier-network.osm

@@ -15,18 +15,24 @@
   <node id='-440468' action='modify' visible='true' lat='43.60911942685' lon='3.88422017773'>
     <tag k='name' v='p4' />
   </node>
-  <node id='-440470' action='modify' visible='true' lat='43.60935581261' lon='3.88428577699' />
+  <node id='-440470' action='modify' visible='true' lat='43.60935581261' lon='3.88428577699'>
+    <tag k='name' v='p22' />
+  </node>
   <node id='-440472' action='modify' visible='true' lat='43.60919651074' lon='3.88412853633'>
     <tag k='name' v='p1' />
   </node>
-  <node id='-440474' action='modify' visible='true' lat='43.60931199709' lon='3.88413083832' />
+  <node id='-440474' action='modify' visible='true' lat='43.60931199709' lon='3.88413083832'>
+    <tag k='name' v='p25' />
+  </node>
   <node id='-440476' action='modify' visible='true' lat='43.60917494597' lon='3.88421731753'>
     <tag k='name' v='p6' />
   </node>
   <node id='-440478' action='modify' visible='true' lat='43.60918883875' lon='3.88412626772'>
     <tag k='name' v='p2' />
   </node>
-  <node id='-440480' action='modify' visible='true' lat='43.60936726345' lon='3.88427546746' />
+  <node id='-440480' action='modify' visible='true' lat='43.60936726345' lon='3.88427546746'>
+    <tag k='name' v='p23' />
+  </node>
   <node id='-440482' action='modify' visible='true' lat='43.60917216742' lon='3.8842355275'>
     <tag k='name' v='p5' />
   </node>
@@ -48,10 +54,26 @@
   <node id='-440494' action='modify' visible='true' lat='43.60931232238' lon='3.88427309743'>
     <tag k='name' v='p15' />
   </node>
-  <node id='-440496' action='modify' visible='true' lat='43.60936673756' lon='3.88428907078' />
+  <node id='-440496' action='modify' visible='true' lat='43.60936673756' lon='3.88428907078'>
+    <tag k='name' v='p24' />
+  </node>
   <node id='-440498' action='modify' visible='true' lat='43.60926807571' lon='3.884260391'>
     <tag k='name' v='p16' />
   </node>
+  <node id='-441184' action='modify' visible='true' lat='43.60932786117' lon='3.88427765877'>
+    <tag k='name' v='p18' />
+  </node>
+  <node id='-441187' action='modify' visible='true' lat='43.60933232537' lon='3.88424831515'>
+    <tag k='highway' v='elevator' />
+    <tag k='level' v='0;2' />
+    <tag k='name' v='p19' />
+  </node>
+  <node id='-441210' action='modify' visible='true' lat='43.60932786111' lon='3.8842776591'>
+    <tag k='name' v='p17' />
+  </node>
+  <node id='-441262' action='modify' visible='true' lat='43.60932198746' lon='3.8843159771'>
+    <tag k='name' v='p21' />
+  </node>
   <way id='-440499' action='modify' visible='true'>
     <nd ref='-440476' />
     <nd ref='-440460' />
@@ -64,6 +86,7 @@
     <nd ref='-440464' />
     <nd ref='-440466' />
     <nd ref='-440484' />
+    <nd ref='-441184' />
     <nd ref='-440470' />
     <nd ref='-440480' />
     <tag k='highway' v='footway' />
@@ -98,6 +121,7 @@
   <way id='-440504' action='modify' visible='true'>
     <nd ref='-440492' />
     <nd ref='-440494' />
+    <nd ref='-441210' />
     <nd ref='-440496' />
     <tag k='highway' v='footway' />
     <tag k='level' v='1' />
@@ -108,4 +132,22 @@
     <tag k='highway' v='footway' />
     <tag k='level' v='1' />
   </way>
+  <way id='-441188' action='modify' visible='true'>
+    <nd ref='-441184' />
+    <nd ref='-441187' />
+    <tag k='highway' v='footway' />
+    <tag k='level' v='2' />
+  </way>
+  <way id='-441214' action='modify' visible='true'>
+    <nd ref='-441210' />
+    <nd ref='-441187' />
+    <tag k='highway' v='footway' />
+    <tag k='level' v='1' />
+  </way>
+  <way id='-441263' action='modify' visible='true'>
+    <nd ref='-441187' />
+    <nd ref='-441262' />
+    <tag k='highway' v='footway' />
+    <tag k='level' v='0' />
+  </way>
 </osm>

package/assets/one-way.osm

@@ -0,0 +1,46 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<osm version='0.6' generator='JOSM'>
+  <node id='-441557' action='modify' visible='true' lat='43.60942861314' lon='3.88420107589'>
+    <tag k='name' v='p1' />
+  </node>
+  <node id='-441558' action='modify' visible='true' lat='43.60938929783' lon='3.8841913836'>
+    <tag k='name' v='p3' />
+  </node>
+  <node id='-441559' action='modify' visible='true' lat='43.60940277907' lon='3.88421907562'>
+    <tag k='name' v='p5' />
+  </node>
+  <node id='-441560' action='modify' visible='true' lat='43.60937924953' lon='3.88418893318' />
+  <node id='-441561' action='modify' visible='true' lat='43.6094255609' lon='3.88422469196'>
+    <tag k='name' v='p4' />
+  </node>
+  <node id='-441562' action='modify' visible='true' lat='43.60945421917' lon='3.88420719584' />
+  <node id='-441563' action='modify' visible='true' lat='43.60940583132' lon='3.88419545955'>
+    <tag k='name' v='p2' />
+  </node>
+  <node id='-441564' action='modify' visible='true' lat='43.60944417022' lon='3.88420491113'>
+    <tag k='name' v='p0' />
+  </node>
+  <way id='-441565' action='modify' visible='true'>
+    <nd ref='-441557' />
+    <nd ref='-441563' />
+    <tag k='highway' v='footway' />
+    <tag k='oneway' v='yes' />
+  </way>
+  <way id='-441566' action='modify' visible='true'>
+    <nd ref='-441563' />
+    <nd ref='-441558' />
+    <tag k='highway' v='footway' />
+  </way>
+  <way id='-441567' action='modify' visible='true'>
+    <nd ref='-441564' />
+    <nd ref='-441557' />
+    <tag k='highway' v='footway' />
+  </way>
+  <way id='-441568' action='modify' visible='true'>
+    <nd ref='-441557' />
+    <nd ref='-441561' />
+    <nd ref='-441559' />
+    <nd ref='-441563' />
+    <tag k='highway' v='footway' />
+  </way>
+</osm>

package/package.json

@@ -11,7 +11,7 @@
         "directory": "packages/osm"
     },
     "name": "@wemap/osm",
-    "version": "0.2.11",
+    "version": "0.3.1",
     "bugs": {
         "url": "https://github.com/wemap/wemap-utils-js/issues"
     },
@@ -26,10 +26,10 @@
     ],
     "license": "ISC",
     "dependencies": {
-        "@wemap/geo": "^0.3.9",
+        "@wemap/geo": "^1.0.0",
         "@wemap/logger": "^0.1.6",
         "lodash.isnumber": "^3.0.3",
         "sax": "^1.2.4"
     },
-    "gitHead": "84a60e64b0968bc45f0f76cc26c08e165dbe6985"
+    "gitHead": "2a8dc4304fae3f175819ed1a1561a818e871cf44"
 }

package/src/network/OsmNetwork.js

@@ -1,6 +1,8 @@
+import { Level } from '@wemap/geo';
 import {
     Edge, Node, Network
-} from '@wemap/geo';
+} from '@wemap/graph';
+import Logger from '@wemap/logger';
 
 
 const HIGHWAYS_PEDESTRIANS = ['footway', 'steps'];
@@ -45,9 +47,73 @@ class OsmNetwork extends Network {
 
         });
 
+        for (let i = 0; i < networkModel.nodes.length; i++) {
+            const node = networkModel.nodes[i];
+            if (node.data.tags.highway === 'elevator'
+                && node.coords.level
+                && node.coords.level.isRange) {
+
+                // We have to clone this node for each connected edge
+                OsmNetwork.createNodesAndEdgesFromElevator(networkModel, node);
+            }
+
+        }
+
         return networkModel;
     }
 
+    static createNodesAndEdgesFromElevator(networkModel, node) {
+
+        const createdNodes = [];
+        const isLevelAlreadyCreated = level => createdNodes.some(createdNode => Level.equalsTo(level, createdNode.coords.level));
+
+        // Create nodes from node.edges
+        node.edges.forEach(edge => {
+            if (edge.level.isRange) {
+                Logger.error('Cannot handle this elevator edge due to ambiguity');
+                return;
+            }
+
+            if (isLevelAlreadyCreated(edge.level)) {
+                return;
+            }
+
+            const newNode = node.clone();
+            newNode.coords = node.coords.clone();
+            newNode.coords.level = edge.level ? edge.level.clone() : null;
+
+            const otherNode = edge.node1 === node ? edge.node2 : edge.node1;
+            otherNode.edges = otherNode.edges.filter(_edge => _edge !== edge);
+            const modifiedEdge = new Edge(newNode, otherNode, edge.data, edge.level);
+            networkModel.edges.push(modifiedEdge);
+
+            createdNodes.push(newNode);
+            networkModel.nodes.push(newNode);
+        });
+
+        // Create edges from createdNodes
+        for (let i = 0; i < createdNodes.length; i++) {
+            for (let j = i + 1; j < createdNodes.length; j++) {
+
+                const createdNode1 = createdNodes[i];
+                const createdNode2 = createdNodes[j];
+
+                const newEdge = new Edge(
+                    createdNode1,
+                    createdNode2,
+                    createdNode1.data,
+                    new Level(createdNode1.coords.level.val, createdNode2.coords.level.val)
+                );
+                networkModel.edges.push(newEdge);
+            }
+        }
+
+        networkModel.nodes = networkModel.nodes.filter(_node => _node !== node);
+        networkModel.edges = networkModel.edges.filter(edge =>
+            !node.edges.some(_edge => _edge === edge)
+        );
+    }
+
     getNodeById(id) {
         return this.nodes.find(node => node.data.id === id);
     }

package/src/network/OsmRouter.js

@@ -1,4 +1,6 @@
-import { GraphRouter } from '@wemap/geo';
+import {
+    GraphRouter, Utils
+} from '@wemap/graph';
 
 const DEFAULT_OPTIONS = { useStairs: true };
 
@@ -17,7 +19,36 @@ class OsmRouter extends GraphRouter {
                 );
         };
 
-        return super.getShortestPath(start, end, edgeSelectionFilter);
+        const edgeWeightFn = edge => {
+            if (edge.data && edge.data.tags && edge.data.tags.highway === 'elevator') {
+                return 30;
+            }
+            return Utils.getDurationFromLength(edge.length);
+        };
+
+        const acceptOneWayFn = (edge, reversed) => {
+            if (edge.data && edge.data.tags) {
+                const {
+                    oneway, highway, conveying
+                } = edge.data.tags;
+                if (reversed && (oneway === 'yes' || oneway === 'true' || oneway === '1')) {
+                    return false;
+                }
+                if (conveying && highway) {
+                    if (conveying === 'forward' && reversed) {
+                        return false;
+                    } if (conveying === 'backward' && !reversed) {
+                        return false;
+                    } if (conveying === 'yes' && reversed) {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        };
+
+
+        return super.getShortestPath(start, end, edgeSelectionFilter, edgeWeightFn, acceptOneWayFn);
     }
 
 }

package/src/network/OsmRouter.spec.js

@@ -4,8 +4,9 @@ import fs from 'fs';
 import path from 'path';
 
 import {
-    Node, WGS84, Level
+    Level, WGS84
 } from '@wemap/geo';
+import { Node } from '@wemap/graph';
 
 import OsmParser from '../model/OsmParser';
 import OsmRouter from './OsmRouter';
@@ -13,8 +14,21 @@ import OsmNetwork from './OsmNetwork';
 
 import {
     itineraryStart, itineraryEnd
-} from '../../../geo/tests/CommonTest';
+} from '../../../graph/tests/CommonTest';
+
+const verifyNodesOrder = (nodes, names) => {
+    expect(nodes.length).equals(names.length);
+    for (let i = 0; i < names.length; i++) {
+        if (!nodes[i].data || !nodes[i].data.tags || !nodes[i].data.tags.name) {
+            expect(names[i]).is.null;
+        } else {
+            expect(names[i]).equals(nodes[i].data.tags.name);
+        }
+    }
+};
 
+const generateNodeNames = (start, end) =>
+    new Array(end - start + 1).fill().map((_, idx) => 'p' + (idx + start));
 
 describe('OsmRouter - Multi-level itinerary', () => {
 
@@ -37,13 +51,8 @@ describe('OsmRouter - Multi-level itinerary', () => {
     });
 
     it('Router return shortest path', () => {
-
         expect(itinerary.nodes.length).equal(11);
-
-        for (let i = 1; i <= 10; i++) {
-            expect(itinerary.nodes[i].data).equal(p[i + 6].data);
-        }
-
+        verifyNodesOrder(itinerary.nodes, [null, ...generateNodeNames(7, 16)]);
     });
 
     it('Verify steps', () => {
@@ -51,15 +60,11 @@ describe('OsmRouter - Multi-level itinerary', () => {
         const steps = itinerary.steps;
         expect(steps.length).equal(10);
 
-        expect(steps[0].nodes[1].data).equal(p[7].data);
-        expect(steps[0].nodes[2].data).equal(p[8].data);
-
+        verifyNodesOrder(steps[0].nodes, [null, 'p7', 'p8']);
         for (let i = 2; i <= 9; i++) {
-            expect(steps[i - 1].nodes[0].data).equal(p[i + 6].data);
-            expect(steps[i - 1].nodes[1].data).equal(p[i + 7].data);
+            verifyNodesOrder(steps[i - 1].nodes, ['p' + [i + 6], 'p' + [i + 7]]);
         }
-
-        expect(steps[9].nodes[0].data).equal(p[16].data);
+        verifyNodesOrder(steps[9].nodes, ['p16']);
     });
 
 
@@ -74,8 +79,35 @@ describe('OsmRouter - Multi-level itinerary', () => {
         expect(itinerary2.nodes[2].data.tags.name).equal('p5');
     });
 
-    it('No route itinerary', () => {
+    it('do not use stairs', () => {
         const itineraryWithoutStairs = router.getShortestPath(itineraryStart, itineraryEnd, { useStairs: false });
-        expect(itineraryWithoutStairs).is.undefined;
+        expect(itineraryWithoutStairs.nodes.length).equal(11);
+        expect(itineraryWithoutStairs.nodes[6].data.tags.highway).equal('elevator');
+        expect(itineraryWithoutStairs.nodes[7].data.tags.highway).equal('elevator');
+    });
+
+});
+
+describe('OsmRouter - One Way itinerary', () => {
+
+    const filePath = path.resolve(__dirname, '../../assets/one-way.osm');
+    const osmXmlString = fs.readFileSync(filePath, 'utf8');
+
+    const osmModel = OsmParser.parseOsmXmlString(osmXmlString);
+    const networkModel = OsmNetwork.fromOsmModel(osmModel);
+    const router = new OsmRouter(networkModel);
+
+    it('do not use oneway', () => {
+
+        const start = new WGS84(43.6094542, 3.8842072);
+        const end = new WGS84(43.6093792, 3.8841889);
+
+        const itinerary = router.getShortestPath(start, end);
+        expect(itinerary).is.not.undefined;
+        verifyNodesOrder(itinerary.nodes, ['p0', 'p1', 'p2', 'p3']);
+
+        const itineraryOtherWay = router.getShortestPath(end, start);
+        expect(itineraryOtherWay).is.not.undefined;
+        verifyNodesOrder(itineraryOtherWay.nodes, ['p3', 'p2', 'p5', 'p4', 'p1', 'p0']);
     });
 });

package/src/osrm/OsrmUtils.js

@@ -1,7 +1,10 @@
 /* eslint-disable max-statements */
 import {
-    WGS84, Itinerary, Node, Edge, Level
+    Level, WGS84
 } from '@wemap/geo';
+import {
+    Edge, Node, Itinerary
+} from '@wemap/graph';
 import {
     rad2deg, Utils as MathUtils
 } from '@wemap/maths';

package/src/osrm/OsrmUtils.spec.js

@@ -12,7 +12,7 @@ import OsrmUtils from './OsrmUtils';
 
 import {
     itineraryStart, itineraryEnd
-} from '../../../geo/tests/CommonTest';
+} from '../../../graph/tests/CommonTest';
 
 describe('OsrmUtils', () => {