@wemap/providers 3.1.2 → 3.1.4

package/package.json

@@ -8,12 +8,12 @@
     "Guillaume Pannetier <guillaume.pannetier@getwemap.com>"
   ],
   "dependencies": {
-    "@wemap/geo": "^3.0.0",
-    "@wemap/graph": "^3.0.0",
+    "@wemap/geo": "^3.1.4",
+    "@wemap/graph": "^3.1.4",
     "@wemap/logger": "^3.0.0",
     "@wemap/maths": "^3.0.0",
-    "@wemap/osm": "^3.1.0",
-    "@wemap/utils": "^3.0.0",
+    "@wemap/osm": "^3.1.4",
+    "@wemap/utils": "^3.1.4",
     "geomagnetism": "^0.1.0",
     "lodash.isempty": "^4.4.0",
     "lodash.isnumber": "^3.0.3",
@@ -25,9 +25,10 @@
     "@babel/plugin-proposal-class-properties": "^7.5.5",
     "@babel/preset-env": "^7.5.5",
     "@babel/preset-react": "^7.0.0",
+    "@thibaudm/mapbox-gl-js-indoor": "^1.7.0-6",
     "babel-loader": "^8.0.6",
     "css-loader": "^3.2.0",
-    "mapbox-gl": "^1.3.0",
+    "file-loader": "^5.0.2",
     "prop-types": "^15.7.2",
     "react": "^16.11.0",
     "react-dom": "^16.11.0",
@@ -60,9 +61,10 @@
     "build-debug": "webpack --display-modules --config webpack/webpack.dev.js",
     "stats": "webpack --config webpack/webpack.prod.js --profile --json > stats.json",
     "start": "webpack-dev-server --config webpack/webpack.dev.js --progress --inline --hot --https",
+    "start-secure": "webpack-dev-server --config webpack/webpack.dev.js --progress --inline --hot --https --cert $(grep PEM .env | cut -d '=' -f2) --key $(grep KEY .env | cut -d '=' -f2)",
     "lint": "eslint --ext .js,.jsx --quiet src",
     "test": "mocha -r esm \"src/**/*.spec.js\""
   },
-  "version": "3.1.2",
-  "gitHead": "d014d8da360a4d33f391eb0e86ad203f8a581582"
+  "version": "3.1.4",
+  "gitHead": "6c7ae4b3ebf1c24e46f3dccb84cfe91cc5534af4"
 }

package/src/ProvidersInterface.js

