@wemap/providers 4.0.3 → 4.0.4

package/debug/src/Utils.js

@@ -1,5 +1,6 @@
 import React from 'react'; // eslint-disable-line no-unused-vars
 
+import { ItineraryInfo } from '@wemap/geo';
 import { rad2deg } from '@wemap/maths';
 import { OsrmUtils } from '@wemap/osm';
 
@@ -121,6 +122,9 @@ class Utils {
 
     }
 
+    /**
+     * @param {ItineraryInfo} info
+     */
     static renderItineraryInfo(info) {
 
         if (!info) {

package/package.json

@@ -8,16 +8,16 @@
     "Guillaume Pannetier <guillaume.pannetier@getwemap.com>"
   ],
   "dependencies": {
-    "@wemap/geo": "^4.0.3",
+    "@wemap/geo": "^4.0.4",
     "@wemap/geomagnetism": "^0.1.1",
     "@wemap/logger": "^4.0.0",
-    "@wemap/map": "^4.0.3",
+    "@wemap/map": "^4.0.4",
     "@wemap/maths": "^4.0.3",
     "@wemap/utils": "^4.0.0"
   },
   "description": "A package using different geoloc systems",
   "devDependencies": {
-    "@wemap/osm": "^4.0.3",
+    "@wemap/osm": "^4.0.4",
     "mapbox-gl": "^1.11.1"
   },
   "homepage": "https://github.com/wemap/wemap-modules-js#readme",
@@ -39,6 +39,6 @@
     "url": "git+https://github.com/wemap/wemap-modules-js.git"
   },
   "type": "module",
-  "version": "4.0.3",
-  "gitHead": "91a82028ddda32038999582da381d1d0d8acd091"
+  "version": "4.0.4",
+  "gitHead": "8cb2140ad039f1e12b9834effb7cef467ade7549"
 }

package/src/mapmatching/MapMatchingHandler.js

@@ -42,6 +42,9 @@ class MapMatchingHandler extends Provider {
     /** @type {number} */
     static MIN_STEPS_BETWEEN_ORIENTATION_MATCHING = 3;
 
+    /** @type {number} */
+    static MIN_STEPS_FOR_ORIENTATION_MATCHING = 5;
+
     /** @type {MapMatching} */
     _mapMatching;
 
@@ -262,6 +265,11 @@ class MapMatchingHandler extends Provider {
             return;
         }
 
+        // Detector to avoid big jumps in the wrong direction
+        if (thisWillBeAHugeJump && this._detectWrongBigJump(projectionWithBearing)) {
+            return;
+        }
+
         AbsolutePosition.notify(this.createEvent(
             EventType.AbsolutePosition,
             projectionWithBearing.projection,
@@ -298,6 +306,12 @@ class MapMatchingHandler extends Provider {
                 return;
             }
 
+            // Detector to avoid big jumps in the wrong direction
+            if (thisWillBeAHugeJump && this._detectWrongBigJump(projection)) {
+                AbsolutePosition.notify(positionEvent);
+                return;
+            }
+
             AbsolutePosition.notify(this.createEvent(
                 EventType.AbsolutePosition,
                 projection.projection,
@@ -343,6 +357,30 @@ class MapMatchingHandler extends Provider {
 
     }
 
+    /**
+     * @param {Projection} projection
+     */
+    _detectWrongBigJump(projection) {
+
+        if (this.network instanceof Itinerary && AbsolutePosition.lastEvent) {
+            const itinerary = this.network;
+            const infoPrevious = itinerary.getInfo(AbsolutePosition.lastEvent.data);
+            const infoProjection = itinerary.getInfo(projection.projection);
+            if (infoPrevious
+                && infoProjection
+                && infoPrevious.traveledDistance > infoProjection.traveledDistance
+                && (infoPrevious.traveledDistance - infoProjection.traveledDistance) > projection.origin.accuracy
+                && projection.distanceFromNearestElement > projection.origin.accuracy
+                && projection.origin.distanceTo(AbsolutePosition.lastEvent.data) < projection.origin.accuracy + AbsolutePosition.lastEvent.data.accuracy) {
+
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+
     /**
      * @param {Projection} projection
      */
@@ -353,7 +391,8 @@ class MapMatchingHandler extends Provider {
         }
 
         if (this.state !== ProviderState.STARTED
-            || this._countStepsFromLastMatching < MapMatchingHandler.MIN_STEPS_BETWEEN_ORIENTATION_MATCHING) {
+            || this._countStepsFromLastMatching < MapMatchingHandler.MIN_STEPS_BETWEEN_ORIENTATION_MATCHING
+            || StraightLineDetector.numStepsDetectedFromLastTurn < MapMatchingHandler.MIN_STEPS_FOR_ORIENTATION_MATCHING) {
             return;
         }
 

package/src/providers/attitude/TurnDectector.js

@@ -9,7 +9,7 @@ class TurnDetector extends Provider {
     // in seconds
     static SLIDING_WINDOW_TIME = 0.3;
 
-    static STD_THRESHOLD = 0.05;
+    static STD_THRESHOLD = 0.075;
 
     /** @type {number} in seconds */
     static CONSIDER_TURN_UNTIL = 1;

package/src/providers/steps/StraightLineDetector.js

@@ -6,7 +6,7 @@ import EventType from '../../events/EventType.js';
 class StraightLineDetector extends Provider {
 
     /** @type {number} */
-    static STEPS_CONSIDERED_FOR_STRAIGHT_LINE = 3;
+    static STEPS_CONSIDERED_FOR_STRAIGHT_LINE = 2;
 
     /** @type {number?} */
     _turnDetectorProviderId = null;
@@ -75,6 +75,10 @@ class StraightLineDetector extends Provider {
     isStraight() {
         return this._countSteps >= StraightLineDetector.STEPS_CONSIDERED_FOR_STRAIGHT_LINE;
     }
+
+    get numStepsDetectedFromLastTurn() {
+        return this._countSteps;
+    }
 }
 
 export default new StraightLineDetector();

package/src/smoothers/AttitudeSmoother.js

@@ -5,7 +5,7 @@ import { deg2rad, diffAngle, Quaternion } from '@wemap/maths';
 class AttitudeSmoother {
 
     /** @type {number} in radians/s */
-    static ROTATION_SPEED_JUMP_THRESHOLD = deg2rad(90);
+    static ROTATION_SPEED_JUMP_THRESHOLD = deg2rad(180);
 
     /** @type {number} in radians/s */
     static ROTATION_SPEED_CONVERGENCE = deg2rad(10);