@wemap/positioning 2.3.5 → 2.3.7

package/src/providers/pose/pdr/PdrProvider.js

@@ -1,7 +1,7 @@
 import noop from 'lodash.noop';
 
 import {
-    Constants as GeoConstants, Itinerary, WGS84UserPosition
+    Constants as GeoConstants, Itinerary, WGS84UserPosition, WGS84
 } from '@wemap/geo';
 import {
     rad2deg, Quaternion
@@ -15,7 +15,6 @@ import RelativeAttitudeProvider from '../../attitude/RelativeAttitudeProvider';
 import ImuProvider from '../../others/ImuProvider';
 import EventType from '../../../events/EventType';
 import MapMatchingProvider from '../../others/MapMatchingProvider';
-import ProviderError from '../../../events/ProviderError';
 
 
 const MM_PDR_ANGLE = 20;
@@ -41,18 +40,20 @@ class PdrProvider extends MapMatchingProvider {
     * @override
     */
     constructor(onEvent, onError, options) {
-        super(onEvent, onError, Object.assign(DEFAULT_OPTIONS, options || {}));
+        super(onEvent, onError, Object.assign({}, DEFAULT_OPTIONS, options));
 
         // Input data providers
         this.relativeAttitudeProvider = new RelativeAttitudeProvider(
             e => this.onRelativeAttitudeEvent(e),
-            e => this.onProviderError(e),
-            options
+            onError,
+            this.options
         );
         this.imuProvider = new ImuProvider(
             e => this.onImuEvent(e),
-            e => this.onProviderError(e),
-            Object.assign(options || {}, { require: [EventType.Acceleration, EventType.AngularRate] })
+            onError,
+            Object.assign({}, this.options,
+                { require: [EventType.Acceleration, EventType.AngularRate] }
+            )
         );
 
         // Helpers for PDR
@@ -84,7 +85,7 @@ class PdrProvider extends MapMatchingProvider {
     /**
      * @override
      */
-    static get requiredProviders() {
+    static getRequiredProviders() {
         return [ImuProvider, RelativeAttitudeProvider];
     }
 
@@ -128,14 +129,21 @@ class PdrProvider extends MapMatchingProvider {
     }
 
     setPosition(position) {
-        this.pdrPosition = position;
+        if (position instanceof WGS84) {
+            this.pdrPosition = WGS84UserPosition.fromWGS84(position);
+            if (window && window.performance) {
+                this.pdrPosition.time = window.performance / 1e3;
+            }
+        } else {
+            this.pdrPosition = position;
+        }
 
         if (this.options.smoother) {
-            this.smoother.generateNextPositions(position, true);
+            this.smoother.generateNextPositions(this.pdrPosition, true);
             // this.smoother.pullPosition(position.time) should never return null
-            this.position = this.smoother.pullPosition(position.time);
+            this.position = this.smoother.pullPosition(this.pdrPosition.time);
         } else {
-            this.position = position.clone();
+            this.position = this.pdrPosition.clone();
         }
 
         this.notify(this.createEvent(EventType.AbsolutePosition, this.position));
@@ -233,27 +241,6 @@ class PdrProvider extends MapMatchingProvider {
         this.notify(this.createEvent(EventType.AbsolutePosition, this.position));
     }
 
-    onProviderError(errors) {
-        this.notifyError(...ProviderError.modifyArrayDataType(errors, EventType.AbsoluteAttitude));
-        this.notifyError(...ProviderError.modifyArrayDataType(errors, EventType.AbsolutePosition));
-    }
-
-    /**
-     * @override
-     */
-    static checkAvailabilityErrors() {
-        const errors = super.checkAvailabilityErrors();
-        return ProviderError.modifyArrayDataType(
-            errors,
-            EventType.AbsolutePosition
-        ).concat(
-            ProviderError.modifyArrayDataType(
-                errors,
-                EventType.AbsoluteAttitude
-            )
-        );
-    }
-
     calculateNewPosition(previousPosition, timestamp, heading, stepSize) {
 
         /**

package/src/providers/position/GnssWifiProvider.js

@@ -7,6 +7,7 @@ import GeolocationApiMissingError from '../../errors/GeolocationApiMissingError'
 import Provider from '../Provider';
 import GeolocationPermissionDeniedError from '../../errors/GeolocationPermissionDeniedError';
 import GeolocationPositionUnavailableError from '../../errors/GeolocationPositionUnavailableError';
+import Availability from '../../events/Availability';
 
 const POSITION_OPTIONS = {
     enableHighAccuracy: true,
@@ -39,18 +40,13 @@ class GnssWifiProvider extends Provider {
     /**
      * @override
      */
-    static checkAvailabilityErrors() {
-
-        if (navigator && navigator.geolocation) {
-            return [];
-        }
-
-        return [
-            GnssWifiProvider.createError(
-                EventType.AbsolutePosition,
-                new GeolocationApiMissingError()
-            )
-        ];
+    static checkAvailability(options) {
+        return Availability.merge(
+            super.checkAvailability(options),
+            navigator && navigator.geolocation
+                ? Availability.yes()
+                : Availability.no(new GeolocationApiMissingError())
+        );
     }
 
     /**
@@ -118,10 +114,7 @@ class GnssWifiProvider extends Provider {
         }
 
         if (customError) {
-            this.notifyError(this.createError(
-                EventType.AbsolutePosition,
-                customError
-            ));
+            this.notifyError(customError);
         }
     };
 }

package/src/providers/position/IpProvider.js

@@ -26,13 +26,6 @@ class IpProvider extends Provider {
         return [EventType.AbsolutePosition];
     }
 
-    /**
-     * @override
-     */
-    static checkAvailabilityErrors() {
-        return [];
-    }
-
     /**
      * @override
      */
@@ -41,10 +34,7 @@ class IpProvider extends Provider {
         fetch('https://ipinfo.io/geo?token=24a7ca2f3b489d')
             .then((response) => {
                 if (!response) {
-                    this.notifyError(this.createError(
-                        EventType.AbsolutePosition,
-                        new IpResolveServerError()
-                    ));
+                    this.notifyError(new IpResolveServerError());
                     return;
                 }
 

package/fix_gnsswifipdr_stop.patch

@@ -1,13 +0,0 @@
-diff --git a/src/providers/pose/GnssWifiPdrProvider.js b/src/providers/pose/GnssWifiPdrProvider.js
-index c35d429..901d8d3 100644
---- a/src/providers/pose/GnssWifiPdrProvider.js
-+++ b/src/providers/pose/GnssWifiPdrProvider.js
-@@ -73,7 +73,7 @@ class GnssWifiPdrProvider extends MapMatchingProvider {
-      * @override
-      */
-     stop() {
--        this.imuProvider.stop();
-+        this.pdrProvider.stop();
-         this.gnssWifiProvider.stop();
-         this.absoluteAttitudeProvider.stop();
-     }

package/src/events/ProviderError.js

@@ -1,52 +0,0 @@
-import EventType from './EventType';
-import ProviderEvent from './ProviderEvent';
-
-/**
- * A provider error is an error event which is triggered by device sensors
- * in case of problem
- */
-class ProviderError extends ProviderEvent {
-
-    error = null;
-
-    /**
-     * Create a Provider Error with the minimum information
-     * @param {String} providerName the provider name
-     * @param {EventType} dataType the type of event
-     * @param {Error} error the event error
-     */
-    constructor(providerName, dataType, error) {
-        super(providerName, dataType, null);
-        this.error = error;
-    }
-
-    clone() {
-        const evt = new ProviderError(this.providerName, this.dataType, this.error);
-        evt.timestamp = this.timestamp;
-        evt.isFromNative = this.isFromNative;
-        return evt;
-    }
-
-    /**
-     * Remove the same error in array
-     * @param {ProviderError[]} errorsArray
-     */
-    static removeArrayDuplicates(errorsArray) {
-        return errorsArray.reduce((acc, current) => {
-            const found = acc.find(item => typeof item.error === typeof current.error && item.dataType === current.dataType);
-            return !found ? acc.concat([current]) : acc;
-        }, []);
-    }
-
-    static modifyArrayDataType(errorsArray, newDataType) {
-        const output = [];
-        errorsArray.forEach(error => {
-            const newError = error.clone();
-            newError.dataType = newDataType;
-            output.push(newError);
-        });
-        return ProviderError.removeArrayDuplicates(output);
-    }
-}
-
-export default ProviderError;

package/src/providers/FakeAbsolutePositionProvider.js

@@ -1,56 +0,0 @@
-import {
-    WGS84, Attitude
-} from '@wemap/geo';
-import Provider from './Provider';
-import EventType from '../events/EventType';
-
-
-/**
- * @private
- */
-class FakeAbsolutePositionProvider extends Provider {
-
-    /**
-     * @override
-     */
-    static get displayName() {
-        return 'FakeAbsolutePosition';
-    }
-
-    /**
-     * @override
-     */
-    static get eventsType() {
-        return [EventType.AbsoluteAttitude, EventType.AbsolutePosition];
-    }
-
-    /**
-     * @override
-     */
-    startInternal() {
-
-        this.interval = setInterval(() => {
-            this.notify(
-                this.createEvent(EventType.AbsoluteAttitude, new Attitude([1, 0, 0, 0])),
-                this.createEvent(EventType.AbsolutePosition, new WGS84(45, 5))
-            );
-        }, 1000);
-
-        return Promise.resolve();
-    }
-
-    /**
-     * @override
-     */
-    stopInternal() {
-
-        if (this.interval) {
-            clearInterval(this.interval);
-            this.interval = null;
-        }
-        return Promise.resolve();
-    }
-
-}
-
-export default FakeAbsolutePositionProvider;