@wemap/geo 1.0.3 → 1.0.5

package/package.json

@@ -8,17 +8,17 @@
     "main": "index.js",
     "repository": {
         "type": "git",
-        "url": "git+https://github.com/wemap/wemap-utils-js.git",
+        "url": "git+https://github.com/wemap/wemap-modules-js.git",
         "directory": "packages/geo"
     },
     "name": "@wemap/geo",
-    "version": "1.0.3",
+    "version": "1.0.5",
     "bugs": {
-        "url": "https://github.com/wemap/wemap-utils-js/issues"
+        "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
-    "homepage": "https://github.com/wemap/wemap-utils-js#readme",
+    "homepage": "https://github.com/wemap/wemap-modules-js#readme",
     "scripts": {
-        "test": "mocha -r esm \\\"src/**/*.spec.js\\\""
+        "test": "mocha -r esm \"src/**/*.spec.js\""
     },
     "keywords": [
         "utils",
@@ -27,10 +27,10 @@
     ],
     "license": "ISC",
     "dependencies": {
-        "@wemap/maths": "^0.2.1",
+        "@wemap/maths": "^1.0.1",
         "lodash.isfinite": "^3.3.2",
         "lodash.isnumber": "^3.0.3",
         "lodash.isstring": "^4.0.1"
     },
-    "gitHead": "ecc9848b178778edd77176fc4c329faccdde032a"
+    "gitHead": "1ccef947faf3f37aba592594efe06575b6542170"
 }

package/src/coordinates/BoundingBox.js

@@ -74,10 +74,14 @@ class BoundingBox {
             this.northEast = new WGS84(ne2.lat, ne2.lng);
 
         } else {
-            sw.lat = Math.min(sw2.lat, sw.lat);
-            sw.lng = Math.min(sw2.lng, sw.lng);
-            ne.lat = Math.max(ne2.lat, ne.lat);
-            ne.lng = Math.max(ne2.lng, ne.lng);
+            this.southWest = new WGS84(
+                Math.min(sw2.lat, sw.lat),
+                Math.min(sw2.lng, sw.lng)
+            );
+            this.northEast = new WGS84(
+                Math.max(ne2.lat, ne.lat),
+                Math.max(ne2.lng, ne.lng)
+            );
         }
 
         return this;
@@ -177,9 +181,13 @@ class BoundingBox {
         return this.northEast.lat;
     }
 
+    static equalsTo(bb1, bb2) {
+        return WGS84.equalsTo(bb1.northEast, bb2.northEast)
+            && WGS84.equalsTo(bb1.southWest, bb2.southWest);
+    }
+
     equalsTo(other) {
-        return WGS84.equalsTo(this.northEast, other.northEast)
-            && WGS84.equalsTo(this.southWest, other.southWest);
+        return BoundingBox.equalsTo(this, other);
     }
 }
 

package/src/coordinates/BoundingBox.spec.js

@@ -36,6 +36,38 @@ describe('Bounding Box', () => {
     });
 
 
+    it('equalsTo', () => {
+        boundingBox = new BoundingBox(northEast, southWest);
+        expect(boundingBox.equalsTo(new BoundingBox(
+            new WGS84(10, 40), new WGS84(-5, -20)
+        ))).true;
+        expect(BoundingBox.equalsTo(boundingBox, new BoundingBox(
+            new WGS84(10, 40), new WGS84(-5, -20)
+        ))).true;
+        expect(BoundingBox.equalsTo(boundingBox, new BoundingBox(
+            new WGS84(10, 10), new WGS84(-5, -20)
+        ))).false;
+        expect(BoundingBox.equalsTo(boundingBox, new BoundingBox(
+            new WGS84(10, 40), new WGS84(-15, -20)
+        ))).false;
+    });
+
+
+    it('bounds', () => {
+        boundingBox = new BoundingBox(northEast, southWest);
+        expect(boundingBox.getNorth()).equals(northEast.lat);
+        expect(boundingBox.getEast()).equals(northEast.lng);
+        expect(boundingBox.getSouth()).equals(southWest.lat);
+        expect(boundingBox.getWest()).equals(southWest.lng);
+        expect(WGS84.equalsTo(boundingBox.getNorthEast(), northEast)).true;
+        expect(WGS84.equalsTo(boundingBox.getSouthWest(), southWest)).true;
+        expect(WGS84.equalsTo(boundingBox.getNorthWest(),
+            new WGS84(northEast.lat, southWest.lng))).true;
+        expect(WGS84.equalsTo(boundingBox.getSouthEast(),
+            new WGS84(southWest.lat, northEast.lng))).true;
+    });
+
+
     it('center', () => {
         boundingBox = new BoundingBox();
         expect(() => boundingBox.center).is.throw(Error);
@@ -86,6 +118,20 @@ describe('Bounding Box', () => {
             boundingBox.extend(new WGS84(30, 40)),
             [30, 40, -5, -20]
         )).true;
+
+        boundingBox = new BoundingBox(northEast, southWest);
+        boundingBox.extend(new BoundingBox(
+            new WGS84(10, 10), new WGS84(-10, -10)
+        ));
+        expect(checkBounds(boundingBox, [10, 40, -10, -20])).true;
+
+        boundingBox = new BoundingBox(northEast, southWest);
+        boundingBox.extend(new BoundingBox());
+        expect(checkBounds(boundingBox, [10, 40, -5, -20])).true;
+
+        boundingBox = new BoundingBox();
+        boundingBox.extend(new BoundingBox(northEast, southWest));
+        expect(checkBounds(boundingBox, [10, 40, -5, -20])).true;
     });
 
 

package/src/coordinates/Level.js

@@ -29,7 +29,7 @@ class Level {
                 this.low = Math.min(arg1, arg2);
                 this.up = Math.max(arg1, arg2);
             }
-        } else if (typeof arg2 === 'undefined'){
+        } else if (typeof arg2 === 'undefined') {
             this.isRange = false;
             this.val = arg1;
         } else {
@@ -164,7 +164,8 @@ class Level {
         } else if (!first.isRange && second.isRange) {
             low = Math.min(second.low, first.val);
             up = Math.max(second.up, first.val);
-        } else if (first.isRange && second.isRange) {
+        } else {
+            /* if (first.isRange && second.isRange) */
             low = Math.min(second.low, first.low);
             up = Math.max(second.up, first.up);
         }
@@ -211,12 +212,9 @@ class Level {
         if (first.isRange && second.isRange) {
             return first.low === second.low && first.up === second.up;
         }
-        if (!first.isRange && !second.isRange) {
-            return first.val === second.val;
-        }
+        // !first.isRange && !second.isRange
+        return first.val === second.val;
 
-        // Should never happen.
-        return false;
     }
 
 }

package/src/coordinates/Level.spec.js

@@ -177,6 +177,18 @@ describe('Level', () => {
         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)));
+
+        expect(Level.equalsTo(new Level(0, 1).union(new Level(1)), new Level(0, 1)));
+    });
+
+
+    it('multiplyBy', () => {
+        expect(Level.equalsTo(new Level(0).multiplyBy(5), new Level(0)));
+        expect(Level.equalsTo(new Level(3).multiplyBy(2), new Level(6)));
+        expect(Level.equalsTo(new Level(-1).multiplyBy(5), new Level(-5)));
+        expect(Level.equalsTo(new Level(0, 1).multiplyBy(5), new Level(0, 5)));
+        expect(Level.equalsTo(new Level(-1, 1).multiplyBy(5), new Level(-5, 5)));
+        expect(Level.equalsTo(new Level(1, -1).multiplyBy(5), new Level(-5, 5)));
     });
 
 });