@wemap/positioning 2.4.5 → 2.4.7

package/package.json

@@ -8,10 +8,10 @@
     "Guillaume Pannetier <guillaume.pannetier@getwemap.com>"
   ],
   "dependencies": {
-    "@wemap/geo": "^0.3.6",
+    "@wemap/geo": "^0.3.7",
     "@wemap/logger": "^0.1.6",
     "@wemap/maths": "^0.2.1",
-    "@wemap/osm": "^0.2.8",
+    "@wemap/osm": "^0.2.9",
     "@wemap/utils": "^0.1.2",
     "geomagnetism": "^0.1.0",
     "lodash.isempty": "^4.4.0",
@@ -80,5 +80,5 @@
     "lint": "eslint --ext .js,.jsx --quiet src",
     "test": "mocha -r esm \"src/**/*.spec.js\""
   },
-  "version": "2.4.5"
+  "version": "2.4.7"
 }

package/src/providers/pose/pdr/PdrProvider.js

@@ -142,7 +142,7 @@ class PdrProvider extends MapMatchingProvider {
         if (position instanceof WGS84) {
             this.pdrPosition = WGS84UserPosition.fromWGS84(position);
             if (window && window.performance) {
-                this.pdrPosition.time = window.performance / 1e3;
+                this.pdrPosition.time = window.performance.now() / 1e3;
             }
         } else {
             this.pdrPosition = position;

package/src/providers/pose/pdr/helpers/Smoother.js

@@ -1,6 +1,5 @@
 /* eslint-disable max-statements */
 import { WGS84UserPosition } from '@wemap/geo';
-import { rad2deg } from '@wemap/maths';
 
 // Generated positions by second
 const GEN_FREQUENCY = 60;
@@ -28,39 +27,42 @@ class Smoother {
             throw new Error('newPosition does not have time property');
         }
 
-        if (this.previousPosition) {
+        if (!this.previousPosition) {
+            this.previousPosition = newPosition;
+            this.positionsQueue.push(this.previousPosition);
+            return;
+        }
 
-            const distance = this.previousPosition.distanceTo(newPosition);
-            const azimuth = this.previousPosition.bearingTo(newPosition);
+        const distance = this.previousPosition.distanceTo(newPosition);
+        const azimuth = this.previousPosition.bearingTo(newPosition);
 
-            let refTimestamp = newPosition.time;
+        let refTimestamp = newPosition.time;
 
-            const queueLength = this.positionsQueue.length;
-            if (queueLength) {
-                refTimestamp = Math.max(refTimestamp, this.positionsQueue[queueLength - 1].time);
-            }
+        const queueLength = this.positionsQueue.length;
+        if (queueLength) {
+            refTimestamp = Math.max(refTimestamp, this.positionsQueue[queueLength - 1].time);
+        }
 
-            let diffTime = newPosition.time - this.previousPosition.time;
+        let diffTime = newPosition.time - this.previousPosition.time;
 
-            if (flyby) {
-                diffTime = MAX_FLYBY_TIME;
-            }
+        if (flyby) {
+            diffTime = MAX_FLYBY_TIME;
+        }
 
-            const nSamples = GEN_FREQUENCY * Math.min(Math.max(MIN_FLYBY_TIME, diffTime), MAX_FLYBY_TIME);
+        const nSamples = GEN_FREQUENCY * Math.min(Math.max(MIN_FLYBY_TIME, diffTime), MAX_FLYBY_TIME);
 
-            let i = 1;
-            while (i < nSamples) {
-                i = Math.min(i, nSamples);
-                const smoothedPosition = this.previousPosition.destinationPoint(distance * i / nSamples, azimuth);
-                smoothedPosition.time = refTimestamp + (i - 1) / GEN_FREQUENCY;
-                smoothedPosition.bearing = rad2deg(azimuth);
-                this.positionsQueue.push(smoothedPosition);
-                i++;
-            }
-            newPosition.bearing = rad2deg(azimuth);
+        let i = 1;
+        while (i < nSamples + 1) {
+            i = Math.min(i, nSamples);
+            const smoothedPosition = this.previousPosition.destinationPoint(distance * i / nSamples, azimuth);
+            smoothedPosition.time = refTimestamp + (i - 1) / GEN_FREQUENCY;
+            smoothedPosition.bearing = newPosition.bearing;
+            this.positionsQueue.push(smoothedPosition);
+            i++;
         }
 
-        this.positionsQueue.push(newPosition);
+        this.positionsQueue[this.positionsQueue.length - 1].level = newPosition.level;
+
         this.previousPosition = newPosition;
     }