@wemap/providers 6.1.1 → 6.1.3

package/package.json

@@ -12,7 +12,7 @@
     "@wemap/geo": "^6.0.0",
     "@wemap/geomagnetism": "^0.1.1",
     "@wemap/logger": "^6.0.0",
-    "@wemap/map": "^6.0.2",
+    "@wemap/map": "^6.1.2",
     "@wemap/maths": "^6.0.0",
     "@wemap/osm": "^6.0.0",
     "@wemap/utils": "^6.0.0"
@@ -40,6 +40,6 @@
     "url": "git+https://github.com/wemap/wemap-modules-js.git"
   },
   "type": "module",
-  "version": "6.1.1",
-  "gitHead": "b3cb15c80ce9428bcffa00c946d63fd71688a384"
+  "version": "6.1.3",
+  "gitHead": "98aaf7ce4508834258b528bbf9dca90b0045f882"
 }

package/src/ProvidersInterface.js

@@ -80,6 +80,7 @@ class ProvidersInterface {
             return AbsoluteAttitude;
 
         case EventType.AbsolutePosition:
+        case EventType.ForceVps:
             return AbsolutePosition;
 
         case EventType.RelativeAttitude:

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

@@ -28,6 +28,9 @@ class AbsolutePosition extends Provider {
     /** @type {number?} */
     _mapMatchingHandlerId
 
+    /** @type {boolean?} */
+    _waitUntilNextVpsPosition = false;
+
     /**
     * @override
     */
@@ -70,14 +73,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 +168,7 @@ class AbsolutePosition extends Provider {
      */
     _onRelativePosition(relativeEvent) {
 
-        if (!this.lastEvent) {
+        if (!this.lastEvent || this._waitUntilNextVpsPosition) {
             return;
         }
 
@@ -207,12 +205,27 @@ 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 && !this._vpsProviderId) {
+
+            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) {

package/src/providers/vision/Vps.js

@@ -104,7 +104,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();
         }
     }
@@ -114,13 +114,13 @@ class Vps extends Provider {
 
         this._serverError = false;
 
-        let lastTimestamp = -1;
-
         while (this.state !== ProviderState.STOPPPED) {
 
-            const diffTime = TimeUtils.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 = TimeUtils.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;
@@ -159,8 +159,6 @@ class Vps extends Provider {
             if (events.length) {
                 this.notify(...events);
             }
-
-            lastTimestamp = TimeUtils.preciseTime();
         }
 
         if (this.state !== ProviderState.STOPPPED) {
@@ -182,7 +180,7 @@ class Vps extends Provider {
 
         // Retrieve the image
         const image = await camera.currentImage;
-        const time = TimeUtils.preciseTime();
+        const time = TimeUtils.preciseTime() / 1e3;
         // TODO: move the grayscale conversion in the currentImage getter
         CameraUtils.convertToGrayscale(image);
         const reducedImage = CameraUtils.reduceImageSize(image, 1280);