@wemap/providers 3.1.23 → 3.2.2

package/src/providers/legacy/helpers/HeadingUnlocker.spec.js

@@ -3,7 +3,7 @@ import chaiAlmost from 'chai-almost';
 
 import { deg2rad } from '@wemap/maths';
 
-import HeadingUnlocker from './HeadingUnlocker';
+import HeadingUnlocker from './HeadingUnlocker.js';
 
 const expect = chai.expect;
 chai.use(chaiAlmost());

package/src/providers/others/BarcodeProvider.js

@@ -1,6 +1,6 @@
-import Provider from '../Provider';
-import EventType from '../../events/EventType';
-import { ArCore } from '../../Providers';
+import Provider from '../Provider.js';
+import EventType from '../../events/EventType.js';
+import { ArCore } from '../../Providers.js';
 
 class BarcodeProvider extends Provider {
 

package/src/providers/others/CameraNativeProvider.js

@@ -1,7 +1,7 @@
-import MetaProvider from '../MetaProvider';
-import EventType from '../../events/EventType';
-import { ArCore } from '../../Providers';
-import ProviderState from '../ProviderState';
+import MetaProvider from '../MetaProvider.js';
+import EventType from '../../events/EventType.js';
+import { ArCore } from '../../Providers.js';
+import ProviderState from '../ProviderState.js';
 
 class CameraNativeProvider extends MetaProvider {
 

package/src/providers/others/CameraProjectionMatrixProvider.js

@@ -1,6 +1,6 @@
-import MetaProvider from '../MetaProvider';
-import EventType from '../../events/EventType';
-import { ArCore } from '../../Providers';
+import MetaProvider from '../MetaProvider.js';
+import EventType from '../../events/EventType.js';
+import { ArCore } from '../../Providers.js';
 
 class CameraProjectionMatrixProvider extends MetaProvider {
 

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

@@ -1,9 +1,9 @@
-import Provider from '../../Provider';
-import EventType from '../../../events/EventType';
-import ProviderEvent from '../../../events/ProviderEvent';
+import Provider from '../../Provider.js';
+import EventType from '../../../events/EventType.js';
+import ProviderEvent from '../../../events/ProviderEvent.js';
 import {
     AbsolutePosition, GeoRelativePosition
-} from '../../../Providers';
+} from '../../../Providers.js';
 
 class AbsolutePositionFromRelProvider extends Provider {
 

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

@@ -7,13 +7,13 @@ import {
 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 MetaProvider from '../../MetaProvider.js';
+import EventType from '../../../events/EventType.js';
+import ProviderEvent from '../../../events/ProviderEvent.js';
 import {
     AbsolutePositionFromRel, GnssWifi
-} from '../../../Providers';
-import ProvidersOptions from '../../../ProvidersOptions';
+} from '../../../Providers.js';
+import ProvidersOptions from '../../../ProvidersOptions.js';
 
 // Position accuracy uncertainty ratio
 const ACCURACY_NEW_POS_EPS_RATIO = 1.5;

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

@@ -2,12 +2,13 @@ import { deg2rad } from '@wemap/maths';
 import { UserPosition } from '@wemap/geo';
 import { TimeUtils } from '@wemap/utils';
 
-import EventType from '../../../events/EventType';
-import GeolocationApiMissingError from '../../../errors/GeolocationApiMissingError';
-import Provider from '../../Provider';
-import GeolocationPermissionDeniedError from '../../../errors/GeolocationPermissionDeniedError';
-import GeolocationPositionUnavailableError from '../../../errors/GeolocationPositionUnavailableError';
-import Constants from '../../Constants';
+import EventType from '../../../events/EventType.js';
+import GeolocationApiMissingError from '../../../errors/GeolocationApiMissingError.js';
+import Provider from '../../Provider.js';
+import GeolocationPermissionDeniedError from '../../../errors/GeolocationPermissionDeniedError.js';
+import GeolocationPositionUnavailableError from '../../../errors/GeolocationPositionUnavailableError.js';
+import Constants from '../../Constants.js';
+import NavigationLogger from '../../../logger/NavigationLogger.js';
 
 const POSITION_OPTIONS = {
     enableHighAccuracy: true,
@@ -72,6 +73,8 @@ class GnssWifiProvider extends Provider {
      * @private
      */
     onNewPosition = geolocation => {
+        NavigationLogger.feedGeolocation(geolocation);
+
         const { coords } = geolocation;
         if (!coords) {
             return;

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

@@ -1,9 +1,9 @@
 import { UserPosition } from '@wemap/geo';
 import { TimeUtils } from '@wemap/utils';
 
-import EventType from '../../../events/EventType';
-import Provider from '../../Provider';
-import IpResolveServerError from '../../../errors/IpResolveServerError';
+import EventType from '../../../events/EventType.js';
+import Provider from '../../Provider.js';
+import IpResolveServerError from '../../../errors/IpResolveServerError.js';
 
 /**
  * GnssWifiProvider is a provider based on navigator.geolocation.

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

@@ -5,11 +5,11 @@ import {
 import { deg2rad } from '@wemap/maths';
 import { TimeUtils } from '@wemap/utils';
 
-import Provider from '../../Provider';
-import EventType from '../../../events/EventType';
-import MissingArCoreError from '../../../errors/MissingArCoreError';
-import MissingNativeInterfaceError from '../../../errors/MissingNativeInterfaceError';
-import ProviderState from '../../ProviderState';
+import Provider from '../../Provider.js';
+import EventType from '../../../events/EventType.js';
+import MissingArCoreError from '../../../errors/MissingArCoreError.js';
+import MissingNativeInterfaceError from '../../../errors/MissingNativeInterfaceError.js';
+import ProviderState from '../../ProviderState.js';
 
 
 const Payload = {

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

@@ -1,10 +1,10 @@
 import { GeoRelativePosition } from '@wemap/geo';
 
-import EventType from '../../../events/EventType';
-import Provider from '../../Provider';
+import EventType from '../../../events/EventType.js';
+import Provider from '../../Provider.js';
 import {
     ArCore, AbsoluteAttitude
-} from '../../../Providers';
+} from '../../../Providers.js';
 
 class GeoRelativePositionFromArCoreProvider extends Provider {
 

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

@@ -1,10 +1,10 @@
 import { PromiseUtils } from '@wemap/utils';
 
-import MetaProvider from '../../MetaProvider';
-import EventType from '../../../events/EventType';
+import MetaProvider from '../../MetaProvider.js';
+import EventType from '../../../events/EventType.js';
 import {
     Pdr, GeoRelativePositionFromArCore
-} from '../../../Providers';
+} from '../../../Providers.js';
 
 class GeoRelativePositionProvider extends MetaProvider {
 

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

@@ -1,11 +1,11 @@
 import { GeoRelativePosition } from '@wemap/geo';
 import { deg2rad } from '@wemap/maths';
 
-import Provider from '../../Provider';
-import EventType from '../../../events/EventType';
+import Provider from '../../Provider.js';
+import EventType from '../../../events/EventType.js';
 import {
     StepDetection, AbsoluteAttitude
-} from '../../../Providers';
+} from '../../../Providers.js';
 
 class PdrProvider extends Provider {
 

package/src/providers/steps/StepDetectionProvider.js

@@ -1,12 +1,12 @@
 import { Constants as GeoConstants } from '@wemap/geo';
 import { Quaternion } from '@wemap/maths';
 
-import EventType from '../../events/EventType';
-import Provider from '../Provider';
-import StepDetectionMinMaxPeaks2 from './StepDetectionMinMaxPeaks2';
+import EventType from '../../events/EventType.js';
+import Provider from '../Provider.js';
+import StepDetectionMinMaxPeaks2 from './StepDetectionMinMaxPeaks2.js';
 import {
     Accelerometer, Gyroscope, RelativeAttitudeFromInertial
-} from '../../Providers';
+} from '../../Providers.js';
 
 class StepDetectionProvider extends Provider {
 
@@ -15,6 +15,13 @@ class StepDetectionProvider extends Provider {
         this.stepDetector = new StepDetectionMinMaxPeaks2();
     }
 
+    /**
+    * @override
+    */
+    static get pname() {
+        return 'StepDetection';
+    }
+
     /**
      * @override
      */

package/src/smoothers/PositionSmoother.spec.js

@@ -5,7 +5,7 @@ import {
     Constants as GeoConstants, Coordinates, UserPosition
 } from '@wemap/geo';
 
-import Smoother from './PositionSmoother';
+import Smoother from './PositionSmoother.js';
 
 
 const expect = chai.expect;

package/webpack/{webpack.common.js → webpack.common.cjs}

@@ -1,3 +1,5 @@
+const path = require('path');
+
 module.exports = {
     module: {
         rules: [
@@ -16,5 +18,9 @@ module.exports = {
             }
         ]
     },
-    resolve: { extensions: ['.js', '.jsx'] }
+    resolve: {
+        extensions: ['.js', '.jsx'],
+        alias: { 'mapbox-gl': path.resolve('node_modules', 'mapbox-gl') }
+    }
+
 };

package/webpack/{webpack.dev.js → webpack.dev.cjs}

@@ -1,7 +1,7 @@
 const merge = require('webpack-merge');
 const path = require('path');
 
-const common = require('./webpack.common.js');
+const common = require('./webpack.common.cjs');
 const config = require('../config.json');
 
 const distFolder = path.join(__dirname, '../', config.distFolder);
@@ -21,11 +21,5 @@ module.exports = merge(common, {
         hot: true,
         host: '0.0.0.0',
         port: 9000
-    },
-    resolve: {
-        alias: {
-            'mapbox-gl': '@thibaudm/mapbox-gl-js-indoor/dist/mapbox-gl.js',
-            'mapbox-gl-css': '@thibaudm/mapbox-gl-js-indoor/dist/mapbox-gl.css'
-        }
     }
 });

package/webpack/{webpack.prod.js → webpack.prod.cjs}

@@ -1,7 +1,7 @@
 const merge = require('webpack-merge');
 const path = require('path');
 
-const common = require('./webpack.common.js');
+const common = require('./webpack.common.cjs');
 const config = require('../config.json');
 
 module.exports = merge(common, {

package/babel.config.js

@@ -1,11 +0,0 @@
-module.exports = function(api) {
-    api.cache(true);
-
-    const presets = ['@babel/preset-env', '@babel/preset-react'];
-    const plugins = ['@babel/plugin-proposal-class-properties'];
-
-    return {
-        presets,
-        plugins
-    };
-};

package/debug/map/MapboxHelper.js

@@ -1,50 +0,0 @@
-import mapboxgl from 'mapbox-gl';
-
-class MapboxHelper {
-
-    static coordsToLngLat = coords => [coords.lng, coords.lat];
-
-    // https://stackoverflow.com/a/39006388/2239938
-    static createGeoJSONCircle(center, radiusInKm, points) {
-        if (!points) {
-            points = 64;
-        }
-
-        var coords = {
-            latitude: center[1],
-            longitude: center[0]
-        };
-
-        var km = radiusInKm;
-
-        var ret = [];
-        var distanceX = km / (111.320 * Math.cos(coords.latitude * Math.PI / 180));
-        var distanceY = km / 110.574;
-
-        var theta, x, y;
-        for (let i = 0; i < points; i++) {
-            theta = (i / points) * (2 * Math.PI);
-            x = distanceX * Math.cos(theta);
-            y = distanceY * Math.sin(theta);
-
-            ret.push([coords.longitude + x, coords.latitude + y]);
-        }
-        ret.push(ret[0]);
-        return ret;
-    }
-
-    static createMarker(options) {
-        const elem = document.createElement('div');
-        elem.style.marginLeft = '-' + options.iconAnchor[0] + 'px';
-        elem.style.marginTop = '-' + options.iconAnchor[1] + 'px';
-        elem.style.width = 0;
-        elem.style.height = 0;
-        elem.appendChild(options.dom);
-
-        const marker = new mapboxgl.Marker(elem);
-        marker.setLngLat([options.longitude, options.latitude]);
-        return marker;
-    }
-}
-
-export default MapboxHelper;