@wemap/providers 3.1.4 → 3.1.6

package/debug/MainComponent.jsx

@@ -15,20 +15,12 @@ class MainComponent extends React.Component {
         super(props, context);
         this.state = {
             details: true,
-            locationEnabled: false,
             mapHandler: null
         };
 
-        ProvidersInterface.logger = true;
+        ProvidersInterface.logger = false;
     }
 
-    onStart = () => {
-        this.setState({ locationEnabled: true });
-    }
-
-    onStop = () => {
-        this.setState({ locationEnabled: false });
-    }
 
     render() {
         return (
@@ -36,7 +28,6 @@ class MainComponent extends React.Component {
                 <div id='map-container'>
                     <MapComponent
                         ref={map => (this.map = map)}
-                        locationEnabled={this.state.locationEnabled}
                         onMapLoaded={mapHandler => this.setState({ mapHandler })}
                         indoorMaps={['assets/indoor-maps/bureaux-wemap-montpellier.geojson']}
                     />
@@ -48,11 +39,7 @@ class MainComponent extends React.Component {
                     </span>
                     {this.state.details ? (
                         <div id='details-container'>
-                            <DetailsComponent
-                                mapHandler={this.state.mapHandler}
-                                onStart={this.onStart}
-                                onStop={this.onStop}
-                            />
+                            <DetailsComponent mapHandler={this.state.mapHandler} />
                         </div>
                     ) : null}
                 </div>

package/debug/details/DetailsAttitudeComponent.jsx

@@ -22,6 +22,7 @@ const Orientations = [
     }
 ];
 
+const fps = 10;
 
 class DetailsAttitudeComponent extends React.PureComponent {
 
@@ -46,13 +47,19 @@ class DetailsAttitudeComponent extends React.PureComponent {
     }
 
     componentWillUnmount() {
-        clearInterval(this.renderLoopId);
+        if (this.timeoutLoopId) {
+            clearTimeout(this.timeoutLoopId);
+        }
+        cancelAnimationFrame(this.renderLoopId);
         ProvidersInterface.removeEventListener(this.providersId);
     }
 
     renderLoop = () => {
         this.renderAttitude();
-        this.renderLoopId = requestAnimationFrame(this.renderLoop);
+        this.timeoutLoopId = setTimeout(() => {
+            this.timeoutLoopId = null;
+            this.renderLoopId = requestAnimationFrame(this.renderLoop);
+        }, 1000 / fps);
     }
 
     renderAttitude = () => {

package/debug/details/DetailsComponent.jsx

@@ -1,4 +1,3 @@
-import noop from 'lodash.noop';
 import PropTypes from 'prop-types';
 import React from 'react';
 
@@ -11,16 +10,7 @@ import ItineraryComponent from './ItineraryComponent';
 
 class DetailsComponent extends React.Component {
 
-    static propTypes = {
-        mapHandler: PropTypes.instanceOf(MapHandler),
-        onStart: PropTypes.func,
-        onStop: PropTypes.func
-    };
-
-    static defaultProps = {
-        onStart: noop,
-        onStop: noop
-    };
+    static propTypes = { mapHandler: PropTypes.instanceOf(MapHandler) };
 
     render() {
 

package/debug/details/DetailsPositionComponent.jsx

@@ -32,6 +32,8 @@ const Positions = [
     }
 ];
 
+const fps = 10;
+
 class DetailsPositionComponent extends React.PureComponent {
 
     position = null;
@@ -55,13 +57,19 @@ class DetailsPositionComponent extends React.PureComponent {
     }
 
     componentWillUnmount() {
-        clearInterval(this.renderLoopId);
+        if (this.timeoutLoopId) {
+            clearTimeout(this.timeoutLoopId);
+        }
+        cancelAnimationFrame(this.renderLoopId);
         ProvidersInterface.removeEventListener(this.providersId);
     }
 
     renderLoop = () => {
         this.renderPosition();
-        this.renderLoopId = requestAnimationFrame(this.renderLoop);
+        this.timeoutLoopId = setTimeout(() => {
+            this.timeoutLoopId = null;
+            this.renderLoopId = requestAnimationFrame(this.renderLoop);
+        }, 1000 / fps);
     }
 
     renderPosition = () => {

package/debug/map/MapComponent.jsx

@@ -13,7 +13,6 @@ const BELOW_LAYER_ID = 'housenum-label';
 
 class MapComponent extends React.Component {
     static propTypes = {
-        locationEnabled: PropTypes.bool.isRequired,
         maxZoom: PropTypes.number,
         onMapLoaded: PropTypes.func,
         indoorMaps: PropTypes.array
@@ -55,12 +54,6 @@ class MapComponent extends React.Component {
         this.map.remove();
     }
 
-    componentDidUpdate(prevProps) {
-        if (prevProps.locationEnabled !== this.props.locationEnabled) {
-            this.mapHandler.locationEnabled = this.props.locationEnabled;
-        }
-    }
-
     loadIndoorMaps(mapsPaths) {
         return Promise.all(
             mapsPaths.map(mapPath =>

package/debug/map/helpers/UserOnMapHandler.js

@@ -62,17 +62,11 @@ class UserOnMapHandler {
 
 
     componentDidMount() {
-        this.renderPositionLoop();
-        this.renderPositionAccuracyLoop();
-        this.renderOrientationLoop();
-        this.renderCameraCenterLoop();
+        this.renderLoop();
     }
 
     componentWillUnmount() {
-        cancelAnimationFrame(this.renderPositionLoopId);
-        cancelAnimationFrame(this.renderPositionAccuracyLoopId);
-        cancelAnimationFrame(this.renderOrientationLoopId);
-        cancelAnimationFrame(this.renderCameraCenterLoopId);
+        cancelAnimationFrame(this.renderLoopId);
     }
 
 
@@ -243,9 +237,12 @@ class UserOnMapHandler {
      * Render loops
      */
 
-    renderPositionLoop = () => {
+    renderLoop = () => {
         this.renderPosition();
-        this.renderPositionLoopId = requestAnimationFrame(this.renderPositionLoop);
+        this.renderPositionAccuracy();
+        this.renderOrientation();
+        this.renderCameraCenter();
+        this.renderLoopId = requestAnimationFrame(this.renderLoop);
     }
 
     renderPosition() {
@@ -286,11 +283,6 @@ class UserOnMapHandler {
         this.levelForPositionDirty = false;
     }
 
-    renderPositionAccuracyLoop = () => {
-        this.renderPositionAccuracy();
-        this.renderPositionAccuracyLoopId = requestAnimationFrame(this.renderPositionAccuracyLoop);
-    }
-
     renderPositionAccuracy() {
 
         if (!this.positionAccuracyDirty) {
@@ -327,11 +319,6 @@ class UserOnMapHandler {
         this.positionAccuracyDirty = false;
     }
 
-    renderOrientationLoop = () => {
-        this.renderOrientation();
-        this.renderOrientationLoopId = requestAnimationFrame(this.renderOrientationLoop);
-    }
-
     renderOrientation() {
 
         if (!this.attitudeDirty || !this.positionIcon) {
@@ -352,12 +339,6 @@ class UserOnMapHandler {
         this.attitudeDirty = false;
     }
 
-    renderCameraCenterLoop = () => {
-        this.renderCameraCenter();
-        this.renderCameraCenterLoopId = requestAnimationFrame(this.renderCameraCenterLoop);
-    }
-
-
     renderCameraCenter() {
 
         if (!this.positionForCameraDirty || !this.trackUserLocation || !this.position) {

package/package.json

@@ -8,12 +8,12 @@
     "Guillaume Pannetier <guillaume.pannetier@getwemap.com>"
   ],
   "dependencies": {
-    "@wemap/geo": "^3.1.4",
-    "@wemap/graph": "^3.1.4",
+    "@wemap/geo": "^3.1.6",
+    "@wemap/graph": "^3.1.6",
     "@wemap/logger": "^3.0.0",
     "@wemap/maths": "^3.0.0",
-    "@wemap/osm": "^3.1.4",
-    "@wemap/utils": "^3.1.4",
+    "@wemap/osm": "^3.1.6",
+    "@wemap/utils": "^3.1.5",
     "geomagnetism": "^0.1.0",
     "lodash.isempty": "^4.4.0",
     "lodash.isnumber": "^3.0.3",
@@ -65,6 +65,6 @@
     "lint": "eslint --ext .js,.jsx --quiet src",
     "test": "mocha -r esm \"src/**/*.spec.js\""
   },
-  "version": "3.1.4",
-  "gitHead": "6c7ae4b3ebf1c24e46f3dccb84cfe91cc5534af4"
+  "version": "3.1.6",
+  "gitHead": "f7967fd5b465e1e2be1c575ef0f2150adde4825f"
 }

package/src/providers/FakeProvider.spec.js

@@ -1,20 +1,15 @@
 import { UserPosition } from '@wemap/geo';
 
 import Provider from './Provider';
-import Availability from '../events/Availability';
 
 import EventType from '../events/EventType';
 import { TimeUtils } from '@wemap/utils';
 
 class FakeProvider1 extends Provider { }
 
-class FakeProvider5 extends Provider {
-    start() {}
-}
-
 class FakeProvider2 extends Provider {
     get _availability() {
-        return Availability.no(new Error());
+        return Promise.reject(new Error());
     }
     start() { }
     stop() { }
@@ -53,5 +48,5 @@ class FakeProvider4 extends Provider {
 }
 
 export {
-    FakeProvider1, FakeProvider2, FakeProvider3, FakeProvider4, FakeProvider5
+    FakeProvider1, FakeProvider2, FakeProvider3, FakeProvider4
 };

package/src/providers/Provider.js

@@ -6,7 +6,6 @@ import { TimeUtils } from '@wemap/utils';
 import EventType from '../events/EventType';
 import ProviderEvent from '../events/ProviderEvent';
 import ProvidersLogger from '../events/ProvidersLogger';
-import Availability from '../events/Availability';
 import ContainsIgnoredProviderError from '../errors/ContainsIgnoredProviderError';
 import ProvidersOptions from '../ProvidersOptions';
 import ProviderState from './ProviderState';
@@ -85,18 +84,18 @@ class Provider {
     }
 
     /**
-     * @returns {Availability} returns an availability
+     * @returns {Promise} returns an availability promise
      */
     get availability() {
         if (ProvidersOptions.ignoreProviders.includes(this.name)) {
-            return Availability.no(new ContainsIgnoredProviderError());
+            return Promise.reject(new ContainsIgnoredProviderError());
         }
 
         return this._availability;
     }
 
     get _availability() {
-        return Availability.yes();
+        return Promise.resolve();
     }
 
     /**
@@ -177,22 +176,28 @@ class Provider {
         }
 
         // Check availability on start if defined in options
+        let availabilityPromise = Promise.resolve();
         if (ProvidersOptions.checkAvailabilityOnStart) {
-            if (!this.availability.isSupported) {
-                this.notifyError(this.availability.reason);
-                return id;
-            }
+            availabilityPromise = this.availability;
         }
 
-        this.state = ProviderState.STARTING;
+        availabilityPromise
+            .then(() => {
+                this.state = ProviderState.STARTING;
 
-        ProvidersLogger.addEvent(this, 'start');
-        // Call the child start function
-        this.start();
+                ProvidersLogger.addEvent(this, 'start');
+                // Call the child start function
+                this.start();
 
-        this.state = ProviderState.STARTED;
+                this.state = ProviderState.STARTED;
 
-        this._monitoringCallbacks.forEach(({ onStarted }) => onStarted());
+                this._monitoringCallbacks.forEach(({ onStarted }) => onStarted());
+            })
+            .catch(e => {
+                this.notifyError(e);
+            })
+            // notifyError can throw an error if onStop is not defined
+            .catch(() => noop);
 
         return id;
     }

package/src/providers/Provider.spec.js

@@ -10,7 +10,7 @@ import Provider from './Provider';
 import ContainsIgnoredProviderError from '../errors/ContainsIgnoredProviderError';
 
 import {
-    FakeProvider1, FakeProvider2, FakeProvider3, FakeProvider4, FakeProvider5
+    FakeProvider1, FakeProvider2, FakeProvider3, FakeProvider4
 } from './FakeProvider.spec';
 import ProvidersOptions from '../ProvidersOptions';
 import ProviderState from './ProviderState';
@@ -20,6 +20,7 @@ Logger.enable(false);
 
 const { expect } = chai;
 
+const sleep = ms => new Promise(resolve => setTimeout(resolve, ms));
 
 describe('Provider', () => {
 
@@ -45,23 +46,21 @@ describe('Provider', () => {
         expect(provider.useCameraNatively).is.false;
     });
 
-    it('availability', () => {
+    it('availability', async () => {
 
         const fakeProvider1 = FakeProvider1.instance;
-        expect(fakeProvider1.availability.isSupported).is.true;
+        await expect(fakeProvider1.availability).to.be.fulfilled;
         ProvidersOptions.ignoreProviders.push(FakeProvider1.name);
-        expect(fakeProvider1.availability.isSupported).is.false;
-        expect(fakeProvider1.availability.reason).instanceOf(ContainsIgnoredProviderError);
+        await expect(fakeProvider1.availability).to.be.rejectedWith(ContainsIgnoredProviderError);
         ProvidersOptions.ignoreProviders = [];
 
-        expect(FakeProvider2.instance.availability.isSupported).is.false;
-        expect(FakeProvider2.instance.availability.reason).instanceOf(Error);
+        await expect(FakeProvider2.instance.availability).to.be.rejectedWith(Error);
 
-        expect(FakeProvider3.instance.availability.isSupported).is.true;
-        expect(FakeProvider4.instance.availability.isSupported).is.true;
+        await expect(FakeProvider3.instance.availability).to.be.fulfilled;
+        await expect(FakeProvider4.instance.availability).to.be.fulfilled;
     });
 
-    it('checkAvailability on start', () => {
+    it('checkAvailability on start', async () => {
 
         const fp2 = FakeProvider2.instance;
 
@@ -71,6 +70,8 @@ describe('Provider', () => {
         let errored = false;
         fp2.addEventListener(noop, () => (errored = true));
 
+        await sleep(2);
+
         expect(errored).is.true;
         expect(fp2.state).equals(ProviderState.STOPPPED);
         expect(fp2._eventsCallbacks.length).equals(0);
@@ -83,6 +84,8 @@ describe('Provider', () => {
         errored = false;
         const id = fp2.addEventListener(noop, () => (errored = true));
 
+        await sleep(2);
+
         expect(errored).is.false;
         expect(fp2.state).equals(ProviderState.STARTED);
 
@@ -120,17 +123,15 @@ describe('Provider', () => {
     };
 
 
-    it('start/stop', () => {
-        expect(() => FakeProvider1.instance.addEventListener()).throw(Error);
+    it('start/stop', async () => {
+        let errored = false;
+        FakeProvider1.instance.addEventListener(noop, (errored = true));
+        await sleep(2);
+        expect(errored).is.true;
 
-        const idFp5 = FakeProvider5.instance.addEventListener();
-        expect(() => FakeProvider5.instance.removeEventListener(idFp5)).throw(Error);
+        await expect(startStop(FakeProvider2.instance)).to.be.fulfilled;
+        await expect(startStop(FakeProvider3.instance)).to.be.fulfilled;
+        await expect(startStop(FakeProvider4.instance)).to.be.fulfilled;
 
-        return Promise.all([
-            expect(startStop(FakeProvider2.instance)).to.be.fulfilled,
-            expect(startStop(FakeProvider3.instance)).to.be.fulfilled,
-            expect(startStop(FakeProvider4.instance)).to.be.fulfilled
-        ]);
     });
-
 });

package/src/providers/attitude/absolute/AbsoluteAttitudeFromBrowserProvider.js

@@ -16,7 +16,6 @@ import EventType from '../../../events/EventType';
 import AskImuOnDesktopError from '../../../errors/AskImuOnDesktopError';
 import MissingMagnetometerError from '../../../errors/MissingMagnetometerError';
 import MissingSensorError from '../../../errors/MissingSensorError';
-import Availability from '../../../events/Availability';
 import { AbsolutePosition } from '../../../Providers';
 
 
@@ -61,8 +60,8 @@ class AbsoluteAttitudeFromBrowserProvider extends Provider {
      */
     get _availability() {
         return BrowserUtils.isMobile
-            ? Availability.yes()
-            : Availability.no(new AskImuOnDesktopError());
+            ? Promise.resolve()
+            : Promise.reject(new AskImuOnDesktopError());
     }
 
     /**

package/src/providers/attitude/absolute/AbsoluteAttitudeProvider.js

@@ -1,10 +1,10 @@
 import {
     AbsoluteHeading, Attitude
 } from '@wemap/geo';
+import { PromiseUtils } from '@wemap/utils';
 
 import MetaProvider from '../../MetaProvider';
 import EventType from '../../../events/EventType';
-import Availability from '../../../events/Availability';
 import {
     AbsoluteAttitudeFromBrowser, AbsoluteAttitudeFromRelAtt
 } from '../../../Providers';
@@ -40,10 +40,10 @@ class AbsoluteAttitudeProvider extends MetaProvider {
      * @override
      */
     get _availability() {
-        return Availability.union(
+        return PromiseUtils.any([
             AbsoluteAttitudeFromBrowser.availability,
             AbsoluteAttitudeFromRelAtt.availability
-        );
+        ]);
     }
 
     /**

package/src/providers/attitude/relative/RelativeAttitudeFromBrowserProvider.js

@@ -8,7 +8,6 @@ import Provider from '../../Provider';
 import EventType from '../../../events/EventType';
 import AskImuOnDesktopError from '../../../errors/AskImuOnDesktopError';
 import MissingSensorError from '../../../errors/MissingSensorError';
-import Availability from '../../../events/Availability';
 import RelativeAttitudeFromInertialProvider from './RelativeAttitudeFromInertialProvider';
 
 
@@ -48,8 +47,8 @@ class RelativeAttitudeFromBrowserProvider extends Provider {
      */
     get _availability() {
         return BrowserUtils.isMobile
-            ? Availability.yes()
-            : Availability.no(new AskImuOnDesktopError());
+            ? Promise.resolve()
+            : Promise.reject(new AskImuOnDesktopError());
     }
 
     /**

package/src/providers/attitude/relative/RelativeAttitudeFromEkfProvider.js

@@ -1,7 +1,6 @@
 import { Attitude } from '@wemap/geo';
 
 import Provider from '../../Provider';
-import Availability from '../../../events/Availability';
 import EventType from '../../../events/EventType';
 import EkfAttitude from '../EkfAttitude';
 import RelativeAttitudeFromInertialProvider from './RelativeAttitudeFromInertialProvider';
@@ -45,10 +44,10 @@ class RelativeAttitudeFromEkfProvider extends Provider {
      * @override
      */
     get _availability() {
-        return Availability.merge(
+        return Promise.all([
             Accelerometer.availability,
-            Gyroscope.availability,
-        );
+            Gyroscope.availability
+        ]);
     }
 
     /**

package/src/providers/attitude/relative/RelativeAttitudeFromInertialProvider.js

@@ -1,8 +1,8 @@
 import { deg2rad } from '@wemap/maths';
+import { PromiseUtils } from '@wemap/utils';
 
 import Provider from '../../Provider';
 import EventType from '../../../events/EventType';
-import Availability from '../../../events/Availability';
 import {
     RelativeAttitudeFromEkf, RelativeAttitudeFromBrowser
 } from '../../../Providers';
@@ -33,31 +33,37 @@ class RelativeAttitudeFromInertialProvider extends Provider {
      * @override
      */
     get _availability() {
-        return Availability.union(
+        return PromiseUtils.any([
             RelativeAttitudeFromEkf.availability,
             RelativeAttitudeFromBrowser.availability
-        );
+        ]);
     }
 
     /**
      * @override
      */
     start() {
-        this.provider = RelativeAttitudeFromEkf.availability.isSupported
-            ? RelativeAttitudeFromEkf
-            : RelativeAttitudeFromBrowser;
 
-        this.listenerId = this.provider.addEventListener(
-            events => this.notify(events[0].clone()),
-            error => this.notifyError(error),
-            this.name);
+        RelativeAttitudeFromEkf.availability
+            .then(() => (this.provider = RelativeAttitudeFromEkf))
+            .catch(() => (this.provider = RelativeAttitudeFromBrowser))
+            .finally(() => {
+                this.listenerId = this.provider.addEventListener(
+                    events => this.notify(events[0].clone()),
+                    error => this.notifyError(error),
+                    this.name);
+            });
+
     }
 
     /**
      * @override
      */
     stop() {
-        this.provider.removeEventListener(this.listenerId);
+        if (this.provider) {
+            this.provider.removeEventListener(this.listenerId);
+            this.provider = null;
+        }
     }
 }
 

package/src/providers/imu/ImuProvider.js

@@ -8,7 +8,6 @@ import {
 import Provider from '../Provider';
 import EventType from '../../events/EventType';
 import AskImuOnDesktopError from '../../errors/AskImuOnDesktopError';
-import Availability from '../../events/Availability';
 
 /**
  * Imu (Inertial Measurement Unit) provider retrieve acceleration data
@@ -46,8 +45,8 @@ class ImuProvider extends Provider {
      */
     get _availability() {
         return BrowserUtils.isMobile
-            ? Availability.yes()
-            : Availability.no(new AskImuOnDesktopError());
+            ? Promise.resolve()
+            : Promise.reject(new AskImuOnDesktopError());
     }
 
     /**

package/src/providers/inclination/InclinationProvider.js

@@ -1,6 +1,7 @@
+import { PromiseUtils } from '@wemap/utils';
+
 import MetaProvider from '../MetaProvider';
 import EventType from '../../events/EventType';
-import Availability from '../../events/Availability';
 import {
     InclinationFromRelativeAttitude, InclinationFromAcc
 } from '../../Providers';
@@ -24,10 +25,10 @@ class InclinationProvider extends MetaProvider {
      * @override
      */
     get _availability() {
-        return Availability.union(
+        return PromiseUtils.any([
             InclinationFromAcc.availability,
             InclinationFromRelativeAttitude.availability
-        );
+        ]);
     }
 
     /**

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

@@ -5,11 +5,11 @@ import {
     MapMatching, Network
 } from '@wemap/graph';
 import { deg2rad } from '@wemap/maths';
+import { PromiseUtils } from '@wemap/utils';
 
 import MetaProvider from '../../MetaProvider';
 import EventType from '../../../events/EventType';
 import ProviderEvent from '../../../events/ProviderEvent';
-import Availability from '../../../events/Availability';
 import {
     AbsolutePositionFromRel, GnssWifi
 } from '../../../Providers';
@@ -52,10 +52,10 @@ class AbsolutePositionProvider extends MetaProvider {
      * @override
      */
     get _availability() {
-        return Availability.union(
+        return PromiseUtils.any([
             AbsolutePositionFromRel.availability,
             GnssWifi.availability
-        );
+        ]);
     }
 
 
@@ -63,13 +63,17 @@ class AbsolutePositionProvider extends MetaProvider {
      * @override
      */
     start() {
-        if (AbsolutePositionFromRel.availability.isSupported) {
-            this.fromRelPosProviderId = AbsolutePositionFromRel.addEventListener(
-                events => this.onAbsolutePositionFromRel(events[0]),
-                noop,
-                this.name
-            );
-        }
+        AbsolutePositionFromRel.availability
+            .then(() => {
+                this.fromRelPosProviderId = AbsolutePositionFromRel.addEventListener(
+                    events => this.onAbsolutePositionFromRel(events[0]),
+                    noop,
+                    this.name
+                );
+            })
+            .catch(() => {
+                // do nothing
+            });
 
         this.gnssWifiProviderId = GnssWifi.addEventListener(
             events => this.onAbsolutePosition(events[0], false),

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

@@ -7,7 +7,6 @@ import GeolocationApiMissingError from '../../../errors/GeolocationApiMissingErr
 import Provider from '../../Provider';
 import GeolocationPermissionDeniedError from '../../../errors/GeolocationPermissionDeniedError';
 import GeolocationPositionUnavailableError from '../../../errors/GeolocationPositionUnavailableError';
-import Availability from '../../../events/Availability';
 import Constants from '../../Constants';
 
 const POSITION_OPTIONS = {
@@ -43,8 +42,8 @@ class GnssWifiProvider extends Provider {
      */
     get _availability() {
         return typeof(navigator) === 'object' && navigator.geolocation
-            ? Availability.yes()
-            : Availability.no(new GeolocationApiMissingError());
+            ? Promise.resolve()
+            : Promise.reject(new GeolocationApiMissingError());
     }
 
     /**

package/src/providers/position/relative/ArCoreProvider.js

@@ -9,7 +9,6 @@ import Provider from '../../Provider';
 import EventType from '../../../events/EventType';
 import MissingArCoreError from '../../../errors/MissingArCoreError';
 import MissingNativeInterfaceError from '../../../errors/MissingNativeInterfaceError';
-import Availability from '../../../events/Availability';
 import ProviderState from '../../ProviderState';
 
 
@@ -164,14 +163,14 @@ class ArCoreProvider extends Provider {
             const nativeProvider = this.nativeProvider;
 
             if (!nativeProvider.checkAvailability()) {
-                return Availability.no(new MissingArCoreError());
+                return Promise.reject(new MissingArCoreError());
             }
 
         } catch (e) {
-            return Availability.no(e);
+            return Promise.reject(e);
         }
 
-        return Availability.yes();
+        return Promise.resolve();
     }
 
     enableBarcodeScanner() {

package/src/providers/position/relative/GeoRelativePositionProvider.js

@@ -1,5 +1,6 @@
+import { PromiseUtils } from '@wemap/utils';
+
 import MetaProvider from '../../MetaProvider';
-import Availability from '../../../events/Availability';
 import EventType from '../../../events/EventType';
 import {
     Pdr, GeoRelativePositionFromArCore
@@ -25,10 +26,10 @@ class GeoRelativePositionProvider extends MetaProvider {
      * @override
      */
     get _availability() {
-        return Availability.union(
+        return PromiseUtils.any([
             Pdr.availability,
             GeoRelativePositionFromArCore.availability
-        );
+        ]);
     }
 
 
@@ -37,29 +38,31 @@ class GeoRelativePositionProvider extends MetaProvider {
      */
     start() {
 
-        if (GeoRelativePositionFromArCore.availability.isSupported) {
-            this.geoRelativeProvider = GeoRelativePositionFromArCore;
-        } else {
-            this.geoRelativeProvider = Pdr;
-        }
-
-        this.providerId = this.geoRelativeProvider.addEventListener(
-            events => {
-                const event = events.find(_event => _event.dataType === EventType.GeoRelativePosition);
-                if (event) {
-                    this.notify(event.clone());
-                }
-            },
-            error => this.notifyError(error),
-            this.name
-        );
+        GeoRelativePositionFromArCore.availability
+            .then(() => (this.geoRelativeProvider = GeoRelativePositionFromArCore))
+            .catch(() => (this.geoRelativeProvider = Pdr))
+            .finally(() => {
+                this.providerId = this.geoRelativeProvider.addEventListener(
+                    events => {
+                        const event = events.find(_event => _event.dataType === EventType.GeoRelativePosition);
+                        if (event) {
+                            this.notify(event.clone());
+                        }
+                    },
+                    error => this.notifyError(error),
+                    this.name
+                );
+            });
     }
 
     /**
      * @override
      */
     stop() {
-        this.geoRelativeProvider.removeEventListener(this.providerId);
+        if (this.geoRelativeProvider) {
+            this.geoRelativeProvider.removeEventListener(this.providerId);
+            this.geoRelativeProvider = null;
+        }
     }
 }
 

package/src/providers/position/relative/PdrProvider.js

@@ -2,7 +2,6 @@ import { GeoRelativePosition } from '@wemap/geo';
 import { deg2rad } from '@wemap/maths';
 
 import Provider from '../../Provider';
-import Availability from '../../../events/Availability';
 import EventType from '../../../events/EventType';
 import {
     StepDetection, AbsoluteAttitude
@@ -32,10 +31,10 @@ class PdrProvider extends Provider {
      * @override
      */
     get _availability() {
-        return Availability.merge(
+        return Promise.all([
             StepDetection.availability,
             AbsoluteAttitude.availability
-        );
+        ]);
     }
 
 

package/src/providers/steps/StepDetectionProvider.js

@@ -1,7 +1,6 @@
 import { Constants as GeoConstants } from '@wemap/geo';
 import { Quaternion } from '@wemap/maths';
 
-import Availability from '../../events/Availability';
 import EventType from '../../events/EventType';
 import Provider from '../Provider';
 import StepDetectionMinMaxPeaks2 from './StepDetectionMinMaxPeaks2';
@@ -20,11 +19,11 @@ class StepDetectionProvider extends Provider {
      * @override
      */
     get _availability() {
-        return Availability.merge(
+        return Promise.all([
             Accelerometer.availability,
             Gyroscope.availability,
             RelativeAttitudeFromInertial.availability
-        );
+        ]);
     }
 
     /**

package/src/events/Availability.js

@@ -1,44 +0,0 @@
-class Availability {
-
-    isSupported = false;
-    reason = null;
-
-    static no(reason) {
-        const availability = new Availability();
-        availability.reason = reason;
-        availability.isSupported = false;
-        return availability;
-    }
-
-    static yes() {
-        const availability = new Availability();
-        availability.isSupported = true;
-        return availability;
-    }
-
-    static merge(...availabilities) {
-        for (let i = 0; i < availabilities.length; i++) {
-            const availability = availabilities[i];
-            if (!availability.isSupported) {
-                return availability;
-            }
-        }
-        return Availability.yes();
-    }
-
-    static union(...availabilities) {
-        if (availabilities.length === 0) {
-            return Availability.yes();
-        }
-
-        for (let i = 0; i < availabilities.length; i++) {
-            const availability = availabilities[i];
-            if (availability.isSupported) {
-                return availability;
-            }
-        }
-        return availabilities[0];
-    }
-}
-
-export default Availability;