@wemap/geo 3.1.20 → 3.2.1

package/index.js

@@ -1,15 +1,15 @@
-import Constants from './src/Constants';
-import Utils from './src/Utils';
+import Constants from './src/Constants.js';
+import Utils from './src/Utils.js';
 
-import Attitude from './src/rotations/Attitude';
-import AbsoluteHeading from './src/rotations/AbsoluteHeading';
+import Attitude from './src/rotations/Attitude.js';
+import AbsoluteHeading from './src/rotations/AbsoluteHeading.js';
 
-import BoundingBox from './src/coordinates/BoundingBox';
-import GeoRelativePosition from './src/coordinates/GeoRelativePosition';
-import Level from './src/coordinates/Level';
-import RelativePosition from './src/coordinates/RelativePosition';
-import Coordinates from './src/coordinates/Coordinates';
-import UserPosition from './src/coordinates/UserPosition';
+import BoundingBox from './src/coordinates/BoundingBox.js';
+import GeoRelativePosition from './src/coordinates/GeoRelativePosition.js';
+import Level from './src/coordinates/Level.js';
+import RelativePosition from './src/coordinates/RelativePosition.js';
+import Coordinates from './src/coordinates/Coordinates.js';
+import UserPosition from './src/coordinates/UserPosition.js';
 
 export {
     AbsoluteHeading,

package/package.json

@@ -12,14 +12,13 @@
         "directory": "packages/geo"
     },
     "name": "@wemap/geo",
-    "version": "3.1.20",
+    "version": "3.2.1",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
     "homepage": "https://github.com/wemap/wemap-modules-js#readme",
-    "scripts": {
-        "test": "mocha -r esm \"src/**/*.spec.js\""
-    },
+    "scripts": {},
+    "type": "module",
     "keywords": [
         "utils",
         "geo",
@@ -27,11 +26,8 @@
     ],
     "license": "ISC",
     "dependencies": {
-        "@wemap/logger": "^3.0.0",
-        "@wemap/maths": "^3.1.15",
-        "lodash.isfinite": "^3.3.2",
-        "lodash.isnumber": "^3.0.3",
-        "lodash.isstring": "^4.0.1"
+        "@wemap/logger": "^3.2.1",
+        "@wemap/maths": "^3.2.1"
     },
-    "gitHead": "f7c26f0b16ec1d0d3ec5ca7efe6440424e18d3fb"
+    "gitHead": "0d430815358a23068c8473b2c310b2945667b2c1"
 }

package/src/Utils.js

@@ -1,5 +1,5 @@
 /* eslint-disable max-statements */
