@wemap/geo 0.3.8 → 0.3.9

package/package.json

@@ -12,7 +12,7 @@
         "directory": "packages/geo"
     },
     "name": "@wemap/geo",
-    "version": "0.3.8",
+    "version": "0.3.9",
     "bugs": {
         "url": "https://github.com/wemap/wemap-utils-js/issues"
     },
@@ -31,5 +31,5 @@
         "lodash.isnumber": "^3.0.3",
         "lodash.isstring": "^4.0.1"
     },
-    "gitHead": "6e107eebc85ff97f17371feac903ddb53657678b"
+    "gitHead": "84a60e64b0968bc45f0f76cc26c08e165dbe6985"
 }

package/src/coordinates/Level.js

@@ -113,7 +113,7 @@ class Level {
             if (second.isInside(first.val)) {
                 return first;
             }
-            return first;
+            return null;
         }
         if (first.isRange && second.isRange) {
             const up = Math.min(first.up, second.up);

package/src/coordinates/Level.spec.js

@@ -119,6 +119,20 @@ describe('Level', () => {
         expect(Level.equalsTo(new Level(-1.5, 1).clone(), new Level(-1.5, 1))).true;
     });
 
+    it('isInside', () => {
+        expect(new Level(0).isInside(0)).true;
+        expect(new Level(1).isInside(0)).false;
+        expect(new Level(-1).isInside(0)).false;
+        expect(new Level(0).isInside(1)).false;
+        expect(new Level(0).isInside(-1)).false;
+        expect(new Level(0, 2).isInside(0)).true;
+        expect(new Level(0, 2).isInside(1)).true;
+        expect(new Level(0, 2).isInside(-1)).false;
+        expect(new Level(2, 0).isInside(0)).true;
+        expect(new Level(2, 0).isInside(1)).true;
+        expect(new Level(2, 0).isInside(-1)).false;
+    });
+
     it('intersect', () => {
         expect(Level.intersect(null, null)).is.null;
 
@@ -138,6 +152,8 @@ describe('Level', () => {
         expect(Level.equalsTo(Level.intersect(new Level(-3, -1), new Level(-1, 2)), new Level(-1)));
         expect(Level.intersect(new Level(-3, -2), new Level(-1, 2))).is.null;
         expect(Level.intersect(new Level(-1, 2), new Level(-3, -2))).is.null;
+        expect(Level.intersect(new Level(0), new Level(1, 2))).is.null;
+        expect(Level.intersect(new Level(1, 2), new Level(0))).is.null;
     });
 
     it('union', () => {
@@ -159,6 +175,8 @@ describe('Level', () => {
         expect(Level.equalsTo(Level.union(new Level(-3, -1), new Level(-1, 2)), new Level(-3, 2)));
         expect(Level.equalsTo(Level.union(new Level(-3, -2), new Level(-1, 2)), new Level(-3, 2)));
         expect(Level.equalsTo(Level.union(new Level(-1, 2), new Level(-3, -2)), new Level(-3, 2)));
+        expect(Level.equalsTo(Level.union(new Level(0), new Level(1, 2)), new Level(0, 2)));
+        expect(Level.equalsTo(Level.union(new Level(1, 2), new Level(0)), new Level(0, 2)));
     });
 
 });

package/src/graph/MapMatching.spec.js

@@ -34,10 +34,6 @@ describe('MapMatching', () => {
     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;
@@ -57,10 +53,6 @@ describe('MapMatching', () => {
     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;
@@ -80,10 +72,6 @@ describe('MapMatching', () => {
     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;
@@ -103,10 +91,6 @@ describe('MapMatching', () => {
     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;
@@ -125,4 +109,25 @@ describe('MapMatching', () => {
 
     });
 
+    it('useMultiLevelSegments', () => {
+        let currentPosition, projection;
+
+        // On Nodes
+
+        currentPosition = new WGS84(43.6093691, 3.8842057, null, new Level(0));
+        projection = mapMatching.getProjection(currentPosition, true, false, false);
+        expect(projection).is.null;
+
+        // Next two are complex cases and not yet handled by our system
+
+        // currentPosition = new WGS84(43.6093691, 3.8842057, null, new Level(1));
+        // projection = mapMatching.getProjection(currentPosition, true, false, false);
+        // expect(projection.nearestElement).equals(nodes[14]);
+
+        // currentPosition = new WGS84(43.6093691, 3.8842057, null, new Level(2));
+        // projection = mapMatching.getProjection(currentPosition, true, false, false);
+        // expect(projection.nearestElement).equals(nodes[11]);
+
+    });
+
 });