@wemap/providers 12.9.2 → 12.9.3

package/package.json

@@ -12,7 +12,7 @@
         "url": "git+https://github.com/wemap/wemap-modules-js.git"
     },
     "name": "@wemap/providers",
-    "version": "12.9.2",
+    "version": "12.9.3",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -55,5 +55,5 @@
         },
         "./helpers/*": "./helpers/*"
     },
-    "gitHead": "184f537812866759dc10dd68c5c90d23ff05db43"
+    "gitHead": "6187429610fc17029a4233dffb414350eb3db976"
 }

package/src/providers/position/absolute/GnssWifiProvider.ts

@@ -19,20 +19,23 @@ import { AbsolutePosition } from '../../../events/Types.js';
  */
 class GnssWifiProvider extends Provider<AbsolutePosition> {
 
-    static POSITION_OPTIONS = {
-        enableHighAccuracy: true,
-        timeout: Infinity,
-        maximumAge: 0
-    };
-
     static DEFAULT_DISCARD_POSITIONS_ABOVE = 50;
 
     discardPositionsAbove = GnssWifiProvider.DEFAULT_DISCARD_POSITIONS_ABOVE;
 
+    enableHighAccuracy = true;
+
     geoLocationId?: number;
 
     getName = () => 'GnssWifi';
 
+    get positionOptions() {
+        return {
+            enableHighAccuracy: this.enableHighAccuracy,
+            timeout: Infinity,
+            maximumAge: 0
+        };
+    }
 
     availability() {
         return typeof (navigator) === 'object' && navigator.geolocation
@@ -41,13 +44,20 @@ class GnssWifiProvider extends Provider<AbsolutePosition> {
     }
 
     start() {
+        // Trigger last known position
+        navigator.geolocation.getCurrentPosition(
+            this.onNewPosition,
+            this.onPositionError,
+            this.positionOptions
+        );
+
         // Note: added timeout for a workaround on Safari/iOS when user disabled geolocation:
         //  watchPosition does not send the error callback without the "setTimeout"
         setTimeout(() => {
             this.geoLocationId = navigator.geolocation.watchPosition(
                 this.onNewPosition,
                 this.onPositionError,
-                GnssWifiProvider.POSITION_OPTIONS
+                this.positionOptions
             );
         }, 150);
     }
@@ -81,7 +91,9 @@ class GnssWifiProvider extends Provider<AbsolutePosition> {
             coords.accuracy,
             bearing);
 
-        if (typeof this.discardPositionsAbove === 'number'
+        if (
+            this.enableHighAccuracy &&
+            typeof this.discardPositionsAbove === 'number'
             && coords.accuracy > this.discardPositionsAbove
         ) {
             return;

package/src/providers/position/absolute/GnssWifiProviders.spec.ts

@@ -0,0 +1,90 @@
+import chai from 'chai';
+import sinon from 'sinon';
+
+import GnssWifiProvider from './GnssWifiProvider.js';
+
+const { expect } = chai;
+
+describe('GnssWifiProvider', () => {
+    it('onNewPosition - should notify when accuracy is low', async () => {
+
+        const fakePositionEvent = {
+            coords: {
+                latitude: 43,
+                longitude: 3,
+                accuracy: 10,
+                altitude: 0,
+                altitudeAccuracy: 0,
+                heading: 0,
+                speed: 0
+            },
+            timestamp: Date.now()
+        };
+
+        const notifySpy = sinon.spy();
+
+        const callbackId = GnssWifiProvider.addEventListener(notifySpy);
+
+        (GnssWifiProvider as any).onNewPosition(fakePositionEvent);
+
+        expect(notifySpy.callCount).to.equal(1);
+
+        GnssWifiProvider.removeEventListener(callbackId);
+
+    });
+
+    it('onNewPosition - should not notify when accuracy is greater than options', async () => {
+
+        const fakePositionEvent = {
+            coords: {
+                latitude: 43,
+                longitude: 3,
+                accuracy: 100,
+                altitude: 0,
+                altitudeAccuracy: 0,
+                heading: 0,
+                speed: 0
+            },
+            timestamp: Date.now()
+        };
+
+        const notifySpy = sinon.spy();
+
+        const callbackId = GnssWifiProvider.addEventListener(notifySpy);
+        
+        (GnssWifiProvider as any).onNewPosition(fakePositionEvent);
+        
+        expect(notifySpy.callCount).to.equal(0);
+
+        GnssWifiProvider.removeEventListener(callbackId);
+    });
+
+    it('onNewPosition - should notify when accuracy is high and enableHighAccuracy false', async () => {
+
+        const fakePositionEvent = {
+            coords: {
+                latitude: 43,
+                longitude: 3,
+                accuracy: 100,
+                altitude: 0,
+                altitudeAccuracy: 0,
+                heading: 0,
+                speed: 0
+            },
+            timestamp: Date.now()
+        };
+
+        const notifySpy = sinon.spy();
+        GnssWifiProvider.enableHighAccuracy = false;
+
+        const callbackId = GnssWifiProvider.addEventListener(notifySpy);
+
+        (GnssWifiProvider as any).onNewPosition(fakePositionEvent);
+
+        expect(notifySpy.callCount).to.equal(1);
+
+        // Reset
+        GnssWifiProvider.enableHighAccuracy = true;
+        GnssWifiProvider.removeEventListener(callbackId);
+    });
+});