-import Coordinates from './coordinates/Coordinates';
+import Coordinates from './coordinates/Coordinates.js';
 
 class Utils {
 

package/src/Utils.spec.js

@@ -2,8 +2,8 @@
 import chai from 'chai';
 import chaiAlmost from 'chai-almost';
 
-import Utils from './Utils';
-import Coordinates from './coordinates/Coordinates';
+import Utils from './Utils.js';
+import Coordinates from './coordinates/Coordinates.js';
 
 const expect = chai.expect;
 chai.use(chaiAlmost(1e-3));

package/src/coordinates/BoundingBox.js

@@ -1,6 +1,4 @@
-import Coordinates from './Coordinates';
-import isNumber from 'lodash.isnumber';
-import isFinite from 'lodash.isfinite';
+import Coordinates from './Coordinates.js';
 
 class BoundingBox {
 
@@ -86,11 +84,11 @@ class BoundingBox {
     /**
      * This method extends the bounding box with a value in meters
      * /*\ This method is not precise as distance differs in function of latitude
-     * @param {Number} measure in meters
+     * @param {!number} measure in meters
      */
     extendsWithMeasure(measure) {
 
-        if (!isNumber(measure) || !isFinite(measure)) {
+        if (typeof measure !== 'number') {
             throw new Error('measure is not a number');
         }
 

package/src/coordinates/BoundingBox.spec.js

@@ -2,9 +2,10 @@
 import chai from 'chai';
 import chaiAlmost from 'chai-almost';
 
-import BoundingBox from './BoundingBox';
 import Logger from '@wemap/logger';
-import Coordinates from './Coordinates';
+
+import BoundingBox from './BoundingBox.js';
+import Coordinates from './Coordinates.js';
 
 const expect = chai.expect;
 chai.use(chaiAlmost());

package/src/coordinates/Coordinates.js

@@ -1,10 +1,9 @@
 import {
     Utils, Vector3, Quaternion, rad2deg
 } from '@wemap/maths';
-import Constants from '../Constants';
-import isNumber from 'lodash.isnumber';
-import isFinite from 'lodash.isfinite';
-import Level from './Level';
+
+import Constants from '../Constants.js';
+import Level from './Level.js';
 
 /**
  * A Coordinates position using at least latitude (lat) and longitude (lng).
@@ -48,7 +47,7 @@ class Coordinates {
     }
 
     set lat(lat) {
-        if (isNumber(lat) && Math.abs(lat) <= 90) {
+        if (typeof lat === 'number' && Math.abs(lat) <= 90) {
             this._lat = lat;
         } else {
             throw new Error('lat argument is not in [-90; 90]');
@@ -57,7 +56,7 @@ class Coordinates {
     }
 
     set lng(lng) {
-        if (isNumber(lng)) {
+        if (typeof lng === 'number') {
             this._lng = lng;
             if (Math.abs(lng) >= 180) {
                 // from https://stackoverflow.com/a/2323034/2239938
@@ -74,7 +73,7 @@ class Coordinates {
     }
 
     set alt(alt) {
-        if (isNumber(alt) && isFinite(alt)) {
+        if (typeof alt === 'number') {
             this._alt = alt;
         } else {
             if (typeof alt !== 'undefined' && alt !== null) {
@@ -162,7 +161,7 @@ class Coordinates {
         this.lat = Utils.rad2deg(phi2);
         this.lng = Utils.rad2deg(lambda2);
 
-        if (isNumber(elevation) && isFinite(elevation)) {
+        if (typeof elevation === 'number') {
             if (this.alt === null) {
                 throw new Error('Point altitude is not defined');
             }
@@ -350,6 +349,13 @@ class Coordinates {
         return new Coordinates(json.lat, json.lng, json.alt, Level.fromString(json.level));
     }
 
+    toCompressedJson() {
+        return [this.lat, this.lng, this.alt, this.level === null ? null : this.level.toString()];
+    }
+
+    static fromCompressedJson(json) {
+        return new Coordinates(json[0], json[1], json[2], Level.fromString(json[3]));
+    }
 }
 
 export default Coordinates;

package/src/coordinates/Coordinates.spec.js

@@ -1,9 +1,9 @@
 import chai from 'chai';
 import chaiAlmost from 'chai-almost';
 
-import Coordinates from './Coordinates';
-import Level from './Level';
-import Constants from '../Constants';
+import Coordinates from './Coordinates.js';
+import Level from './Level.js';
+import Constants from '../Constants.js';
 
 const expect = chai.expect;
 chai.use(chaiAlmost());
@@ -23,7 +23,6 @@ describe('Coordinates', () => {
         expect(() => new Coordinates(45, 5, false)).throw(Error);
         expect(() => new Coordinates(45, 5, null)).not.throw(Error);
         expect(() => new Coordinates(45, 5, 0)).not.throw(Error);
-        expect(() => new Coordinates(45, 5, Number.POSITIVE_INFINITY)).throw(Error);
 
         expect(() => new Coordinates(45, 5, null, null)).not.throw(Error);
         expect(() => new Coordinates(45, 5, null, true)).throw(Error);

package/src/coordinates/GeoRelativePosition.js

@@ -1,4 +1,4 @@
-import RelativePosition from './RelativePosition';
+import RelativePosition from './RelativePosition.js';
 
 /**
  * Position is defined in EUS (East-Up-South) frame with: x pointing to East, y pointing to Up, z pointing to South

package/src/coordinates/Level.js

@@ -1,6 +1,4 @@
 import Logger from '@wemap/logger';
-import isFinite from 'lodash.isfinite';
-import isString from 'lodash.isstring';
 
 /**
  * A Level is the representation of a building floor number
@@ -13,14 +11,14 @@ class Level {
      * Level constructor
      *  1 argument: level is not a range and first argument is the level
      *  2 arguments: level is a range
-     * @param {Number} arg1 if arg2: low value, otherwise: level
-     * @param {Number} arg2 (optional) up value
+     * @param {number} arg1 if arg2: low value, otherwise: level
+     * @param {number} arg2 (optional) up value
      */
     constructor(arg1, arg2) {
-        if (!isFinite(arg1)) {
+        if (typeof arg1 !== 'number' || isNaN(arg1)) {
             throw new Error('first argument is mandatory');
         }
-        if (isFinite(arg2)) {
+        if (typeof arg2 === 'number' && !isNaN(arg2)) {
             if (arg1 === arg2) {
                 this.isRange = false;
                 this.val = arg1;
@@ -46,24 +44,22 @@ class Level {
 
     /**
      * Create a level from a string
-     * @param {*} str level in str format (eg. 1, -2, 1;2, -2;3, 2;-1, 0.5;1 ...)
+     * @param {string} str level in str format (eg. 1, -2, 1;2, -2;3, 2;-1, 0.5;1 ...)
      */
     static fromString(str) {
 
-        if (!isString(str)) {
+        if (typeof str !== 'string') {
             return null;
         }
 
         if (!isNaN(Number(str))) {
-            return new Level(Number(str));
+            return new Level(parseFloat(str));
         }
 
         const splited = str.split(';');
         if (splited.length === 2) {
-            const num1 = Number(splited[0]);
-            const num2 = Number(splited[1]);
-            if (!isNaN(num1) && !isNaN(num2)) {
-                return new Level(num1, num2);
+            if (!isNaN(Number(splited[0])) && !isNaN(Number(splited[1]))) {
+                return new Level(parseFloat(splited[0]), parseFloat(splited[1]));
             }
         }
 

package/src/coordinates/Level.spec.js

@@ -1,9 +1,12 @@
 /* eslint-disable max-nested-callbacks */
-import { expect } from 'chai';
+import chai from 'chai';
 
-import Level from './Level';
 import Logger from '@wemap/logger';
 
+import Level from './Level.js';
+
+const { expect } = chai;
+
 Logger.enable(false);
 
 const checkSingle = (_level, _value) => {

package/src/coordinates/RelativePosition.js

@@ -1,7 +1,4 @@
-import isNumber from 'lodash.isnumber';
-import isFinite from 'lodash.isfinite';
-
-import Constants from '../Constants';
+import Constants from '../Constants.js';
 
 class RelativePosition {
 
@@ -26,7 +23,7 @@ class RelativePosition {
     }
 
     set x(x) {
-        if (isNumber(x) && isFinite(x)) {
+        if (typeof x === 'number') {
             this._x = x;
         } else if (typeof x !== 'undefined' && x !== null) {
             throw new Error('x argument is not a number');
@@ -38,7 +35,7 @@ class RelativePosition {
     }
 
     set y(y) {
-        if (isNumber(y) && isFinite(y)) {
+        if (typeof y === 'number') {
             this._y = y;
         } else if (typeof y !== 'undefined' && y !== null) {
             throw new Error('y argument is not a number');
@@ -50,7 +47,7 @@ class RelativePosition {
     }
 
     set z(z) {
-        if (isNumber(z) && isFinite(z)) {
+        if (typeof z === 'number') {
             this._z = z;
         } else if (typeof z !== 'undefined' && z !== null) {
             throw new Error('z argument is not a number');
@@ -62,7 +59,7 @@ class RelativePosition {
     }
 
     set time(time) {
-        if (isNumber(time) && isFinite(time)) {
+        if (typeof time === 'number') {
             this._time = time;
         } else {
             if (typeof time !== 'undefined' && time !== null) {
@@ -78,7 +75,7 @@ class RelativePosition {
     }
 
     set accuracy(accuracy) {
-        if (isNumber(accuracy) && isFinite(accuracy) && accuracy >= 0) {
+        if (typeof accuracy === 'number' && accuracy >= 0) {
             this._accuracy = accuracy;
         } else {
             if (typeof accuracy !== 'undefined' && accuracy !== null) {
@@ -94,7 +91,7 @@ class RelativePosition {
     }
 
     set bearing(bearing) {
-        if (isNumber(bearing) && isFinite(bearing)) {
+        if (typeof bearing === 'number') {
             this._bearing = bearing % (2 * Math.PI);
         } else {
             if (typeof bearing !== 'undefined' && bearing !== null) {

package/src/coordinates/UserPosition.js

@@ -1,8 +1,5 @@
-import isNumber from 'lodash.isnumber';
-import isFinite from 'lodash.isfinite';
-
-import Coordinates from './Coordinates';
-import Constants from '../Constants';
+import Coordinates from './Coordinates.js';
+import Constants from '../Constants.js';
 
 /**
  * A Coordinates User Position is a Coordinates position with specific data related to user (bearing, time, accuracy)
@@ -25,7 +22,7 @@ class UserPosition extends Coordinates {
     }
 
     set time(time) {
-        if (isNumber(time) && isFinite(time)) {
+        if (typeof time === 'number') {
             this._time = time;
         } else {
             if (typeof time !== 'undefined' && time !== null) {
@@ -41,7 +38,7 @@ class UserPosition extends Coordinates {
     }
 
     set accuracy(accuracy) {
-        if (isNumber(accuracy) && isFinite(accuracy) && accuracy >= 0) {
+        if (typeof accuracy === 'number' && accuracy >= 0) {
             this._accuracy = accuracy;
         } else {
             if (typeof accuracy !== 'undefined' && accuracy !== null) {
@@ -57,7 +54,7 @@ class UserPosition extends Coordinates {
     }
 
     set bearing(bearing) {
-        if (isNumber(bearing) && isFinite(bearing)) {
+        if (typeof bearing === 'number') {
             this._bearing = bearing % (2 * Math.PI);
         } else {
             if (typeof bearing !== 'undefined' && bearing !== null) {

package/src/coordinates/UserPosition.spec.js

@@ -2,9 +2,9 @@
 import chai from 'chai';
 import chaiAlmost from 'chai-almost';
 
-import UserPosition from './UserPosition';
-import Level from './Level';
-import Coordinates from './Coordinates';
+import UserPosition from './UserPosition.js';
+import Level from './Level.js';
+import Coordinates from './Coordinates.js';
 
 const expect = chai.expect;
 chai.use(chaiAlmost());
@@ -24,13 +24,11 @@ describe('UserPosition', () => {
         expect(() => new UserPosition(45, 5, null, null, 0)).not.throw(Error);
         expect(() => new UserPosition(45, 5, null, null, 10)).not.throw(Error);
         expect(() => new UserPosition(45, 5, null, null, -10)).not.throw(Error);
-        expect(() => new UserPosition(45, 5, null, null, Number.POSITIVE_INFINITY)).throw(Error);
 
         expect(() => new UserPosition(45, 5, null, null, null, null)).not.throw(Error);
         expect(() => new UserPosition(45, 5, null, null, null, 0)).not.throw(Error);
         expect(() => new UserPosition(45, 5, null, null, null, 10)).not.throw(Error);
         expect(() => new UserPosition(45, 5, null, null, null, -10)).throw(Error);
-        expect(() => new UserPosition(45, 5, null, null, null, Number.POSITIVE_INFINITY)).throw(Error);
 
         expect(() => new UserPosition(45, 5, null, null, null,
             null, null)).not.throw(Error);
@@ -40,8 +38,6 @@ describe('UserPosition', () => {
             null, 10)).not.throw(Error);
         expect(() => new UserPosition(45, 5, null, null, null,
             null, -10)).not.throw(Error);
-        expect(() => new UserPosition(45, 5, null, null, null,
-            null, Number.POSITIVE_INFINITY)).throw(Error);
 
         const position = new UserPosition(45, 5, 0, new Level(2), 123456, 10, Math.PI, 'foo');
         expect(position.lat).equals(45);

package/src/rotations/AbsoluteHeading.js

@@ -1,8 +1,6 @@
-import isNumber from 'lodash.isnumber';
-import isFinite from 'lodash.isfinite';
-
 import { Quaternion } from '@wemap/maths';
-import Attitude from './Attitude';
+
+import Attitude from './Attitude.js';
 
 class AbsoluteHeading {
 
@@ -33,7 +31,7 @@ class AbsoluteHeading {
      * @param {Number} heading
      */
     set heading(heading) {
-        if (isNumber(heading) && isFinite(heading)) {
+        if (typeof heading === 'number') {
             this._heading = heading;
         } else {
             throw new Error('heading argument is not a number');
@@ -51,7 +49,7 @@ class AbsoluteHeading {
      * @param {Number} time
      */
     set time(time) {
-        if (isNumber(time) && isFinite(time)) {
+        if (typeof time === 'number') {
             this._time = time;
         } else {
             if (typeof time !== 'undefined' && time !== null) {
@@ -72,7 +70,7 @@ class AbsoluteHeading {
      * @param {Number} accuracy
      */
     set accuracy(accuracy) {
-        if (isNumber(accuracy) && accuracy >= 0 && accuracy <= Math.PI) {
+        if (typeof accuracy === 'number' && accuracy >= 0 && accuracy <= Math.PI) {
             this._accuracy = accuracy;
         } else {
             if (typeof accuracy !== 'undefined' && accuracy !== null) {

package/src/rotations/Attitude.js

@@ -1,6 +1,3 @@
-import isNumber from 'lodash.isnumber';
-import isFinite from 'lodash.isfinite';
-
 import {
     Rotations, Quaternion, rad2deg, deg2rad
 } from '@wemap/maths';
@@ -61,7 +58,7 @@ class Attitude {
      * @param {Number} time
      */
     set time(time) {
-        if (isNumber(time) && isFinite(time)) {
+        if (typeof time === 'number') {
             this._time = time;
         } else {
             if (typeof time !== 'undefined' && time !== null) {
@@ -82,7 +79,7 @@ class Attitude {
      * @param {Number} accuracy
      */
     set accuracy(accuracy) {
-        if (isNumber(accuracy) && accuracy >= 0 && accuracy <= Math.PI) {
+        if (typeof accuracy === 'number' && accuracy >= 0 && accuracy <= Math.PI) {
             this._accuracy = accuracy;
         } else {
             if (typeof accuracy !== 'undefined' && accuracy !== null) {

package/src/rotations/Attitude.spec.js

@@ -2,11 +2,12 @@
 import chai from 'chai';
 import chaiAlmost from 'chai-almost';
 
-import Attitude from './Attitude';
 import {
     deg2rad, Quaternion, Utils
 } from '@wemap/maths';
 
+import Attitude from './Attitude.js';
+
 const expect = chai.expect;
 chai.use(chaiAlmost());
 
@@ -103,7 +104,6 @@ describe('Attitude', () => {
         expect(() => new Attitude([1, 0, 0, 0], false)).throw(Error);
         expect(() => new Attitude([1, 0, 0, 0], true)).throw(Error);
         expect(() => new Attitude([1, 0, 0, 0], null)).not.throw(Error);
-        expect(() => new Attitude([1, 0, 0, 0], Number.POSITIVE_INFINITY)).throw(Error);
 
         expect(() => new Attitude([1, 0, 0, 0], 10, deg2rad(10))).not.throw(Error);
         expect(() => new Attitude([1, 0, 0, 0], 10, -1)).throw(Error);