@wemap/geo 3.1.19 → 3.1.21

package/package.json

@@ -12,7 +12,7 @@
         "directory": "packages/geo"
     },
     "name": "@wemap/geo",
-    "version": "3.1.19",
+    "version": "3.1.21",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -28,10 +28,7 @@
     "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/maths": "^3.1.15"
     },
-    "gitHead": "4a4167fd2159c856b90e6a566595ae5945f92d2e"
+    "gitHead": "17f72afdcf6098bf90d3dffc2cf0b15f9284d4d4"
 }

package/src/Constants.js

@@ -10,7 +10,7 @@ const Constants = {
     EPS_DEG_MM: 1e-8,
 
     /**
-     * epsilon in meters which corresponds to q millimeter
+     * epsilon in meters which corresponds to 1 millimeter
      */
     EPS_MM: 1e-3
 };

package/src/Utils.js

@@ -66,6 +66,61 @@ class Utils {
         return sampledRoute;
     }
 
+    /**
+     * Trim a route of Coordinates
+     * @param {Array.<Coordinates>} route ordered points
+     * @param {Coordinates} startPosition position where the trim starts. startPosition has to be on the route.
+     * @param {*} maxLength max route length
+     */
+    static trimRoute(route, startPosition = route[0], length = Number.MAX_VALUE) {
+
+        const newRoute = [];
+        let previousPoint;
+
+        let currentPointIndex;
+        let cumulativeDistance = 0;
+
+        for (currentPointIndex = 1; currentPointIndex < route.length; currentPointIndex++) {
+
+            const p1 = route[currentPointIndex - 1];
+            const p2 = route[currentPointIndex];
+
+            if (startPosition.equalsTo(p1)) {
+                newRoute.push(p1);
+                previousPoint = p1;
+                break;
+            }
+
+            const proj = startPosition.getSegmentProjection(p1, p2);
+            if (proj && proj.equalsTo(startPosition) && !proj.equalsTo(p2)) {
+                newRoute.push(proj);
+                previousPoint = proj;
+                break;
+            }
+        }
+
+        if (!newRoute.length) {
+            throw new Error('startPosition is not on the route');
+        }
+
+        while (currentPointIndex < route.length) {
+            const currentPoint = route[currentPointIndex];
+            const dist = previousPoint.distanceTo(currentPoint);
+            if (cumulativeDistance + dist >= length) {
+                const bearing = previousPoint.bearingTo(currentPoint);
+                const remainingLength = length - cumulativeDistance;
+                const end = previousPoint.destinationPoint(remainingLength, bearing);
+                newRoute.push(end);
+                break;
+            }
+            newRoute.push(currentPoint);
+            previousPoint = currentPoint;
+            cumulativeDistance += dist;
+            currentPointIndex++;
+        }
+
+        return newRoute;
+    }
 }
 
 export default Utils;

package/src/Utils.spec.js

@@ -49,4 +49,57 @@ describe('Geo Utils', () => {
         expect(samples.length).equals(2);
 
     });
+
+    it('trimRoute', () => {
+
+        let newRoute;
+
+        const p1 = new Coordinates(45.0, 5.0);
+        const p2 = p1.destinationPoint(100, Math.PI / 4);
+        const p3 = p2.destinationPoint(49.9, Math.PI / 2);
+        const route = [p1, p2, p3];
+
+        expect(() => Utils.trimRoute(route, new Coordinates(0, 0))).throw(Error);
+
+        newRoute = Utils.trimRoute(route);
+        expect(newRoute.length).equals(3);
+        for (let i = 0; i < newRoute.length - 1; i++) {
+            expect(newRoute[i].equalsTo(route[i])).true;
+        }
+
+        newRoute = Utils.trimRoute(route, p1, 100);
+        expect(newRoute.length).equals(2);
+        expect(newRoute[0].equalsTo(p1)).true;
+        expect(newRoute[1].equalsTo(p2)).true;
+
+        newRoute = Utils.trimRoute(route, p1, 90);
+        expect(newRoute.length).equals(2);
+        expect(newRoute[0].equalsTo(p1)).true;
+        expect(newRoute[1].equalsTo(p1.destinationPoint(90, Math.PI / 4))).true;
+
+        newRoute = Utils.trimRoute(route, p2, 10);
+        expect(newRoute.length).equals(2);
+        expect(newRoute[0].equalsTo(p2)).true;
+        expect(newRoute[1].equalsTo(p2.destinationPoint(10, Math.PI / 2))).true;
+
+        const p4 = p1.destinationPoint(20, Math.PI / 4);
+        newRoute = Utils.trimRoute(route, p4);
+        expect(newRoute.length).equals(3);
+        expect(newRoute[0].equalsTo(p4)).true;
+        expect(newRoute[1].equalsTo(p2)).true;
+        expect(newRoute[2].equalsTo(p3)).true;
+
+        const p5 = p2.destinationPoint(20, Math.PI / 2);
+        newRoute = Utils.trimRoute(route, p4, 100);
+        expect(newRoute.length).equals(3);
+        expect(newRoute[0].equalsTo(p4)).true;
+        expect(newRoute[1].equalsTo(p2)).true;
+        expect(newRoute[2].equalsTo(p5)).true;
+
+        newRoute = Utils.trimRoute(route, p4, 200);
+        expect(newRoute.length).equals(3);
+        expect(newRoute[0].equalsTo(p4)).true;
+        expect(newRoute[1].equalsTo(p2)).true;
+        expect(newRoute[2].equalsTo(p3)).true;
+    });
 });

package/src/coordinates/BoundingBox.js

@@ -1,6 +1,4 @@
 import Coordinates from './Coordinates';
-import isNumber from 'lodash.isnumber';
-import isFinite from 'lodash.isfinite';
 
 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/Coordinates.js

@@ -2,8 +2,6 @@ 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';
 
 /**
@@ -48,7 +46,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 +55,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 +72,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 +160,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');
             }

package/src/coordinates/Coordinates.spec.js

@@ -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/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/RelativePosition.js

@@ -1,6 +1,3 @@
-import isNumber from 'lodash.isnumber';
-import isFinite from 'lodash.isfinite';
-
 import Constants from '../Constants';
 
 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,6 +1,3 @@
-import isNumber from 'lodash.isnumber';
-import isFinite from 'lodash.isfinite';
-
 import Coordinates from './Coordinates';
 import Constants from '../Constants';
 
@@ -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

@@ -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,6 +1,3 @@
-import isNumber from 'lodash.isnumber';
-import isFinite from 'lodash.isfinite';
-
 import { Quaternion } from '@wemap/maths';
 import Attitude from './Attitude';
 
@@ -33,7 +30,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 +48,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 +69,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

@@ -103,7 +103,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);