@wemap/geo 3.1.6 → 3.1.8

package/package.json

@@ -12,7 +12,7 @@
         "directory": "packages/geo"
     },
     "name": "@wemap/geo",
-    "version": "3.1.6",
+    "version": "3.1.8",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -33,5 +33,5 @@
         "lodash.isnumber": "^3.0.3",
         "lodash.isstring": "^4.0.1"
     },
-    "gitHead": "f7967fd5b465e1e2be1c575ef0f2150adde4825f"
+    "gitHead": "9e4ca5d422005858eca036b3e98ea3f854231fd0"
 }

package/src/coordinates/BoundingBox.js

@@ -209,6 +209,26 @@ class BoundingBox {
     equalsTo(other) {
         return BoundingBox.equalsTo(this, other);
     }
+
+    /**
+     * Create a BoundingBox from a WSEN array
+     * @param {Number[4]} bounds a WSEN array
+     * @returns {BoundingBox} the corresponding BoundingBox
+     */
+    static fromArray(bounds) {
+        return new BoundingBox(
+            new Coordinates(bounds[3], bounds[2]),
+            new Coordinates(bounds[1], bounds[0])
+        );
+    }
+
+    /**
+     * Returns the WSEN array
+     * @returns {Number[4]} the WSEN array
+     */
+    toArray() {
+        return [this.getWest(), this.getSouth(), this.getEast(), this.getNorth()];
+    }
 }
 
 export default BoundingBox;

package/src/coordinates/BoundingBox.spec.js

@@ -33,6 +33,9 @@ describe('Bounding Box', () => {
         boundingBox = new BoundingBox(northEast, southWest);
         expect(boundingBox.northEast).equals(northEast);
         expect(boundingBox.southWest).equals(southWest);
+
+        const boundingBox2 = BoundingBox.fromArray([-20, -5, 40, 10]);
+        expect(boundingBox2.equalsTo(boundingBox)).is.true;
     });
 
 
@@ -52,7 +55,6 @@ describe('Bounding Box', () => {
         ))).false;
     });
 
-
     it('bounds', () => {
         boundingBox = new BoundingBox(northEast, southWest);
         expect(boundingBox.getNorth()).equals(northEast.lat);
@@ -170,5 +172,7 @@ describe('Bounding Box', () => {
             .be.closeTo(measure, 0.05 * measure);
     });
 
-
+    it('toArray', () => {
+        expect(new BoundingBox(northEast, southWest).toArray()).deep.equals([-20, -5, 40, 10]);
+    });
 });

package/src/coordinates/Coordinates.js

@@ -57,10 +57,18 @@ class Coordinates {
     }
 
     set lng(lng) {
-        if (isNumber(lng) && Math.abs(lng) <= 180) {
+        if (isNumber(lng)) {
             this._lng = lng;
+            if (Math.abs(lng) >= 180) {
+                // from https://stackoverflow.com/a/2323034/2239938
+                this._lng = this._lng % 360;
+                this._lng = (this._lng + 360) % 360;
+                if (this._lng > 180) {
+                    this._lng -= 360;
+                }
+            }
         } else {
-            throw new Error('lng argument is not in [-180; 180]');
+            throw new Error('lng argument is not a number');
         }
         this._ecef = null;
     }

package/src/coordinates/Coordinates.spec.js

@@ -17,7 +17,7 @@ describe('Coordinates', () => {
         expect(() => new Coordinates(45)).throw(Error);
         expect(() => new Coordinates(45, 5)).not.throw(Error);
         expect(() => new Coordinates(-93, 5)).throw(Error);
-        expect(() => new Coordinates(45, 202)).throw(Error);
+        expect(() => new Coordinates(45, 202)).not.throw(Error);
 
         expect(() => new Coordinates(45, 5, true)).throw(Error);
         expect(() => new Coordinates(45, 5, false)).throw(Error);
@@ -52,6 +52,12 @@ describe('Coordinates', () => {
         expect(Level.equalsTo(position.level, new Level(2))).true;
         expect(position._ecef).equals(null);
         expect(position.ecef).is.not.null;
+
+        position.lng = 202;
+        expect(position.lng).equals(-158);
+
+        position.lng = -202;
+        expect(position.lng).equals(158);
     });
 
     it('clone', () => {