@wemap/positioning 2.7.5 → 2.7.6

package/package.json

@@ -8,18 +8,21 @@
     "Guillaume Pannetier <guillaume.pannetier@getwemap.com>"
   ],
   "dependencies": {
-    "@wemap/geo": "^2.7.4",
-    "@wemap/graph": "^2.7.4",
+    "@wemap/geo": "^2.7.6",
+    "@wemap/graph": "^2.7.6",
     "@wemap/logger": "^2.7.0",
     "@wemap/maths": "^2.7.2",
-    "@wemap/osm": "^2.7.5",
-    "@wemap/utils": "^2.7.0",
+    "@wemap/osm": "^2.7.6",
+    "@wemap/utils": "^2.7.6",
     "geomagnetism": "^0.1.0",
     "lodash.isempty": "^4.4.0",
     "lodash.isnumber": "^3.0.3",
     "lodash.noop": "^3.0.1"
   },
   "description": "A package using different geoloc systems",
+  "devDependencies": {
+    "webpack-dev-server": "^3.9.0"
+  },
   "homepage": "https://github.com/wemap/wemap-modules-js#readme",
   "keywords": [
     "wemap",
@@ -43,6 +46,6 @@
     "lint": "eslint --ext .js,.jsx --quiet src",
     "test": "mocha -r esm \"src/**/*.spec.js\""
   },
-  "version": "2.7.5",
-  "gitHead": "5d60aa9ae789520ef5adeb34a8e4d3e5973ed0b2"
+  "version": "2.7.6",
+  "gitHead": "46ba2de050542dacd2b0fd9a0e07cb03f1aedbc7"
 }

package/src/PositioningHandler.spec.js

@@ -1,5 +1,4 @@
 import chai from 'chai';
-import 'jsdom-global/register';
 
 import PositioningHandler from './PositioningHandler';
 import EventType from './events/EventType';
@@ -20,16 +19,18 @@ import RelativeAttitudeProvider from './providers/attitude/RelativeAttitudeProvi
 const expect = chai.expect;
 
 function fakeUserAgent(userAgent) {
-    navigator.__defineGetter__('userAgent', () => userAgent);
+    global.navigator = { userAgent };
 }
 
 function fakeNativeInterface(arcore = true) {
     // We have to clear the cache here
     ArCoreProvider._nativeProvider = null;
 
-    global.WemapProvidersAndroid = {getArCoreProvider: () => {
-        return { checkAvailability: () => arcore };
-    }};
+    global.WemapProvidersAndroid = {
+        getArCoreProvider: () => {
+            return { checkAvailability: () => arcore };
+        }
+    };
 }
 
 function fakeGeolocation() {
@@ -289,3 +290,5 @@ describe('PositioningHandler#findProvider', () => {
     });
 
 });
+
+delete global.navigator;

package/src/providers/pose/ArCoreAbsoluteProvider.js

@@ -12,6 +12,8 @@ import ImuProvider from '../others/ImuProvider';
 import MapMatchingProvider from '../others/MapMatchingProvider';
 import PdrProvider from './pdr/PdrProvider';
 
+const MM_ARCORE_DIST = 5;
+
 /**
  * Pose provider is the provider used by the PositioningHandler. It uses the best fusion
  * of what he can and provides an AbsoluteAttitude and an AbsolutePosition as an output.
@@ -140,7 +142,7 @@ class ArCoreAbsoluteProvider extends MapMatchingProvider {
 
                     if (this.absoluteAttitude) {
                         this.position.bearing = this.absoluteAttitude.heading;
-                        this.updateLevel(this.position);
+                        this.updatePositionWithMapMatching();
                     }
 
                     this.notify(this.createEvent(EventType.AbsolutePosition, this.position, event.timestamp));
@@ -191,17 +193,22 @@ class ArCoreAbsoluteProvider extends MapMatchingProvider {
     enableMapMatching(network, maxDistance, maxAngleBearing) {
         super.enableMapMatching(
             network,
-            maxDistance || PdrProvider.MM_PDR_DIST,
+            maxDistance || MM_ARCORE_DIST,
             maxAngleBearing || PdrProvider.MM_PDR_ANGLE
         );
     }
 
-    updateLevel(position) {
-        if (this.mapMatching) {
-            const projection = this.mapMatching.getProjection(position, true);
-            if (projection) {
-                position.level = projection.projection.level;
+    updatePositionWithMapMatching() {
+        if (!this.mapMatching) {
+            return;
+        }
+        const projection = this.mapMatching.getProjection(this.position, true, true);
+        if (projection) {
+            if (projection.distanceFromNearestElement > 1) {
+                this.position.lat = projection.projection.lat;
+                this.position.lng = projection.projection.lng;
             }
+            this.position.level = projection.projection.level;
         }
     }
 }