@wemap/providers 6.1.0 → 6.1.1

package/package.json

@@ -40,6 +40,6 @@
     "url": "git+https://github.com/wemap/wemap-modules-js.git"
   },
   "type": "module",
-  "version": "6.1.0",
-  "gitHead": "367774b6d8cbfa864886d9cc3344244c7da20639"
+  "version": "6.1.1",
+  "gitHead": "b3cb15c80ce9428bcffa00c946d63fd71688a384"
 }

package/src/Providers.js

@@ -32,7 +32,7 @@ export { default as GnssWifi } from './providers/position/absolute/GnssWifi.js';
 export { default as Ip } from './providers/position/absolute/Ip.js';
 export { default as AbsolutePosition } from './providers/position/absolute/AbsolutePosition.js';
 
-export { default as VisionRelocalization } from './providers/vision/VisionRelocalization.js';
+export { default as Vps } from './providers/vision/Vps.js';
 
 export { default as Barcode } from './providers/others/Barcode.js';
 export { default as CameraNative } from './providers/others/CameraNative.js';

package/src/ProvidersOptions.js

@@ -17,7 +17,7 @@ const ProvidersOptions = {
      * battery. They can be added to this list to be used
      * List of {@link Provider#pname}
      */
-    optionalProviders: ['VisionRelocalization'],
+    optionalProviders: [],
 
     /**
      * Define the list of EventType that are optionals
@@ -34,7 +34,7 @@ const ProvidersOptions = {
     smoother: true,
 
     get hasVps() {
-        return this.optionalProviders.includes('VisionRelocalization');
+        return this.optionalProviders.includes('Vps');
     }
 };
 

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

@@ -8,7 +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 VisionRelocalization from '../../vision/VisionRelocalization.js';
+import Vps from '../../vision/Vps.js';
 
 class AbsolutePosition extends Provider {
 
@@ -69,11 +69,12 @@ class AbsolutePosition extends Provider {
 
         if (ProvidersOptions.hasVps) {
 
-            const vpsProviderId = VisionRelocalization.addEventListener(events => {
+            this._vpsProviderId = Vps.addEventListener(events => {
                 for (const providerEvent of events) {
                     if (providerEvent.dataType === EventType.AbsolutePosition) {
                         this._onAbsolutePosition(providerEvent);
-                        VisionRelocalization.removeEventListener(vpsProviderId);
+                        Vps.removeEventListener(this._vpsProviderId);
+                        this._vpsProviderId = null;
                         return;
                     }
                 }
@@ -101,8 +102,16 @@ class AbsolutePosition extends Provider {
     stop() {
         if (this._relativePositionProviderId) {
             GeoRelativePositionProvider.removeEventListener(this._relativePositionProviderId);
+            this._relativePositionProviderId = null;
+        }
+        if (this._gnssWifiProviderId) {
+            GnssWifi.removeEventListener(this._gnssWifiProviderId);
+            this._gnssWifiProviderId = null;
+        }
+        if (this._vpsProviderId) {
+            Vps.removeEventListener(this._vpsProviderId);
+            this._vpsProviderId = null;
         }
-        GnssWifi.removeEventListener(this._gnssWifiProviderId);
 
         MapMatchingHandler.removeEventListener(this._mapMatchingHandlerId);
     }

package/src/providers/vision/{VisionRelocalization.js → Vps.js}

@@ -10,7 +10,7 @@ import ProviderEvent from '../../events/ProviderEvent.js';
 import Provider from '../Provider.js';
 import ProviderState from '../ProviderState.js';
 
-class VisionRelocalization extends Provider {
+class Vps extends Provider {
 
     // static SERVICE_URL = 'http://localhost:45678/';
     static SERVICE_URL = 'https://vps.maaap.it/';
@@ -30,7 +30,7 @@ class VisionRelocalization extends Provider {
     * @override
     */
     static get pname() {
-        return 'VisionRelocalization';
+        return 'Vps';
     }
 
     /**
@@ -119,14 +119,14 @@ class VisionRelocalization extends Provider {
         while (this.state !== ProviderState.STOPPPED) {
 
             const diffTime = TimeUtils.preciseTime() - lastTimestamp;
-            const timeToWait = Math.max(0, VisionRelocalization.MIN_TIME_BETWEEN_TWO_REQUESTS - diffTime);
+            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;
             }
 
-            const url = VisionRelocalization.SERVICE_URL + VisionRelocalization.MAP_ID;
+            const url = Vps.SERVICE_URL + Vps.MAP_ID;
 
             // 1. Prepare the request
             if (!this._camera || this._camera.state !== Camera.State.STARTED) {
@@ -222,7 +222,7 @@ class VisionRelocalization extends Provider {
             return [];
         }
 
-        const { attitude, userPosition } = VisionRelocalization._parseJsonResponse(json, requestTime);
+        const { attitude, userPosition } = Vps._parseJsonResponse(json, requestTime);
 
         const events = [
             this.createEvent(EventType.AbsoluteAttitude, attitude),
@@ -269,4 +269,4 @@ class VisionRelocalization extends Provider {
     }
 }
 
-export default new VisionRelocalization();
+export default new Vps();