@wemap/providers 3.1.19 → 3.1.21

package/debug/components/Utils.js

@@ -4,7 +4,6 @@ import { rad2deg } from '@wemap/maths';
 import { OsrmUtils } from '@wemap/osm';
 
 import ProviderEvent from '../../src/events/ProviderEvent';
-import isNumber from 'lodash.isnumber';
 
 const NOT_AVAILABLE_STR = 'Not available';
 
@@ -37,7 +36,7 @@ class Utils {
         const roll = euler[2].toFixed(2);
         const heading = attitude.headingDegrees.toFixed(2);
 
-        const accuracyString = isNumber(attitude.accuracy) ? rad2deg(attitude.accuracy).toFixed(1) : '';
+        const accuracyString = attitude.accuracy !== null ? rad2deg(attitude.accuracy).toFixed(1) : '';
 
         return (
             <div>
@@ -91,9 +90,9 @@ class Utils {
                     Longitude: {position.lng.toFixed(7)}<br />
                     Altitude: {position.alt ? position.alt.toFixed(2) : NOT_AVAILABLE_STR}<br />
                     Level: {position.level ? position.level.toString() : NOT_AVAILABLE_STR}<br />
-                    Bearing: {isNumber(position.bearing) ? rad2deg(position.bearing).toFixed(2) : NOT_AVAILABLE_STR}<br />
-                    Accuracy: {isNumber(position.accuracy) ? position.accuracy.toFixed(2) : NOT_AVAILABLE_STR}<br />
-                    Time: {isNumber(position.time) ? position.time.toFixed(2) : NOT_AVAILABLE_STR}
+                    Bearing: {position.bearing !== null ? rad2deg(position.bearing).toFixed(2) : NOT_AVAILABLE_STR}<br />
+                    Accuracy: {position.accuracy.toFixed(2)}<br />
+                    Time: {position.time.toFixed(2)}
                 </p>
                 {(event instanceof ProviderEvent) ? Utils.renderTimeAndFromStack(event) : ''}
             </div>

package/debug/details/DetailsPositionComponent.jsx

@@ -1,4 +1,3 @@
-import isNumber from 'lodash.isnumber';
 import noop from 'lodash.noop';
 import React from 'react';
 
@@ -84,7 +83,7 @@ class DetailsPositionComponent extends React.PureComponent {
             this.refs.longitude.innerHTML = `${position.lng.toFixed(7)}°`;
             this.refs.altitude.innerHTML = position.alt ? `${position.alt.toFixed(2)}m` : NOT_AVAILABLE_STR;
             this.refs.level.innerHTML = position.level ? position.level.toString() : NOT_AVAILABLE_STR;
-            this.refs.bearing.innerHTML = isNumber(position.bearing) ? `${rad2deg(position.bearing).toFixed(2)}°` : NOT_AVAILABLE_STR;
+            this.refs.bearing.innerHTML = position.bearing !== null ? `${rad2deg(position.bearing).toFixed(2)}°` : NOT_AVAILABLE_STR;
             this.refs.accuracy.innerHTML = `${position.accuracy.toFixed(2)}m`;
             this.refs.time.innerHTML = `${position.time.toFixed(2)}s`;
         }

package/package.json

@@ -8,15 +8,14 @@
     "Guillaume Pannetier <guillaume.pannetier@getwemap.com>"
   ],
   "dependencies": {
-    "@wemap/geo": "^3.1.19",
-    "@wemap/graph": "^3.1.19",
+    "@wemap/geo": "^3.1.21",
+    "@wemap/graph": "^3.1.21",
     "@wemap/logger": "^3.0.0",
     "@wemap/maths": "^3.1.15",
-    "@wemap/osm": "^3.1.19",
+    "@wemap/osm": "^3.1.21",
     "@wemap/utils": "^3.1.5",
     "geomagnetism": "^0.1.0",
     "lodash.isempty": "^4.4.0",
-    "lodash.isnumber": "^3.0.3",
     "lodash.noop": "^3.0.1"
   },
   "description": "A package using different geoloc systems",
@@ -65,6 +64,6 @@
     "lint": "eslint --ext .js,.jsx --quiet src",
     "test": "mocha -r esm \"src/**/*.spec.js\""
   },
-  "version": "3.1.19",
-  "gitHead": "4a4167fd2159c856b90e6a566595ae5945f92d2e"
+  "version": "3.1.21",
+  "gitHead": "17f72afdcf6098bf90d3dffc2cf0b15f9284d4d4"
 }

package/src/providers/Provider.js

@@ -1,4 +1,3 @@
-import isNumber from 'lodash.isnumber';
 import noop from 'lodash.noop';
 
 import { TimeUtils } from '@wemap/utils';
