@wemap/positioning 2.7.5 → 2.7.7

package/{src → debug}/components/AbsoluteAttitudeComponent.jsx

@@ -1,10 +1,12 @@
 import React from 'react';
 
-import AbsoluteAttitudeProvider from '../providers/attitude/AbsoluteAttitudeProvider';
+import AbsoluteAttitudeProvider from '../../src/providers/attitude/AbsoluteAttitudeProvider';
 import NavigationConfig from './NavigationConfig';
 import Utils from './Utils';
-import EventType from '../events/EventType';
+import EventType from '../../src/events/EventType';
+import ProvidersLogger from '../../src/providers/ProvidersLogger';
 
+ProvidersLogger.enabled = true;
 
 class AbsoluteAttitudeComponent extends React.Component {
 

package/{src → debug}/components/ArCoreAbsoluteComponent.jsx

@@ -3,35 +3,49 @@ import isEmpty from 'lodash.isempty';
 
 import { deg2rad } from '@wemap/maths';
 
-import EventType from '../events/EventType';
+import EventType from '../../src/events/EventType';
 import NavigationConfig from './NavigationConfig';
 import Utils from './Utils';
-import ArCoreAbsoluteProvider from '../providers/pose/ArCoreAbsoluteProvider';
+import ArCoreAbsoluteProvider from '../../src/providers/pose/ArCoreAbsoluteProvider';
 import MapComponent from './MapComponent';
+import ProvidersLogger from '../../src/providers/ProvidersLogger';
 
+ProvidersLogger.enabled = true;
 
 class ArCoreAbsoluteComponent extends React.Component {
+
+    errored = false;
+
     constructor(props, context) {
         super(props, context);
         this.state = {
             position: null,
-            attitude: null
+            attitude: null,
+            barcode: null
         };
 
+    }
+
+    componentDidMount() {
+
         this.arCoreAbsoluteProvider = new ArCoreAbsoluteProvider(
             this.onEvent,
             this.onError
         );
         this.arCoreAbsoluteProvider.setPosition(NavigationConfig.INITIAL_POSITION);
         this.arCoreAbsoluteProvider.setHeading(deg2rad(NavigationConfig.INITIAL_HEADING));
-    }
 
-    componentDidMount() {
         this.arCoreAbsoluteProvider.start();
+        if (!this.errored) {
+            this.arCoreAbsoluteProvider.enableBarcodeScanner();
+        }
     }
 
     componentWillUnmount() {
-        this.arCoreAbsoluteProvider.stop();
+        if (!this.errored) {
+            this.arCoreAbsoluteProvider.stop();
+            this.arCoreAbsoluteProvider.disableBarcodeScanner();
+        }
     }
 
   onEvent = events => {
@@ -41,6 +55,8 @@ class ArCoreAbsoluteComponent extends React.Component {
               newState.position = event.data;
           } else if (event.dataType === EventType.AbsoluteAttitude) {
               newState.attitude = event.data;
+          } else if (event.dataType === EventType.Barcode) {
+              newState.barcode = event.data;
           }
       });
       if (!isEmpty(newState)) {
@@ -53,6 +69,7 @@ class ArCoreAbsoluteComponent extends React.Component {
   };
 
   onError = error => {
+      this.errored = true;
       this.setState({
           position: error,
           attitude: error
@@ -60,6 +77,8 @@ class ArCoreAbsoluteComponent extends React.Component {
   };
 
   render() {
+      const {barcode} = this.state;
+
       const attitudeRender = Utils.renderAttitude(this.state.attitude);
       const positionRender = Utils.renderPosition(this.state.position);
 
@@ -69,6 +88,8 @@ class ArCoreAbsoluteComponent extends React.Component {
               {positionRender}
               <h3>Attitude</h3>
               {attitudeRender}
+              <h3>Barcode</h3>
+              {barcode ? barcode : ''}
               <h3>Map</h3>
               <MapComponent
                   ref={map => (this.map = map)}

package/{src → debug}/components/ArCoreComponent.jsx

@@ -1,10 +1,12 @@
 import React from 'react';
 import isEmpty from 'lodash.isempty';
 
-import EventType from '../events/EventType';
+import EventType from '../../src/events/EventType';
 import Utils from './Utils';
-import ArCoreProvider from '../providers/pose/ArCoreProvider';
+import ArCoreProvider from '../../src/providers/pose/ArCoreProvider';
+import ProvidersLogger from '../../src/providers/ProvidersLogger';
 
+ProvidersLogger.enabled = true;
 class ArCoreComponent extends React.Component {
 
     constructor(props, context) {

package/{src → debug}/components/GnssWifiComponent.jsx

@@ -1,10 +1,12 @@
 import React from 'react';
 
-import GnssWifiProvider from '../providers/position/GnssWifiProvider';
+import GnssWifiProvider from '../../src/providers/position/GnssWifiProvider';
 import Utils from './Utils';
-import EventType from '../events/EventType';
+import EventType from '../../src/events/EventType';
 import MapComponent from './MapComponent';
+import ProvidersLogger from '../../src/providers/ProvidersLogger';
 
+ProvidersLogger.enabled = true;
 class GnssWifiComponent extends React.Component {
 
     constructor(props, context) {

package/{src → debug}/components/GnssWifiPdrComponent.jsx

@@ -3,9 +3,12 @@ import React from 'react';
 
 import NavigationConfig from './NavigationConfig';
 import Utils from './Utils';
-import EventType from '../events/EventType';
-import GnssWifiPdrProvider from '../providers/pose/GnssWifiPdrProvider';
+import EventType from '../../src/events/EventType';
+import GnssWifiPdrProvider from '../../src/providers/pose/GnssWifiPdrProvider';
 import MapComponent from './MapComponent';
+import ProvidersLogger from '../../src/providers/ProvidersLogger';
+
+ProvidersLogger.enabled = true;
 
 class GnssWifiPdrComponent extends React.Component {
     constructor(props, context) {

package/{src → debug}/components/ImuComponent.jsx

@@ -1,8 +1,11 @@
 import React from 'react';
 
-import EventType from '../events/EventType';
-import ImuProvider from '../providers/others/ImuProvider';
+import EventType from '../../src/events/EventType';
+import ImuProvider from '../../src/providers/others/ImuProvider';
 import Utils from './Utils';
+import ProvidersLogger from '../../src/providers/ProvidersLogger';
+
+ProvidersLogger.enabled = true;
 
 class ImuComponent extends React.Component {
 

package/{src → debug}/components/InclinationComponent.jsx

@@ -1,8 +1,11 @@
 import React from 'react';
 
-import InclinationProvider from '../providers/others/InclinationProvider';
-import EventType from '../events/EventType';
+import InclinationProvider from '../../src/providers/others/InclinationProvider';
+import EventType from '../../src/events/EventType';
 import Utils from './Utils';
+import ProvidersLogger from '../../src/providers/ProvidersLogger';
+
+ProvidersLogger.enabled = true;
 
 class InclinationComponent extends React.Component {
 

package/{src → debug}/components/MapComponent.jsx

@@ -8,7 +8,7 @@ import {
 } from '@wemap/geo';
 import { Network } from '@wemap/graph';
 
-import EventType from '../events/EventType';
+import EventType from '../../src/events/EventType';
 
 mapboxgl.accessToken
   = 'pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4M29iazA2Z2gycXA4N2pmbDZmangifQ.-g_vE53SD2WrJ6tFX7QHmA';

package/{src → debug}/components/PdrComponent.jsx

@@ -3,9 +3,12 @@ import React from 'react';
 
 import NavigationConfig from './NavigationConfig';
 import Utils from './Utils';
-import PdrProvider from '../providers/pose/pdr/PdrProvider';
-import EventType from '../events/EventType';
+import PdrProvider from '../../src/providers/pose/pdr/PdrProvider';
+import EventType from '../../src/events/EventType';
 import MapComponent from './MapComponent';
+import ProvidersLogger from '../../src/providers/ProvidersLogger';
+
+ProvidersLogger.enabled = true;
 
 class PdrComponent extends React.Component {
     constructor(props, context) {

package/{src → debug}/components/PoseComponent.jsx

@@ -1,10 +1,13 @@
 import React from 'react';
 import isEmpty from 'lodash.isempty';
 
-import EventType from '../events/EventType';
+import EventType from '../../src/events/EventType';
 import Utils from './Utils';
-import PoseProvider from '../providers/pose/PoseProvider';
+import PoseProvider from '../../src/providers/pose/PoseProvider';
 import MapComponent from './MapComponent';
+import ProvidersLogger from '../../src/providers/ProvidersLogger';
+
+ProvidersLogger.enabled = true;
 
 class PoseComponent extends React.Component {
 

package/{src → debug}/components/PositioningComponent.jsx

@@ -1,7 +1,10 @@
 import React from 'react';
 import PositioningPoseComponent from './PositioningPoseComponent';
-import PositioningHandler from '../PositioningHandler';
+import PositioningHandler from '../../src/PositioningHandler';
 import PositioningInclinationComponent from './PositioningInclinationComponent';
+import ProvidersLogger from '../../src/providers/ProvidersLogger';
+
+ProvidersLogger.enabled = true;
 
 class PositioningComponent extends React.Component {
 

package/{src → debug}/components/PositioningInclinationComponent.jsx

@@ -2,10 +2,13 @@ import React from 'react';
 import isEmpty from 'lodash.isempty';
 import PropTypes from 'prop-types';
 
-import EventType from '../events/EventType';
+import EventType from '../../src/events/EventType';
 import Utils from './Utils';
-import PositioningHandler from '../PositioningHandler';
+import PositioningHandler from '../../src/PositioningHandler';
 import StartStopComponent from './StartStopComponent';
+import ProvidersLogger from '../../src/providers/ProvidersLogger';
+
+ProvidersLogger.enabled = true;
 
 class PositioningInclinationComponent extends React.Component {
 

package/{src → debug}/components/PositioningPoseComponent.jsx

@@ -2,13 +2,15 @@ import React from 'react';
 import isEmpty from 'lodash.isempty';
 import PropTypes from 'prop-types';
 
-import EventType from '../events/EventType';
+import EventType from '../../src/events/EventType';
 import NavigationConfig from './NavigationConfig';
 import Utils from './Utils';
-import PositioningHandler from '../PositioningHandler';
+import PositioningHandler from '../../src/PositioningHandler';
 import StartStopComponent from './StartStopComponent';
 import MapComponent from './MapComponent';
+import ProvidersLogger from '../../src/providers/ProvidersLogger';
 
+ProvidersLogger.enabled = true;
 
 class PositioningPoseComponent extends React.Component {
   static propTypes = {positioningHandler: PropTypes.instanceOf(PositioningHandler).isRequired};

package/{src → debug}/components/RelativeAttitudeComponent.jsx

@@ -1,8 +1,11 @@
 import React from 'react';
 
-import RelativeAttitudeProvider from '../providers/attitude/RelativeAttitudeProvider';
+import RelativeAttitudeProvider from '../../src/providers/attitude/RelativeAttitudeProvider';
 import Utils from './Utils';
-import EventType from '../events/EventType';
+import EventType from '../../src/events/EventType';
+import ProvidersLogger from '../../src/providers/ProvidersLogger';
+
+ProvidersLogger.enabled = true;
 
 class RelativeAttitudeComponent extends React.Component {
 

package/package.json

@@ -8,18 +8,35 @@
     "Guillaume Pannetier <guillaume.pannetier@getwemap.com>"
   ],
   "dependencies": {
-    "@wemap/geo": "^2.7.4",
-    "@wemap/graph": "^2.7.4",
-    "@wemap/logger": "^2.7.0",
-    "@wemap/maths": "^2.7.2",
-    "@wemap/osm": "^2.7.5",
-    "@wemap/utils": "^2.7.0",
+    "@wemap/geo": "^2.7.7",
+    "@wemap/graph": "^2.7.7",
+    "@wemap/logger": "^2.7.7",
+    "@wemap/maths": "^2.7.7",
+    "@wemap/osm": "^2.7.7",
+    "@wemap/utils": "^2.7.7",
     "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",
+  "devDependencies": {
+    "@babel/core": "^7.5.5",
+    "@babel/plugin-proposal-class-properties": "^7.5.5",
+    "@babel/preset-env": "^7.5.5",
+    "@babel/preset-react": "^7.0.0",
+    "babel-loader": "^8.0.6",
+    "css-loader": "^3.2.0",
+    "mapbox-gl": "^1.3.0",
+    "prop-types": "^15.7.2",
+    "react": "^16.11.0",
+    "react-dom": "^16.11.0",
+    "style-loader": "^1.0.0",
+    "webpack": "^4.39.3",
+    "webpack-cli": "^3.3.7",
+    "webpack-dev-server": "^3.9.0",
+    "webpack-merge": "^4.2.1"
+  },
   "homepage": "https://github.com/wemap/wemap-modules-js#readme",
   "keywords": [
     "wemap",
@@ -43,6 +60,6 @@
     "lint": "eslint --ext .js,.jsx --quiet src",
     "test": "mocha -r esm \"src/**/*.spec.js\""
   },
-  "version": "2.7.5",
-  "gitHead": "5d60aa9ae789520ef5adeb34a8e4d3e5973ed0b2"
+  "version": "2.7.7",
+  "gitHead": "988e0675759932cfc6b64df7768c6e6e573df1d9"
 }

package/src/PositioningHandler.js

@@ -210,6 +210,28 @@ class PositioningHandler {
         provider.setNetwork(network);
     }
 
+    /**
+     * @public
+     */
+    enableBarcodeScanner(id) {
+        const provider = this.providerInstances[id];
+        if (!(provider instanceof ArCoreAbsoluteProvider)) {
+            throw new Error('Not available. ArCore not started');
+        }
+        provider.enableBarcodeScanner();
+    }
+
+    /**
+     * @public
+     */
+    disableBarcodeScanner(id) {
+        const provider = this.providerInstances[id];
+        if (!(provider instanceof ArCoreAbsoluteProvider)) {
+            throw new Error('Not available. ArCore not started');
+        }
+        provider.disableBarcodeScanner();
+    }
+
 }
 
 export default PositioningHandler;

package/src/PositioningHandler.spec.js

@@ -1,5 +1,4 @@
 import chai from 'chai';
-import 'jsdom-global/register';
 
 import PositioningHandler from './PositioningHandler';
 import EventType from './events/EventType';
@@ -20,16 +19,18 @@ import RelativeAttitudeProvider from './providers/attitude/RelativeAttitudeProvi
 const expect = chai.expect;
 
 function fakeUserAgent(userAgent) {
-    navigator.__defineGetter__('userAgent', () => userAgent);
+    global.navigator = { userAgent };
 }
 
 function fakeNativeInterface(arcore = true) {
     // We have to clear the cache here
     ArCoreProvider._nativeProvider = null;
 
-    global.WemapProvidersAndroid = {getArCoreProvider: () => {
-        return { checkAvailability: () => arcore };
-    }};
+    global.WemapProvidersAndroid = {
+        getArCoreProvider: () => {
+            return { checkAvailability: () => arcore };
+        }
+    };
 }
 
 function fakeGeolocation() {
@@ -289,3 +290,5 @@ describe('PositioningHandler#findProvider', () => {
     });
 
 });
+
+delete global.navigator;

package/src/events/EventType.js

@@ -15,6 +15,7 @@ export default {
     BluetoothSignals: 'BLUETOOTH_SIGNALS',
     WifiSignals: 'WIFI_SIGNALS',
     ScanId: 'SCAN_ID',
+    Barcode: 'BARCODE',
     Itinerary: 'ITINERARY',
     Network: 'NETWORK'
 };

package/src/providers/ProvidersLogger.js

@@ -11,6 +11,8 @@ let initDate;
 
 class ProvidersLogger {
 
+    static enabled = false;
+
     static initializeInterval() {
 
         if (interval) {
@@ -69,9 +71,5 @@ class ProvidersLogger {
         pushEvents[objectId] = counter + 1;
     }
 
-    static get enabled() {
-        return Logger.ENABLED && Logger.LOG_LEVEL === Logger.DEBUG;
-    }
-
 }
 export default ProvidersLogger;

package/src/providers/pose/ArCoreAbsoluteProvider.js

@@ -12,6 +12,8 @@ import ImuProvider from '../others/ImuProvider';
 import MapMatchingProvider from '../others/MapMatchingProvider';
 import PdrProvider from './pdr/PdrProvider';
 
+const MM_ARCORE_DIST = 5;
+
 /**
  * Pose provider is the provider used by the PositioningHandler. It uses the best fusion
  * of what he can and provides an AbsoluteAttitude and an AbsolutePosition as an output.
@@ -85,6 +87,9 @@ class ArCoreAbsoluteProvider extends MapMatchingProvider {
     }
 
     onArCoreEvent = events => {
+
+        const eventsForNotification = [];
+
         events.forEach(event => {
             if (event.dataType === EventType.RelativeAttitude) {
 
@@ -124,7 +129,7 @@ class ArCoreAbsoluteProvider extends MapMatchingProvider {
                 if (this.offsetQuat) {
                     const absoluteQuaternion = Quaternion.multiply(this.offsetQuat, this.relativeAttitude.quaternion);
                     this.absoluteAttitude = new Attitude(absoluteQuaternion);
-                    this.notify(this.createEvent(EventType.AbsoluteAttitude, this.absoluteAttitude, event.timestamp));
+                    eventsForNotification.push(this.createEvent(EventType.AbsoluteAttitude, this.absoluteAttitude, event.timestamp));
                 }
             }
 
@@ -140,14 +145,22 @@ class ArCoreAbsoluteProvider extends MapMatchingProvider {
 
                     if (this.absoluteAttitude) {
                         this.position.bearing = this.absoluteAttitude.heading;
-                        this.updateLevel(this.position);
+                        this.updatePositionWithMapMatching();
                     }
 
-                    this.notify(this.createEvent(EventType.AbsolutePosition, this.position, event.timestamp));
+                    eventsForNotification.push(this.createEvent(EventType.AbsolutePosition, this.position, event.timestamp));
                 }
 
                 this.oldRelativePos = event.data;
             }
+
+            if (event.dataType === EventType.Barcode) {
+                eventsForNotification.push(event);
+            }
+
+            if (eventsForNotification.length !== 0) {
+                this.notify(...eventsForNotification);
+            }
         });
     }
 
@@ -191,19 +204,32 @@ class ArCoreAbsoluteProvider extends MapMatchingProvider {
     enableMapMatching(network, maxDistance, maxAngleBearing) {
         super.enableMapMatching(
             network,
-            maxDistance || PdrProvider.MM_PDR_DIST,
+            maxDistance || MM_ARCORE_DIST,
             maxAngleBearing || PdrProvider.MM_PDR_ANGLE
         );
     }
 
-    updateLevel(position) {
-        if (this.mapMatching) {
-            const projection = this.mapMatching.getProjection(position, true);
-            if (projection) {
-                position.level = projection.projection.level;
+    updatePositionWithMapMatching() {
+        if (!this.mapMatching) {
+            return;
+        }
+        const projection = this.mapMatching.getProjection(this.position, true, true);
+        if (projection) {
+            if (projection.distanceFromNearestElement > 1) {
+                this.position.lat = projection.projection.lat;
+                this.position.lng = projection.projection.lng;
             }
+            this.position.level = projection.projection.level;
         }
     }
+
+    enableBarcodeScanner() {
+        this.arCoreProvider.enableBarcodeScanner();
+    }
+
+    disableBarcodeScanner() {
+        this.arCoreProvider.disableBarcodeScanner();
+    }
 }
 
 export default ArCoreAbsoluteProvider;

package/src/providers/pose/ArCoreProvider.js

@@ -30,7 +30,7 @@ class ArCoreProvider extends Provider {
      * @override
      */
     static get eventsType() {
-        return [EventType.RelativeAttitude, EventType.RelativePosition];
+        return [EventType.RelativeAttitude, EventType.RelativePosition, EventType.Barcode];
     }
 
     /**
@@ -66,19 +66,34 @@ class ArCoreProvider extends Provider {
             return;
         }
 
-        const pose = JSON.parse(ArCoreProvider.nativeProvider.getInfo());
-        if (pose.length !== 0) {
-            const attitude = new Attitude(pose.slice(0, 4));
-            const position = pose.slice(4, 7);
-            this.notify(
-                this.createEvent(EventType.RelativeAttitude, attitude),
-                this.createEvent(EventType.RelativePosition, position)
-            );
+        const payload = JSON.parse(ArCoreProvider.nativeProvider.getInfo());
+        if (payload.length !== 0) {
+            this.parsePayload(payload);
         }
-
         requestAnimationFrame(this.pullDataLoop);
     }
 
+    parsePayload(payload) {
+
+        const events = [];
+
+        if (payload[0] !== null) {
+            const attitude = new Attitude(payload.slice(0, 4));
+            const position = payload.slice(4, 7);
+            events.push(this.createEvent(EventType.RelativeAttitude, attitude));
+            events.push(this.createEvent(EventType.RelativePosition, position));
+        }
+        const barcode = payload[7];
+        if (barcode !== null) {
+            events.push(this.createEvent(EventType.Barcode, barcode));
+        }
+
+        if (events.length !== 0) {
+            this.notify(...events);
+        }
+    }
+
+
     static get nativeProvider() {
 
         if (!this._nativeProvider) {
@@ -121,6 +136,18 @@ class ArCoreProvider extends Provider {
         return Availability.yes();
     }
 
+    enableBarcodeScanner() {
+        if (ArCoreProvider.nativeProvider) {
+            ArCoreProvider.nativeProvider.enableBarcodeScanner();
+        }
+    }
+
+    disableBarcodeScanner() {
+        if (ArCoreProvider.nativeProvider) {
+            ArCoreProvider.nativeProvider.disableBarcodeScanner();
+        }
+    }
+
     /**
      * @override
      */

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

@@ -18,6 +18,7 @@ import RelativeAttitudeProvider from '../../attitude/RelativeAttitudeProvider';
 import ImuProvider from '../../others/ImuProvider';
 import EventType from '../../../events/EventType';
 import MapMatchingProvider from '../../others/MapMatchingProvider';
+import { TimeUtils } from '@wemap/utils';
 
 
 const MM_PDR_ANGLE = deg2rad(20);
@@ -144,7 +145,7 @@ class PdrProvider extends MapMatchingProvider {
         if (position instanceof WGS84) {
             this.pdrPosition = WGS84UserPosition.fromWGS84(position);
             if (window && window.performance) {
-                this.pdrPosition.time = window.performance.now() / 1e3;
+                this.pdrPosition.time = TimeUtils.preciseTime / 1e3;
             }
         } else {
             this.pdrPosition = position;

package/src/providers/position/GnssWifiProvider.js

@@ -1,6 +1,6 @@
 import { deg2rad } from '@wemap/maths';
 import { WGS84UserPosition } from '@wemap/geo';
-import { DateUtils } from '@wemap/utils';
+import { TimeUtils } from '@wemap/utils';
 
 import EventType from '../../events/EventType';
 import GeolocationApiMissingError from '../../errors/GeolocationApiMissingError';
@@ -92,7 +92,7 @@ class GnssWifiProvider extends Provider {
             bearing = deg2rad(coords.heading);
         }
 
-        const timestamp = DateUtils.unixTimestampToPerformanceNow(geolocation.timestamp) / 1e3;
+        const timestamp = TimeUtils.unixTimestampToPreciseTime(geolocation.timestamp) / 1e3;
 
         const position = new WGS84UserPosition(
             coords.latitude,

package/src/providers/position/IpProvider.js

@@ -1,4 +1,5 @@
 import { WGS84UserPosition } from '@wemap/geo';
+import { TimeUtils } from '@wemap/utils';
 
 import EventType from '../../events/EventType';
 import Provider from '../Provider';
@@ -45,7 +46,7 @@ class IpProvider extends Provider {
                     return;
                 }
 
-                const timestamp = performance.now() / 1e3;
+                const timestamp = TimeUtils.preciseTime / 1e3;
 
                 const position = new WGS84UserPosition(
                     parseFloat(response.loc.split(',')[0]),

package/webpack/webpack.dev.js

@@ -7,7 +7,7 @@ const debugFolder = path.join(__dirname, '../debug');
 
 module.exports = merge(common, {
     mode: 'development',
-    entry: { 'positioning-components': './src/components/index.js' },
+    entry: { 'positioning-components': './debug/components/index.js' },
     output: {
         publicPath: '/js/',
         filename: '[name].js',