@wemap/providers 6.1.2 → 6.1.4

package/package.json

@@ -40,6 +40,6 @@
     "url": "git+https://github.com/wemap/wemap-modules-js.git"
   },
   "type": "module",
-  "version": "6.1.2",
-  "gitHead": "ffb6fe1f940d915e839024bc5b9aa5a986ad88a9"
+  "version": "6.1.4",
+  "gitHead": "f968e0aa5a1aad007e588e83dc0990c7c38916e0"
 }

package/src/ProvidersInterface.js

@@ -80,6 +80,7 @@ class ProvidersInterface {
             return AbsoluteAttitude;
 
         case EventType.AbsolutePosition:
+        case EventType.ForceVps:
             return AbsolutePosition;
 
         case EventType.RelativeAttitude:
@@ -135,6 +136,8 @@ class ProvidersInterface {
                 throw errorFn('Itinerary');
             }
             break;
+        case EventType.ForceVps:
+            break;
         default:
             throw new Error(`Unable to deal with this event type: ${eventType}`);
         }

package/src/events/EventType.js

@@ -34,5 +34,7 @@ export default {
     CameraNative: 'CAMERA_NATIVE',
 
     Itinerary: 'ITINERARY',
-    Network: 'NETWORK'
+    Network: 'NETWORK',
+
+    ForceVps: 'FORCE_VPS'
 };

package/src/providers/position/absolute/AbsolutePosition.js

@@ -8,6 +8,7 @@ import MapMatchingHandler from '../../../mapmatching/MapMatchingHandler.js';
 import GnssWifi from './GnssWifi.js';
 import { default as GeoRelativePositionProvider } from '../relative/GeoRelativePosition.js';
 import ProvidersOptions from '../../../ProvidersOptions.js';
+import ProviderState from '../../ProviderState.js';
 import Vps from '../../vision/Vps.js';
 
 class AbsolutePosition extends Provider {
@@ -28,6 +29,9 @@ class AbsolutePosition extends Provider {
     /** @type {number?} */
     _mapMatchingHandlerId
 
+    /** @type {boolean?} */
+    _waitUntilNextVpsPosition = false;
+
     /**
     * @override
     */
@@ -70,14 +74,9 @@ class AbsolutePosition extends Provider {
         if (ProvidersOptions.hasVps) {
 
             this._vpsProviderId = Vps.addEventListener(events => {
-                for (const providerEvent of events) {
-                    if (providerEvent.dataType === EventType.AbsolutePosition) {
-                        this._onAbsolutePosition(providerEvent);
-                        Vps.removeEventListener(this._vpsProviderId);
-                        this._vpsProviderId = null;
-                        return;
-                    }
-                }
+                this._onAbsolutePosition(events.find(event => event.dataType === EventType.AbsolutePosition));
+                Vps.removeEventListener(this._vpsProviderId);
+                this._vpsProviderId = null;
             });
 
         } else {
@@ -170,7 +169,7 @@ class AbsolutePosition extends Provider {
      */
     _onRelativePosition(relativeEvent) {
 
-        if (!this.lastEvent) {
+        if (!this.lastEvent || this._waitUntilNextVpsPosition) {
             return;
         }
 
@@ -207,12 +206,28 @@ class AbsolutePosition extends Provider {
     /**
      * @override
      * @param {UserPosition|ProviderEvent} data
+     * @param {EventType} eventType
      */
-    feed(data) {
+    feed(data, eventType) {
 
         /** @type {ProviderEvent<UserPosition>} */
         let newPositionEvent;
 
+        if (eventType === EventType.ForceVps) {
+            if (!this._vpsProviderId && this.state === ProviderState.STARTED) {
+                this._waitUntilNextVpsPosition = true;
+                this._vpsProviderId = Vps.addEventListener(events => {
+                    this._waitUntilNextVpsPosition = false;
+                    this._onAbsolutePosition(events.find(event => event.dataType === EventType.AbsolutePosition));
+                    Vps.removeEventListener(this._vpsProviderId);
+                    this._vpsProviderId = null;
+                });
+            }
+
+            return;
+
+        }
+
         if (data instanceof UserPosition) {
 
             if (data.time === null) {