@@ -103,7 +102,7 @@ class Provider {
      */
     static createEvent(dataType, data, timestamp, fromEvents = []) {
         const event = new ProviderEvent(dataType, data);
-        event.timestamp = isNumber(timestamp) ? timestamp : TimeUtils.preciseTime / 1e3;
+        event.timestamp = typeof timestamp === 'number' ? timestamp : TimeUtils.preciseTime / 1e3;
         const newStack = fromEvents.reduce((acc, _event) => acc.concat(_event.providersStack), []);
         // Remove duplicates and keep lasts
         event.providersStack = [...new Set(newStack.reverse())].reverse();

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

@@ -1,5 +1,4 @@
 import geomagnetism from 'geomagnetism';
-import isNumber from 'lodash.isnumber';
 
 import {
     Attitude, Coordinates
@@ -41,6 +40,8 @@ class AbsoluteAttitudeFromBrowserProvider extends Provider {
     // from http://tyrex.inria.fr/mobile/benchmarks-attitude/
     static DEFAULT_ACCURACY = deg2rad(15);
 
+    absolutePositionProviderId = null;
+
     /**
     * @override
     */
@@ -127,7 +128,7 @@ class AbsoluteAttitudeFromBrowserProvider extends Provider {
             break;
         }
 
-        if (isNumber(this.absolutePositionProviderId)) {
+        if (this.absolutePositionProviderId !== null) {
             AbsolutePosition.removeEventListener(this.absolutePositionProviderId);
         }
     }
@@ -137,7 +138,7 @@ class AbsoluteAttitudeFromBrowserProvider extends Provider {
 
         this.magQuaternionTimestamp = e.timeStamp / 1e3;
 
-        if (!isNumber(e.alpha) || !isNumber(e.beta) || !isNumber(e.gamma)) {
+        if (typeof e.alpha !== 'number' || typeof e.beta !== 'number' || typeof e.gamma !== 'number') {
             this.notifyError(new MissingSensorError().from('deviceorientationabsolute'));
             return;
         }
@@ -153,12 +154,12 @@ class AbsoluteAttitudeFromBrowserProvider extends Provider {
 
         this.magQuaternionTimestamp = e.timeStamp / 1e3;
 
-        if (!isNumber(e.beta) || !isNumber(e.gamma)) {
+        if (typeof e.beta !== 'number' || typeof e.gamma !== 'number') {
             this.notifyError(new MissingSensorError().from('deviceorientation'));
             return;
         }
 
-        if (!isNumber(e.webkitCompassHeading)) {
+        if (typeof e.webkitCompassHeading !== 'number') {
             super.notifyError(new MissingMagnetometerError().from('deviceorientation'));
             return;
         }
@@ -217,7 +218,7 @@ class AbsoluteAttitudeFromBrowserProvider extends Provider {
         this.declinationQuaternion = Quaternion.fromAxisAngle([0, 0, 1], - deg2rad(wmmResult.decl));
 
         AbsolutePosition.removeEventListener(this.absolutePositionProviderId);
-        delete this.absolutePositionProviderId;
+        this.absolutePositionProviderId = null;
         this.compute();
     }
 

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

@@ -1,5 +1,3 @@
-import isnumber from 'lodash.isnumber';
-
 import { Attitude } from '@wemap/geo';
 import { Rotations } from '@wemap/maths';
 import { BrowserUtils } from '@wemap/utils';
@@ -84,7 +82,7 @@ class RelativeAttitudeFromBrowserProvider extends Provider {
 
         const timestamp = e.timeStamp / 1e3;
 
-        if (!isnumber(e.alpha) || !isnumber(e.beta) || !isnumber(e.gamma)) {
+        if (typeof e.alpha !== 'number' || typeof e.beta !== 'number' || typeof e.gamma !== 'number') {
             this.notifyError(new MissingSensorError().from('deviceorientation'));
             return;
         }

package/src/providers/imu/ImuProvider.js

@@ -1,5 +1,3 @@
-import isnumber from 'lodash.isnumber';
-
 import { deg2rad } from '@wemap/maths';
 import {
     Browser, BrowserUtils
@@ -95,7 +93,7 @@ class ImuProvider extends Provider {
                 x, y, z
             } = e.accelerationIncludingGravity;
 
-            if (isnumber(x) && isnumber(y) && isnumber(z)) {
+            if (typeof x === 'number' && typeof y === 'number' && typeof z === 'number') {
                 acc = [x, y, z];
 
                 if (BrowserUtils.name === Browser.SAFARI) {
@@ -116,7 +114,7 @@ class ImuProvider extends Provider {
                 alpha, beta, gamma
             } = e.rotationRate;
 
-            if (isnumber(alpha) && isnumber(beta) && isnumber(gamma)) {
+            if (typeof alpha === 'number' && typeof beta === 'number' && typeof gamma === 'number') {
                 gyr = [deg2rad(alpha), deg2rad(beta), deg2rad(gamma)];
             }
         }

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

@@ -1,5 +1,3 @@
-import isnumber from 'lodash.isnumber';
-
 import {
     diffAngle, deg2rad
 } from '@wemap/maths';
@@ -11,6 +9,8 @@ class HeadingUnlocker {
 
     static LO_ANGLE = deg2rad(15);
 
+    waitingOrientation = null;
+
     constructor() {
         // HeadingUnlocker status, by default it is unlocked
         this.locked = false;
@@ -18,6 +18,7 @@ class HeadingUnlocker {
 
     unlock() {
         this.locked = false;
+        this.waitingOrientation = null;
     }
 
     lock(waitingOrientation) {
@@ -27,7 +28,7 @@ class HeadingUnlocker {
 
     feedHeading(heading) {
 
-        if (!isnumber(this.waitingOrientation)) {
+        if (this.waitingOrientation === null) {
             throw new Error('HeadingUnlocker has not been initialized by lock');
         }
 

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

@@ -206,7 +206,7 @@ class AbsolutePositionProvider extends MetaProvider {
             return null;
         }
 
-        // Do not user projection.projection directly, because position has some specific properties like bearing
+        // Do not use projection.projection directly, because position has some specific properties like bearing and altitude
         const projectedPosition = position.clone();
         projectedPosition.lat = projection.projection.lat;
         projectedPosition.lng = projection.projection.lng;

package/.env

@@ -1,2 +0,0 @@
-PEM=/Users/thibaud/.ssh/localhost+1.pem
-KEY=/Users/thibaud/.ssh/localhost+1-key.pem