@@ -19,11 +19,12 @@ class ProvidersInterface {
      * @param {EventType} eventType
      * @param {Function} onEvent
      * @param {Function} onError
+     * @param {Boolean} watchOnly if true, addEventListener does not start any provider, it just watches for events
      * @returns {Number}
      */
-    static addEventListener(eventType, onEvent, onError) {
+    static addEventListener(eventType, onEvent, onError, watchOnly = false) {
         const provider = this._getMetaProviderFromEventType(eventType);
-        const id = provider.addEventListener(events => onEvent(events[0].data), onError, this.name);
+        const id = provider.addEventListener(events => onEvent(events[0].data), onError, this.name, !watchOnly);
         this.idListeners.set(id, provider);
         return id;
     }
@@ -47,7 +48,7 @@ class ProvidersInterface {
      */
     static feed(eventType, data) {
         this._checkEventTypeDataConsistency(eventType, data);
-        this._getMetaProviderFromEventType(eventType).feed(data);
+        this._getMetaProviderFromEventType(eventType).feed(data, eventType);
     }
 
     /**
@@ -111,7 +112,7 @@ class ProvidersInterface {
             }
             break;
         case EventType.Network:
-            if (!(data instanceof Network)) {
+            if (!(data instanceof Network || data === null)) {
                 throw errorFn('Network');
             }
             break;

package/src/providers/MetaProvider.js

@@ -1,3 +1,4 @@
+import EventType from '../events/EventType';
 import Provider from './Provider';
 import ProviderEvent from '../events/ProviderEvent';
 
@@ -32,9 +33,10 @@ class MetaProvider extends Provider {
     /**
      * Input data from external interface
      * @param {ProviderEvent} event
+     * @param {EventType} eventType
      */
     // eslint-disable-next-line no-unused-vars
-    feed(event) {
+    feed(event, eventType) {
         throw new Error('Not implemented');
     }
 }

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

@@ -12,7 +12,7 @@ class RelativeAttitudeFromInertialProvider extends Provider {
     /**
      * default relative attitude drift in rad.second-1
      */
-    static DEFAULT_DRIFT = deg2rad(15) / 60;
+    static DEFAULT_DRIFT = deg2rad(5) / 60;
 
 
     /**

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

@@ -91,7 +91,7 @@ class AbsolutePositionFromRelProvider extends Provider {
             const bearing = Math.atan2(offsetPos.x, offsetPos.y);
 
             this.position = this.position.destinationPoint(dist, bearing, offsetPos.z);
-            this.position.bearing = bearing;
+            this.position.bearing = offsetPos.bearing;
             this.position.time = event.timestamp;
             this.position.accuracy += offsetPos.accuracy;
 

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

@@ -15,19 +15,23 @@ import {
 } from '../../../Providers';
 import ProvidersOptions from '../../../ProvidersOptions';
 
-class AbsolutePositionProvider extends MetaProvider {
+// Position accuracy uncertainty ratio
+const ACCURACY_NEW_POS_EPS_RATIO = 1.5;
+const ACCURACY_RELOC_RATIO = 2;
+const MM_MAX_ANGLE = deg2rad(20);
+const MM_MAX_DIST = 15;
+const MM_MIN_DIST = 1;
+const MM_MIN_TIME = 0.4;
 
-    static ACCURACY_RELOC_RATIO = 2;
-    static MM_MAX_ANGLE = deg2rad(20);
-    static MM_MAX_DIST = 15;
-    static MM_MIN_DIST = 1;
+class AbsolutePositionProvider extends MetaProvider {
 
+    lastMMAttempt = -Infinity;
 
     constructor() {
         super();
         this.mapMatching = new MapMatching();
-        this.mapMatching.maxDistance = AbsolutePositionProvider.MM_MAX_DIST;
-        this.mapMatching.maxAngleBearing = AbsolutePositionProvider.MM_MAX_ANGLE;
+        this.mapMatching.maxDistance = MM_MAX_DIST;
+        this.mapMatching.maxAngleBearing = MM_MAX_ANGLE;
     }
 
     /**
@@ -68,7 +72,7 @@ class AbsolutePositionProvider extends MetaProvider {
         }
 
         this.gnssWifiProviderId = GnssWifi.addEventListener(
-            events => this.onAbsolutePosition(events[0]),
+            events => this.onAbsolutePosition(events[0], false),
             noop,
             this.name
         );
@@ -86,16 +90,20 @@ class AbsolutePositionProvider extends MetaProvider {
         GnssWifi.removeEventListener(this.gnssWifiProviderId);
     }
 
-    onAbsolutePosition(newPositionEvent) {
+    onAbsolutePosition(newPositionEvent, canContainLevel = true) {
         if (this.lastEvent) {
 
             const newPosition = newPositionEvent.data;
             const lastPosition = this.lastEvent.data;
 
-            if (newPosition.distanceTo(lastPosition) < newPosition.accuracy
-                && newPosition.accuracy > lastPosition.accuracy / AbsolutePositionProvider.ACCURACY_RELOC_RATIO) {
+            if (newPosition.distanceTo(lastPosition) < newPosition.accuracy * ACCURACY_NEW_POS_EPS_RATIO
+                && newPosition.accuracy > lastPosition.accuracy / ACCURACY_RELOC_RATIO) {
                 return;
             }
+
+            if (!canContainLevel) {
+                newPosition.level = lastPosition.level;
+            }
         }
 
         this.notify(newPositionEvent.clone());
@@ -110,10 +118,12 @@ class AbsolutePositionProvider extends MetaProvider {
          * If map matching is not used or not set, raw position is returned
          */
         if (!ProvidersOptions.useMapMatching
-            || !this.mapMatching.network) {
+            || !this.mapMatching.network
+            || newPositionEvent.data.time - this.lastMMAttempt < MM_MIN_TIME) {
             this.notify(newPositionEvent.clone());
             return;
         }
+        this.lastMMAttempt = newPositionEvent.data.time;
 
         const newPosition = newPositionEvent.data;
         const projection = this.mapMatching.getProjection(newPosition, true, true);
@@ -130,7 +140,7 @@ class AbsolutePositionProvider extends MetaProvider {
 
         // Do not use projection if it too close from itinerary,
         //  this allows left/right movements (ie with ArCore)
-        if (projection.distanceFromNearestElement > AbsolutePositionProvider.MM_MIN_DIST) {
+        if (projection.distanceFromNearestElement > MM_MIN_DIST) {
             projectedPosition.lat = projection.projection.lat;
             projectedPosition.lng = projection.projection.lng;
         }
@@ -145,9 +155,10 @@ class AbsolutePositionProvider extends MetaProvider {
 
     /**
      * @override
-     * @param {UserPosition} position
+     * @param {UserPosition | Network} data
+     * @param {EventType} eventType
      */
-    feed(data) {
+    feed(data, eventType) {
         if (data instanceof UserPosition) {
             const position = data;
             if (position.time === null) {
@@ -159,7 +170,7 @@ class AbsolutePositionProvider extends MetaProvider {
             this.onAbsolutePosition(this.createEvent(
                 EventType.AbsolutePosition, position, position.time
             ));
-        } else if (data instanceof Network) {
+        } else if (data instanceof Network || eventType === EventType.Network) {
             this.mapMatching.network = data;
         } else {
             throw new Error('Unknown feed object');

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

@@ -70,7 +70,8 @@ class GeoRelativePositionFromArCoreProvider extends Provider {
             north,
             up,
             relativePosition.time,
-            0
+            0,
+            absoluteAttitude.heading
         );
 
         this.notify(this.createEvent(

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

@@ -116,7 +116,8 @@ class PdrProvider extends Provider {
             stepSize * Math.cos(deviceDirection),
             0,
             timestamp,
-            accuracy
+            accuracy,
+            deviceDirection
         );
 
         this.notify(this.createEvent(

package/src/smoothers/PositionSmoother.js

@@ -18,7 +18,6 @@ class PositionSmoother {
     constructor(callback, frequency = this.constructor.DEFAULT_FREQUENCY) {
         this.callback = callback;
         this.positionsQueue = [];
-        this.timeoutPositions = null;
         this.frequency = frequency;
     }
 
@@ -63,7 +62,10 @@ class PositionSmoother {
                 smoothedPosition.time = refTimestamp + (i - 1) / this.frequency;
                 smoothedPosition.level = newPositionLevel;
                 smoothedPosition.bearing = newPosition.bearing;
-                smoothedPosition.accuracy += Math.max((newPosition.accuracy - smoothedPosition.accuracy) * i / nSamples, 0);
+                smoothedPosition.accuracy = Math.max(
+                    smoothedPosition.accuracy + (newPosition.accuracy - smoothedPosition.accuracy) * i / nSamples,
+                    0
+                );
                 this.positionsQueue.push(smoothedPosition);
                 i++;
             }
@@ -87,6 +89,12 @@ class PositionSmoother {
             delete this.timeoutNotify;
         }
     }
+
+    clear() {
+        clearTimeout(this.timeoutNotify);
+        delete this.timeoutNotify;
+        this.positionsQueue = [];
+    }
 }
 
 export default PositionSmoother;

package/webpack/webpack.common.js

@@ -3,16 +3,16 @@ module.exports = {
         rules: [
             {
                 test: /\.jsx?$/,
-                include: [
-                    /src/,
-                    /wemap-(.*)/
-                ],
-                exclude: /(\/mapbox-gl\/|.test.js|.spec.js|.mock.js)/,
+                exclude: /(node_modules|.test.js|.spec.js|.mock.js)/,
                 use: { loader: 'babel-loader' }
             },
             {
                 test: /\.css$/,
                 use: ['style-loader', 'css-loader']
+            },
+            {
+                test: /\.(png|jpe?g|gif|svg)$/i,
+                use: ['file-loader']
             }
         ]
     },

package/webpack/webpack.dev.js

@@ -8,7 +8,7 @@ const distFolder = path.join(__dirname, '../', config.distFolder);
 
 module.exports = merge(common, {
     mode: 'development',
-    entry: { 'providers-components': './debug/components/index.js' },
+    entry: { 'providers-components': './debug/index.js' },
     output: {
         publicPath: '/js/',
         filename: '[name].js',
@@ -21,5 +21,11 @@ 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/debug/components/Common.css

@@ -1,27 +0,0 @@
-html,
-body {
-    margin: 0;
-    font-size: 12px;
-    height: 100%;
-}
-
-@media screen and (min-width: 400px) {
-    body {
-        font-size: 14px;
-    }
-}
-
-#app {
-    height: 100%
-}
-
-p {
-    margin-top: 0;
-}
-
-.title {
-    font-size: 18px;
-    font-weight: bold;
-    margin-top: 10px;
-    margin-bottom: 5px;
-}