@wemap/osm 2.7.14 → 3.0.0

package/package.json

@@ -11,7 +11,7 @@
         "directory": "packages/osm"
     },
     "name": "@wemap/osm",
-    "version": "2.7.14",
+    "version": "3.0.0",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -26,11 +26,11 @@
     ],
     "license": "ISC",
     "dependencies": {
-        "@wemap/geo": "^2.7.9",
-        "@wemap/graph": "^2.7.9",
-        "@wemap/logger": "^2.7.7",
+        "@wemap/geo": "^3.0.0",
+        "@wemap/graph": "^3.0.0",
+        "@wemap/logger": "^3.0.0",
         "lodash.isnumber": "^3.0.3",
         "sax": "^1.2.4"
     },
-    "gitHead": "a196bbcae92e89add1caa2d532c9ae8bf583e42e"
+    "gitHead": "2bbb4840a99b90eaae989291cb728ac87cebade8"
 }

package/src/model/OsmModel.spec.js

@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 
-import { WGS84 } from '@wemap/geo';
+import { Coordinates } from '@wemap/geo';
 import Logger from '@wemap/logger';
 
 import OsmModel from './OsmModel';
@@ -12,10 +12,10 @@ Logger.enable(false);
 describe('OsmModel', () => {
 
     const nodes = [
-        new OsmNode(1, new WGS84(45, 5), {name: 'p1'}),
-        new OsmNode(2, new WGS84(46, 5.5), {name: 'p2'}),
-        new OsmNode(3, new WGS84(46.1, 5.3), {name: 'p3'}),
-        new OsmNode(4, new WGS84(46, 5.6), {name: 'p4'})
+        new OsmNode(1, new Coordinates(45, 5), {name: 'p1'}),
+        new OsmNode(2, new Coordinates(46, 5.5), {name: 'p2'}),
+        new OsmNode(3, new Coordinates(46.1, 5.3), {name: 'p3'}),
+        new OsmNode(4, new Coordinates(46, 5.6), {name: 'p4'})
     ];
 
     const ways = [

package/src/model/OsmNode.spec.js

@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 
-import { WGS84 } from '@wemap/geo';
+import { Coordinates } from '@wemap/geo';
 
 import OsmNode from './OsmNode';
 
@@ -8,7 +8,7 @@ describe('OsmNode', () => {
 
     it('creation', () => {
         expect(() => new OsmNode(0)).not.throw(Error);
-        expect(() => new OsmNode(0, new WGS84(0, 0))).not.throw(Error);
+        expect(() => new OsmNode(0, new Coordinates(0, 0))).not.throw(Error);
     });
 
     it('getters', () => {

package/src/model/OsmParser.js

@@ -2,7 +2,7 @@
 import sax from 'sax';
 
 import {
-    Level, WGS84
+    Level, Coordinates
 } from '@wemap/geo';
 
 import OsmModel from './OsmModel';
@@ -86,7 +86,7 @@ class OsmParser {
     static parseNode(attr) {
         return new OsmNode(
             Number(attr.id),
-            new WGS84(Number(attr.lat), Number(attr.lon)));
+            new Coordinates(Number(attr.lat), Number(attr.lon)));
     }
 
     static parseWay(attr) {

package/src/network/OsmRouter.spec.js

@@ -4,7 +4,7 @@ import fs from 'fs';
 import path from 'path';
 
 import {
-    Level, WGS84
+    Level, Coordinates
 } from '@wemap/geo';
 import { Node } from '@wemap/graph';
 
@@ -12,8 +12,8 @@ import OsmParser from '../model/OsmParser';
 import OsmRouter from './OsmRouter';
 import OsmNetwork from './OsmNetwork';
 
-const itineraryStart = new WGS84(43.6092754, 3.8842306, null, new Level(2));
-const itineraryEnd = new WGS84(43.6092602, 3.8842669, null, new Level(1));
+const itineraryStart = new Coordinates(43.6092754, 3.8842306, null, new Level(2));
+const itineraryEnd = new Coordinates(43.6092602, 3.8842669, null, new Level(1));
 
 
 const loadNetwork = fileName => {
@@ -75,8 +75,8 @@ 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 start = new Coordinates(43.609219, 3.8841743, null, new Level(2));
+        const end = new Coordinates(43.6091722, 3.8842355, null, new Level(2));
         const itinerary2 = router.getShortestPath(start, end);
 
         expect(itinerary2.nodes.length).equal(3);
@@ -87,9 +87,8 @@ describe('OsmRouter - Multi-level itinerary', () => {
     it('do not use stairs', () => {
         const itineraryWithoutStairs = router.getShortestPath(itineraryStart, itineraryEnd, { useStairs: false });
         expect(itineraryWithoutStairs.nodes.length).equal(11);
-        expect(itineraryWithoutStairs.nodes[6].data.isElevator).is.true;
-        expect(itineraryWithoutStairs.nodes[7].data.isElevator).is.true;
-        expect(itineraryWithoutStairs.edges[6].data.isElevator).is.true;
+        expect(itineraryWithoutStairs.nodes[6].data.tags.highway).equal('elevator');
+        expect(itineraryWithoutStairs.nodes[7].data.tags.highway).equal('elevator');
     });
 
 });
@@ -101,8 +100,8 @@ describe('OsmRouter - One Way itinerary', () => {
 
     it('do not use oneway', () => {
 
-        const start = new WGS84(43.6094542, 3.8842072);
-        const end = new WGS84(43.6093792, 3.8841889);
+        const start = new Coordinates(43.6094542, 3.8842072);
+        const end = new Coordinates(43.6093792, 3.8841889);
 
         const itinerary = router.getShortestPath(start, end);
         expect(itinerary).is.not.undefined;
@@ -122,8 +121,8 @@ describe('OsmRouter - Conveying', () => {
 
     it('do not use oneway conveying', () => {
 
-        const start = new WGS84(48.8445715, 2.3718927, null, new Level(0));
-        const end = new WGS84(48.84443728652394, 2.3721685669363524, null, new Level(-1));
+        const start = new Coordinates(48.8445715, 2.3718927, null, new Level(0));
+        const end = new Coordinates(48.84443728652394, 2.3721685669363524, null, new Level(-1));
 
         const itinerary = router.getShortestPath(start, end);
         expect(itinerary).is.not.undefined;

package/src/osrm/OsrmUtils.js

@@ -1,6 +1,6 @@
 /* eslint-disable max-statements */
 import {
-    Level, WGS84
+    Level, Coordinates
 } from '@wemap/geo';
 import {
     Edge, Node, Itinerary, Step, Network
@@ -25,7 +25,7 @@ class OsrmUtils {
 
             const {
                 nodes, length, nextEdgeData, nextBearing, previousBearing, angle, node,
-                duration, levelChange, edges
+                duration, levelChange
             } = itinerarySteps[i];
 
             const edgeData = i !== lastStepId ? nextEdgeData : itinerary.edges[lastStepId];
@@ -48,7 +48,7 @@ class OsrmUtils {
                 maneuver: {
                     bearing_before: rad2deg(bearingBefore),
                     bearing_after: rad2deg(bearingAfter),
-                    location: OsrmUtils.wgs84ToJson(node.coords),
+                    location: OsrmUtils.coordinatesToJson(node.coords),
                     type
                 },
                 wemap: {}
@@ -66,17 +66,10 @@ class OsrmUtils {
             }
 
             if (i !== lastStepId) {
-                osrmStep.wemap.nextEdgeData = {
+                osrmStep.wemap.nextWay = {
                     id: nextEdgeData.id,
                     tags: nextEdgeData.tags
                 };
-                if (edges[0].data instanceof OsmNode) {
-                    osrmStep.wemap.nextEdgeData.type = 'node';
-                    osrmStep.wemap.nextEdgeData.coords = OsrmUtils.wgs84ToJson(edges[0].data.coords);
-                }
-                if (edges[0].data instanceof OsmWay) {
-                    osrmStep.wemap.nextEdgeData.type = 'way';
-                }
             }
 
             // The first modifier is not mandatory by OSRM.
@@ -115,8 +108,8 @@ class OsrmUtils {
     /**
      * Generate Itinerary from OSRM JSON, start and end.
      * @param {Object} json JSON file provided by OSRM.
-     * @param {WGS84} start itinerary start
-     * @param {WGS84} end itinerary end
+     * @param {Coordinates} start itinerary start
+     * @param {Coordinates} end itinerary end
      */
     static createItineraryFromJson(json, start, end) {
         const itinerary = new Itinerary();
@@ -134,7 +127,7 @@ class OsrmUtils {
         let previousNode;
         const { coordinates } = geometry;
         for (let i = 0; i < coordinates.length; i++) {
-            const node = new Node(OsrmUtils.jsonToWgs84(coordinates[i]));
+            const node = new Node(OsrmUtils.jsonToCoordinates(coordinates[i]));
             itinerary.nodes.push(node);
 
             if (previousNode) {
@@ -182,7 +175,7 @@ class OsrmUtils {
                 coordinates = [coordinates[0]];
             }
             coordinates.forEach(coords => {
-                const wgs84 = OsrmUtils.jsonToWgs84(coords);
+                const wgs84 = OsrmUtils.jsonToCoordinates(coords);
                 const node = itinerary.getNodeByCoords(wgs84);
                 if (!node) {
                     throw new Error('Cannot parse these step coordinates, '
@@ -232,18 +225,12 @@ class OsrmUtils {
                 }
 
                 const firstEdge = step.edges[0];
-                if (jsonStep.wemap.nextEdgeData && firstEdge) {
+                if (jsonStep.wemap.nextWay && firstEdge) {
                     const {
-                        coords, id, tags, type
-                    } = jsonStep.wemap.nextEdgeData;
-                    if (type === 'node') {
-                        firstEdge.data = new OsmNode(id, OsrmUtils.jsonToWgs84(coords), tags);
-                    } else if (type === 'way') {
-                        firstEdge.data = new OsmWay(id, tags);
-                    }
-                    if (firstEdge.data) {
-                        firstEdge.data.level = firstEdge.level;
-                    }
+                        id, tags
+                    } = jsonStep.wemap.nextWay;
+                    firstEdge.data = new OsmWay(id, tags);
+                    firstEdge.data.level = firstEdge.level;
                 }
             }
 
@@ -279,16 +266,16 @@ class OsrmUtils {
         return 'u turn';
     }
 
-    static wgs84ToJson(wgs84) {
-        const output = [wgs84.lng, wgs84.lat];
-        if (wgs84.level) {
-            output.push(wgs84.level.toString());
+    static coordinatesToJson(coordinates) {
+        const output = [coordinates.lng, coordinates.lat];
+        if (coordinates.level) {
+            output.push(coordinates.level.toString());
         }
         return output;
     }
 
-    static jsonToWgs84(json) {
-        const output = new WGS84(json[1], json[0]);
+    static jsonToCoordinates(json) {
+        const output = new Coordinates(json[1], json[0]);
         if (json.length > 2) {
             output.level = Level.fromString(json[2]);
         }
@@ -296,7 +283,7 @@ class OsrmUtils {
     }
 
     static nodesToJsonCoords(nodes) {
-        return nodes.map(node => OsrmUtils.wgs84ToJson(node.coords));
+        return nodes.map(node => OsrmUtils.coordinatesToJson(node.coords));
     }
 
 

package/src/osrm/OsrmUtils.spec.js

@@ -4,14 +4,13 @@ import fs from 'fs';
 import path from 'path';
 
 import {
-    Level, WGS84
+    Level, Coordinates
 } from '@wemap/geo';
 
 import OsmParser from '../model/OsmParser';
 import OsmRouter from '../network/OsmRouter';
 import OsmNetwork from '../network/OsmNetwork';
 import OsrmUtils from './OsrmUtils';
-import OsmNode from '../model/OsmNode';
 
 
 const load = fileName => {
@@ -36,8 +35,8 @@ describe('OsrmUtils - itineraryToOsrmJson', () => {
             network, router
         } = load('bureaux-wemap-montpellier-network.osm');
 
-        wemapStart = new WGS84(43.6092754, 3.8842306, null, new Level(2));
-        wemapEnd = new WGS84(43.6092602, 3.8842669, null, new Level(1));
+        wemapStart = new Coordinates(43.6092754, 3.8842306, null, new Level(2));
+        wemapEnd = new Coordinates(43.6092602, 3.8842669, null, new Level(1));
         const itinerary = router.getShortestPath(wemapStart, wemapEnd);
         wemapItinerary = itinerary;
 
@@ -57,7 +56,7 @@ describe('OsrmUtils - itineraryToOsrmJson', () => {
         for (let i = 1; i < 11; i++) {
             expect(
                 network.getNodeByName('p' + (i + 6)).coords.equalsTo(
-                    OsrmUtils.jsonToWgs84(coordinates[i]))
+                    OsrmUtils.jsonToCoordinates(coordinates[i]))
             ).true;
         }
 
@@ -69,7 +68,7 @@ describe('OsrmUtils - itineraryToOsrmJson', () => {
             const {
                 location, type
             } = steps[i].maneuver;
-            expect(itinerarySteps[i].node.coords.equalsTo(OsrmUtils.jsonToWgs84(location))).true;
+            expect(itinerarySteps[i].node.coords.equalsTo(OsrmUtils.jsonToCoordinates(location))).true;
 
             let expectedType;
             switch (i) {
@@ -164,8 +163,8 @@ describe('OsrmUtils - createItineraryFromJson', () => {
 
         const json = JSON.parse(fileString);
 
-        const start = new WGS84(43.6007871, 3.8757218000000004);
-        const end = new WGS84(43.598877, 3.873866);
+        const start = new Coordinates(43.6007871, 3.8757218000000004);
+        const end = new Coordinates(43.598877, 3.873866);
 
         const itinerary = OsrmUtils.createItineraryFromJson(json, start, end);
 
@@ -178,7 +177,7 @@ describe('OsrmUtils - createItineraryFromJson', () => {
 
         let step;
         step = steps[0];
-        expect(WGS84.equalsTo(step.location, new WGS84(43.600777, 3.875607))).true;
+        expect(Coordinates.equalsTo(step.location, new Coordinates(43.600777, 3.875607))).true;
         expect(OsrmUtils.getModifierFromAngle(step.angle)).equals('left');
         expect(step.nodes.length).equals(6);
         expect(step.edges.length).equals(5);
@@ -187,7 +186,7 @@ describe('OsrmUtils - createItineraryFromJson', () => {
         expect(step.name).equals('');
 
         step = steps[1];
-        expect(WGS84.equalsTo(step.location, new WGS84(43.599881, 3.876396))).true;
+        expect(Coordinates.equalsTo(step.location, new Coordinates(43.599881, 3.876396))).true;
         expect(OsrmUtils.getModifierFromAngle(step.angle)).equals('right');
         expect(step.nodes.length).equals(12);
         expect(step.edges.length).equals(11);
@@ -196,7 +195,7 @@ describe('OsrmUtils - createItineraryFromJson', () => {
         expect(step.name).equals('Boulevard Vieussens');
 
         step = steps[2];
-        expect(WGS84.equalsTo(step.location, new WGS84(43.599577, 3.874655))).true;
+        expect(Coordinates.equalsTo(step.location, new Coordinates(43.599577, 3.874655))).true;
         expect(OsrmUtils.getModifierFromAngle(step.angle)).equals('left');
         expect(step.nodes.length).equals(2);
         expect(step.edges.length).equals(1);
@@ -205,7 +204,7 @@ describe('OsrmUtils - createItineraryFromJson', () => {
         expect(step.name).equals('Impasse Bizeray');
 
         step = steps[3];
-        expect(WGS84.equalsTo(step.location, new WGS84(43.599063, 3.874623))).true;
+        expect(Coordinates.equalsTo(step.location, new Coordinates(43.599063, 3.874623))).true;
         expect(OsrmUtils.getModifierFromAngle(step.angle)).equals('right');
         expect(step.nodes.length).equals(2);
         expect(step.edges.length).equals(1);
@@ -214,7 +213,7 @@ describe('OsrmUtils - createItineraryFromJson', () => {
         expect(step.name).equals('Rue du Docteur Louis Perrier');
 
         step = steps[4];
-        expect(WGS84.equalsTo(step.location, new WGS84(43.59906, 3.873865))).true;
+        expect(Coordinates.equalsTo(step.location, new Coordinates(43.59906, 3.873865))).true;
         expect(OsrmUtils.getModifierFromAngle(step.angle)).equals('left');
         expect(step.nodes.length).equals(1);
         expect(step.edges.length).equals(0);
@@ -243,8 +242,8 @@ describe('OsrmUtils - createItineraryFromJson', () => {
 
         const json = JSON.parse(fileString);
 
-        const start = new WGS84(43.6007871, 3.8757218000000004);
-        const end = new WGS84(43.598877, 3.873866);
+        const start = new Coordinates(43.6007871, 3.8757218000000004);
+        const end = new Coordinates(43.598877, 3.873866);
 
         const itinerary = OsrmUtils.createItineraryFromJson(json, start, end);
 
@@ -290,34 +289,14 @@ describe('OsrmUtils - createItineraryFromJson', () => {
 
         const json = JSON.parse(fileString);
 
-        const start = new WGS84(43.6007871, 3.8757218000000004);
-        const end = new WGS84(43.598877, 3.873866);
+        const start = new Coordinates(43.6007871, 3.8757218000000004);
+        const end = new Coordinates(43.598877, 3.873866);
 
         expect(() => OsrmUtils.createItineraryFromJson(json, start, end)).throw(Error);
     });
 
 });
 
-describe('OsrmUtils - itineraryToOsrmJson - createItineraryFromJson - elevator', () => {
-
-    it('With levels (Bureaux Wemap)', () => {
-
-        const { router } = load('bureaux-wemap-montpellier-network.osm');
-
-        const start = new WGS84(43.6092754, 3.8842306, null, new Level(2));
-        const end = new WGS84(43.60949854, 3.88452048, null, new Level(0));
-        const itinerary = router.getShortestPath(start, end);
-
-        const osrmJson = OsrmUtils.itineraryToOsrmJson(itinerary);
-        const jsonSteps = osrmJson.routes[0].legs[0].steps;
-
-        expect(jsonSteps[4].wemap.nextEdgeData.type).equals('node');
-
-        const itineraryBis = OsrmUtils.createItineraryFromJson(osrmJson, start, end);
-        expect(itineraryBis.steps[4].edges[0].data).instanceOf(OsmNode);
-    });
-});
-
 describe('OsrmUtils - Output JSON', () => {
 
     it('noRouteFoundJson', () => {