@wemap/providers 6.1.5 → 6.2.1

package/dist/wemap-providers.es.js

@@ -42,7 +42,9 @@ var EventType = {
     CameraNative: 'CAMERA_NATIVE',
 
     Itinerary: 'ITINERARY',
-    Network: 'NETWORK'
+    Network: 'NETWORK',
+
+    ForceVps: 'FORCE_VPS'
 };
 
 /**
@@ -3775,7 +3777,7 @@ class Vps extends Provider {
         camera.on('started', this._internalStart);
         camera.on('stopped', this._internalStop);
 
-        if (camera.isStarted) {
+        if (camera.state === Camera.State.STARTED) {
             this._internalStart();
         }
     }
@@ -3785,13 +3787,13 @@ class Vps extends Provider {
 
         this._serverError = false;
 
-        let lastTimestamp = -1;
-
         while (this.state !== ProviderState.STOPPPED) {
 
-            const diffTime = preciseTime() - lastTimestamp;
-            const timeToWait = Math.max(0, Vps.MIN_TIME_BETWEEN_TWO_REQUESTS - diffTime);
-            await new Promise(resolve => setTimeout(resolve, timeToWait));
+            if (this.lastEvent) {
+                const diffTime = preciseTime() - this.lastEvent.data.time * 1e3;
+                const timeToWait = Math.max(0, Vps.MIN_TIME_BETWEEN_TWO_REQUESTS - diffTime);
+                await new Promise(resolve => setTimeout(resolve, timeToWait));
+            }
 
             if (this.state === ProviderState.STOPPPED) {
                 break;
@@ -3830,8 +3832,6 @@ class Vps extends Provider {
             if (events.length) {
                 this.notify(...events);
             }
-
-            lastTimestamp = preciseTime();
         }
 
         if (this.state !== ProviderState.STOPPPED) {
@@ -3853,7 +3853,7 @@ class Vps extends Provider {
 
         // Retrieve the image
         const image = await camera.currentImage;
-        const time = preciseTime();
+        const time = preciseTime() / 1e3;
         // TODO: move the grayscale conversion in the currentImage getter
         CameraUtils.convertToGrayscale(image);
         const reducedImage = CameraUtils.reduceImageSize(image, 1280);
@@ -3960,6 +3960,9 @@ class AbsolutePosition extends Provider {
     /** @type {number?} */
     _mapMatchingHandlerId
 
+    /** @type {boolean?} */
+    _waitUntilNextVpsPosition = false;
+
     /**
     * @override
     */
@@ -4002,14 +4005,9 @@ class AbsolutePosition extends Provider {
         if (ProvidersOptions.hasVps) {
 
             this._vpsProviderId = Vps$1.addEventListener(events => {
-                for (const providerEvent of events) {
-                    if (providerEvent.dataType === EventType.AbsolutePosition) {
-                        this._onAbsolutePosition(providerEvent);
-                        Vps$1.removeEventListener(this._vpsProviderId);
-                        this._vpsProviderId = null;
-                        return;
-                    }
-                }
+                this._onAbsolutePosition(events.find(event => event.dataType === EventType.AbsolutePosition));
+                Vps$1.removeEventListener(this._vpsProviderId);
+                this._vpsProviderId = null;
             });
 
         } else {
@@ -4060,7 +4058,7 @@ class AbsolutePosition extends Provider {
         if (lastPosition) {
 
             // Is the new position accuracy is better enough than the last position accuracy
-            const isBetterEnough = newPosition.accuracy * AbsolutePosition.ACCURACY_RELOC_RATIO < lastPosition.accuracy;
+            const isBetterEnough = newPosition.accuracy * AbsolutePosition.ACCURACY_RELOC_RATIO <= lastPosition.accuracy;
 
             // Is the new position is far from the new one (regarding accuracy)
             // This is important if the person put the current page in the background during a while
@@ -4102,7 +4100,7 @@ class AbsolutePosition extends Provider {
      */
     _onRelativePosition(relativeEvent) {
 
-        if (!this.lastEvent) {
+        if (!this.lastEvent || this._waitUntilNextVpsPosition) {
             return;
         }
 
@@ -4139,12 +4137,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$1.addEventListener(events => {
+                    this._waitUntilNextVpsPosition = false;
+                    this._onAbsolutePosition(events.find(event => event.dataType === EventType.AbsolutePosition));
+                    Vps$1.removeEventListener(this._vpsProviderId);
+                    this._vpsProviderId = null;
+                });
+            }
+
+            return;
+
+        }
+
         if (data instanceof UserPosition) {
 
             if (data.time === null) {
@@ -5375,6 +5389,7 @@ class ProvidersInterface {
             return AbsoluteAttitude$1;
 
         case EventType.AbsolutePosition:
+        case EventType.ForceVps:
             return AbsolutePosition$1;
 
         case EventType.RelativeAttitude:
@@ -5430,6 +5445,8 @@ class ProvidersInterface {
                 throw errorFn('Itinerary');
             }
             break;
+        case EventType.ForceVps:
+            break;
         default:
             throw new Error(`Unable to deal with this event type: ${eventType}`);
         }