@wemap/geo 3.2.3 → 3.2.15

package/package.json

@@ -12,7 +12,7 @@
         "directory": "packages/geo"
     },
     "name": "@wemap/geo",
-    "version": "3.2.3",
+    "version": "3.2.15",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -27,7 +27,7 @@
     "license": "ISC",
     "dependencies": {
         "@wemap/logger": "^3.2.3",
-        "@wemap/maths": "^3.2.3"
+        "@wemap/maths": "^3.2.15"
     },
-    "gitHead": "f7075f59fc3227c7f4cb7f1fa8cc69b98705364e"
+    "gitHead": "adde2357c87a5429e7b3bea068729d6e06c9c3ca"
 }

package/src/Utils.js

@@ -1,4 +1,5 @@
 /* eslint-disable max-statements */
+import Constants from './Constants.js';
 import Coordinates from './coordinates/Coordinates.js';
 
 class Utils {
@@ -106,7 +107,8 @@ class Utils {
         while (currentPointIndex < route.length) {
             const currentPoint = route[currentPointIndex];
             const dist = previousPoint.distanceTo(currentPoint);
-            if (cumulativeDistance + dist >= length) {
+            if (cumulativeDistance + dist >= length
+                || Math.abs(cumulativeDistance + dist - length) <= Constants.EPS_MM) {
                 const bearing = previousPoint.bearingTo(currentPoint);
                 const remainingLength = length - cumulativeDistance;
                 const end = previousPoint.destinationPoint(remainingLength, bearing);

package/src/coordinates/BoundingBox.js

@@ -6,10 +6,10 @@ class BoundingBox {
     southWest;
 
     constructor(northEast, southWest) {
-        this.southWest = southWest || null;
         this.northEast = northEast || null;
+        this.southWest = southWest || null;
 
-        if (this.southWest && this.northEast && this.getNorth() < this.getSouth()) {
+        if (this.northEast && this.southWest && this.getNorth() < this.getSouth()) {
             throw new Error('Incorrect bounding box');
         }
     }

package/src/coordinates/Coordinates.js

@@ -18,6 +18,8 @@ import Level from './Level.js';
  */
 class Coordinates {
 
+    autoWrap = true;
+
     constructor(lat, lng, alt, level) {
         this.lat = lat;
         this.lng = lng;
@@ -66,13 +68,8 @@ class Coordinates {
     set lng(lng) {
         if (typeof lng === 'number') {
             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;
-                }
+            if (this.autoWrap) {
+                this.wrap();
             }
         } else {
             throw new Error('lng argument is not a number');
@@ -111,6 +108,12 @@ class Coordinates {
         return output;
     }
 
+    wrap() {
+        if (this._lng <= -180 || this._lng > 180) {
+            this._lng = Utils.wrap(this._lng, -180, 180);
+        }
+    }
+
     /**
      * Compares two Coordinates
      * @param {Coordinates} pos1 position 1
@@ -316,7 +319,7 @@ class Coordinates {
         const projection = new Coordinates(poseCoordinates.lat, poseCoordinates.lng,
             alt, Level.intersect(p1.level, p2.level));
 
-        if (Math.abs((p1.distanceTo(p2) - p1.distanceTo(projection) - p2.distanceTo(projection))) > 1e-6) {
+        if (Math.abs((p1.distanceTo(p2) - p1.distanceTo(projection) - p2.distanceTo(projection))) > Constants.EPS_MM) {
             return null;
         }
 

package/src/rotations/AbsoluteHeading.js

@@ -127,8 +127,10 @@ class AbsoluteHeading {
         };
     }
 
-    static fromJson(json) {
-        return new AbsoluteHeading(json);
+    static fromJson({
+        heading, time, accuracy
+    }) {
+        return new AbsoluteHeading(heading, time, accuracy);
     }
 
 }