@wemap/geo 0.2.1 → 0.3.0

package/src/graph/MapMatching.spec.js

@@ -1,72 +1,128 @@
-import chai from 'chai';
-import chaiAlmost from 'chai-almost';
+import { expect } from 'chai';
 
 import {
     WGS84, WGS84UserPosition
 } from '@wemap/geo';
 
-import Edge from './Edge';
-import Node from './Node';
-import Network from './Network';
 import MapMatching from './MapMatching';
 
-const expect = chai.expect;
-chai.use(chaiAlmost());
-
-
-function edgeFromTwoNodes(node1, node2) {
-    if (!(node1 instanceof Node)) {
-        throw new TypeError('node1 is not an instance of Node');
-    }
-
-    if (!(node2 instanceof Node)) {
-        throw new TypeError('node2 is not an instance of Node');
-    }
-    const edge = new Edge(node1, node2);
-    node1.edges.push(edge);
-    node2.edges.push(edge);
-    return edge;
-}
-
-function createNetworkFromEdgesAndNodes(edges, nodes) {
-    const network = new Network();
-    network.edges = edges;
-    network.nodes = nodes;
-    return network;
-}
-
-describe('matching', () => {
-    it('Should return the good value', () => {
-
-        const n1 = new Node(new WGS84(43.6091883, 3.8841242));
-        const n2 = new Node(new WGS84(43.6091709, 3.8842382));
-        const n3 = new Node(new WGS84(43.6091288, 3.884226));
-        const n4 = new Node(new WGS84(43.6091461, 3.884112));
-        const e1 = edgeFromTwoNodes(n1, n2);
-        const e2 = edgeFromTwoNodes(n2, n3);
-        const e3 = edgeFromTwoNodes(n3, n4);
-        const e4 = edgeFromTwoNodes(n4, n1);
-        const network = createNetworkFromEdgesAndNodes([e1, e2, e3, e4], [n1, n2, n3, n4]);
-
-        const mapMatching = new MapMatching(network);
-        mapMatching.maxAngleBearing = 30;
+import { network } from '../../tests/CommonTest';
+import Level from '../coordinates/Level';
+
+describe('MapMatching', () => {
+
+    const mapMatching = new MapMatching(network);
+
+    const location = new WGS84UserPosition(43.6091762, 3.8841239, null, new Level(2));
 
-        const location = new WGS84UserPosition(43.6091762, 3.8841239);
+    it('without bearing', () => {
+        const result = mapMatching.getProjection(location, true, false).projection;
+        const expected = new WGS84(43.609176389330685, 3.8841226728537976, null, new Level(2));
+        expect(result.distanceTo(expected)).to.below(0.01);
+        expect(Level.equalsTo(expected.level, result.level)).true;
+    });
 
+    it('with bearing', () => {
+        mapMatching.maxAngleBearing = 30;
         location.bearing = 101.9;
-        const projection1 = mapMatching.getProjection(location);
-        const result1 = projection1.projection;
-        const expected1 = new WGS84(43.609187832342556, 3.884127262759803);
-        const distance1 = result1.distanceTo(expected1);
-        expect(distance1).to.below(0.01);
+        const result = mapMatching.getProjection(location).projection;
+        const expected = new WGS84(43.60918861773314, 3.8841274925288447, null, new Level(2));
+        expect(result.distanceTo(expected)).to.below(0.01);
+        expect(Level.equalsTo(expected.level, result.level)).true;
+    });
+
+    it('matching node levels', () => {
+        let currentPosition, projection;
+
+        /**
+         * Projection on Nodes
+         */
+
+        currentPosition = new WGS84(43.6091773, 3.8842584, null, null);
+        projection = mapMatching.getProjection(currentPosition);
+        expect(projection).is.null;
+
+        currentPosition = new WGS84(43.6091773, 3.8842584, null, new Level(1));
+        projection = mapMatching.getProjection(currentPosition, true, false);
+        expect(projection).is.not.null;
+        expect(projection.projection.level.isInside(1)).true;
+
+        currentPosition = new WGS84(43.6091773, 3.8842584, null, new Level(2));
+        projection = mapMatching.getProjection(currentPosition, true, false);
+        expect(projection).is.not.null;
+        expect(projection.projection.level.isInside(2)).true;
+
+    });
+
+    it('matching edge levels', () => {
+        let currentPosition, projection;
+
+        /**
+         * Projection on Edges
+         */
 
+        currentPosition = new WGS84(43.6092811, 3.8842406, null, null);
+        projection = mapMatching.getProjection(currentPosition);
+        expect(projection).is.null;
 
-        location.bearing = 11.9;
-        const projection2 = mapMatching.getProjection(location);
-        const result2 = projection2.projection;
-        const expected2 = new WGS84(43.609176667533255, 3.8841208369745965);
-        const distance2 = result2.distanceTo(expected2);
-        expect(distance2).to.below(0.01);
+        currentPosition = new WGS84(43.6092811, 3.8842406, null, new Level(1));
+        projection = mapMatching.getProjection(currentPosition, true, false);
+        expect(projection).is.not.null;
+        expect(projection.nearestElement.level.isInside(1)).true;
+
+        currentPosition = new WGS84(43.6092811, 3.8842406, null, new Level(2));
+        projection = mapMatching.getProjection(currentPosition, true, false);
+        expect(projection).is.not.null;
+        expect(projection.nearestElement.level.isInside(2)).true;
+
+    });
+
+    it('matching stairs nodes levels', () => {
+        let currentPosition, projection;
+
+        /**
+         * Projection on Edges
+         */
+
+        currentPosition = new WGS84(43.6093691, 3.8842057, null, null);
+        projection = mapMatching.getProjection(currentPosition);
+        expect(projection).is.null;
+
+        currentPosition = new WGS84(43.6093691, 3.8842057, null, new Level(1));
+        projection = mapMatching.getProjection(currentPosition, true, false);
+        expect(projection).is.not.null;
+        expect(projection.projection.level.isInside(1)).true;
+
+        currentPosition = new WGS84(43.6093691, 3.8842057, null, new Level(2));
+        projection = mapMatching.getProjection(currentPosition, true, false);
+        expect(projection).is.not.null;
+        expect(projection.projection.level.isInside(2)).true;
 
     });
+
+    it('matching stairs edge levels', () => {
+        let currentPosition, projection;
+
+        /**
+         * Projection on Edges
+         */
+
+        currentPosition = new WGS84(43.6093476, 3.8841978, null, null);
+        projection = mapMatching.getProjection(currentPosition);
+        expect(projection).is.null;
+
+        currentPosition = new WGS84(43.6093476, 3.8841978, null, new Level(1));
+        projection = mapMatching.getProjection(currentPosition, true, false);
+        expect(projection).is.not.null;
+        expect(projection.projection.level.isInside(1)).true;
+        expect(projection.nearestElement.level.isInside(1)).true;
+
+        currentPosition = new WGS84(43.6093476, 3.8841978, null, new Level(2));
+        projection = mapMatching.getProjection(currentPosition, true, false);
+        expect(projection).is.not.null;
+        expect(projection.projection.level.isInside(2)).true;
+        expect(projection.nearestElement.level.isInside(2)).true;
+
+    });
+
 });

package/src/graph/Step.js

@@ -0,0 +1,54 @@
+import Itinerary from './Itinerary';
+
+class Step {
+
+    nodes = [];
+    edges = [];
+    angle;
+    _length = 0;
+    previousBearing;
+    nextBearing;
+
+    get node() {
+        return this.nodes[0];
+    }
+
+    get nodeData() {
+        return this.nodes[0].data;
+    }
+
+    get nextEdgeData() {
+        if (this.edges.length === 0) {
+            return null;
+        }
+        return this.edges[0].data;
+    }
+
+    /**
+     * Get route length
+     */
+    get length() {
+        if (!this._length) {
+            this._length = this.edges.reduce((acc, edge) => acc + edge.length, 0);
+        }
+        return this._length;
+    }
+
+    /**
+     * Get route duration with default speed
+     */
+    get duration() {
+        return this.getDuration();
+    }
+
+    /**
+     * Get route duration
+     * @param {Number} speed in km/h
+     */
+    getDuration(speed) {
+        return Itinerary.getDurationFromLength(this.length, speed);
+    }
+
+}
+
+export default Step;

package/tests/CommonTest.js

@@ -0,0 +1,57 @@
+import {
+    WGS84, Level
+} from '@wemap/geo';
+
+import Edge from '../src/graph/Edge';
+import Node from '../src/graph/Node';
+import Network from '../src/graph/Network';
+
+const nodes = [
+    new Node(new WGS84(43.6092404, 3.884099), { name: 'p0' }),
+    new Node(new WGS84(43.6091965, 3.8841285), { name: 'p1' }),
+    new Node(new WGS84(43.6091888, 3.8841263), { name: 'p2' }),
+    new Node(new WGS84(43.6091361, 3.8841109), { name: 'p3' }),
+    new Node(new WGS84(43.6091194, 3.8842202), { name: 'p4' }),
+    new Node(new WGS84(43.6091722, 3.8842355), { name: 'p5' }),
+    new Node(new WGS84(43.6091749, 3.8842173), { name: 'p6' }),
+    new Node(new WGS84(43.609276, 3.8842467), { name: 'p7' }),
+    new Node(new WGS84(43.6092935, 3.8842518), { name: 'p8' }),
+    new Node(new WGS84(43.6093022, 3.8842702), { name: 'p9' }),
+    new Node(new WGS84(43.6093123, 3.8842731), { name: 'p10' }),
+    new Node(new WGS84(43.6093234, 3.8842009), { name: 'p11' }),
+    new Node(new WGS84(43.6093629, 3.8842127), { name: 'p12' }),
+    new Node(new WGS84(43.6093597, 3.8842336), { name: 'p13' }),
+    new Node(new WGS84(43.6093202, 3.8842218), { name: 'p14' }),
+    new Node(new WGS84(43.6093123, 3.8842731), { name: 'p15' }),
+    new Node(new WGS84(43.6092681, 3.8842604), { name: 'p16' })
+];
+
+const edges = [
+    new Edge(nodes[1], nodes[2], { name: 'e0' }, new Level(2)),
+    new Edge(nodes[2], nodes[3], { name: 'e1' }, new Level(2)),
+    new Edge(nodes[3], nodes[4], { name: 'e2' }, new Level(2)),
+    new Edge(nodes[4], nodes[5], { name: 'e3' }, new Level(2)),
+    new Edge(nodes[5], nodes[6], { name: 'e4' }, new Level(2)),
+    new Edge(nodes[6], nodes[2], { name: 'e5' }, new Level(2)),
+    new Edge(nodes[6], nodes[7], { name: 'e6' }, new Level(2)),
+    new Edge(nodes[7], nodes[8], { name: 'e7' }, new Level(2)),
+    new Edge(nodes[8], nodes[9], { name: 'e8' }, new Level(2)),
+    new Edge(nodes[9], nodes[10], { name: 'e9' }, new Level(2)),
+    new Edge(nodes[10], nodes[11], { name: 'e10' }, new Level(2)),
+    new Edge(nodes[11], nodes[12], { name: 'e11', stairs: true }, new Level(1, 2)),
+    new Edge(nodes[12], nodes[13], { name: 'e12', stairs: true }, new Level(1, 2)),
+    new Edge(nodes[13], nodes[14], { name: 'e13', stairs: true }, new Level(1, 2)),
+    new Edge(nodes[14], nodes[15], { name: 'e14' }, new Level(1)),
+    new Edge(nodes[15], nodes[16], { name: 'e15' }, new Level(1))
+];
+
+const network = new Network();
+network.edges = edges;
+network.nodes = nodes;
+
+const itineraryStart = new WGS84(43.6092754, 3.8842306, null, new Level(2));
+const itineraryEnd = new WGS84(43.6092602, 3.8842669, null, new Level(1));
+
+export {
+    nodes, edges, network, itineraryStart, itineraryEnd
+};