@wemap/providers 3.2.7 → 3.2.10

package/index.js

@@ -1,10 +1,9 @@
 import EventType from './src/events/EventType.js';
 import PositionSmoother from './src/smoothers/PositionSmoother.js';
+import * as Providers from './src/Providers.js';
 import ProvidersInterface from './src/ProvidersInterface.js';
-import ProvidersLogger from './src/logger/ProvidersLogger.js';
 import ProvidersOptions from './src/ProvidersOptions.js';
-import Utils from './src/utils/index.js';
 
 export {
-    EventType, PositionSmoother, ProvidersInterface, ProvidersLogger, ProvidersOptions, Utils
+    EventType, PositionSmoother, Providers, ProvidersInterface, ProvidersOptions
 };

package/package.json

@@ -13,7 +13,6 @@
     "@wemap/logger": "^3.2.3",
     "@wemap/map": "^3.2.6",
     "@wemap/maths": "^3.2.3",
-    "@wemap/navigation-logger": "^3.2.6",
     "@wemap/utils": "^3.2.3",
     "geomagnetism": "^0.1.0",
     "lodash.isempty": "^4.4.0",
@@ -43,6 +42,6 @@
     "url": "git+https://github.com/wemap/wemap-modules-js.git"
   },
   "type": "module",
-  "version": "3.2.7",
-  "gitHead": "75aed1f1f3e6b1b35c6151e657336d53024370e5"
+  "version": "3.2.10",
+  "gitHead": "9c50dc4e1c8802c56af11593e835b55f416e4fbf"
 }

package/src/ProvidersInterface.js

@@ -10,7 +10,6 @@ import {
     AbsoluteAttitude, AbsolutePosition, Barcode, CameraNative, CameraProjectionMatrix, Inclination
 } from './Providers.js';
 import ProvidersLoggerOld from './events/ProvidersLoggerOld.js';
-import ProvidersLogger from './logger/ProvidersLogger.js';
 
 class ProvidersInterface {
 
@@ -48,7 +47,6 @@ class ProvidersInterface {
      * @param {Object} data
      */
     static feed(eventType, data) {
-        ProvidersLogger.feedExternalData(eventType, data, true);
         this._checkEventTypeDataConsistency(eventType, data);
         this._getMetaProviderFromEventType(eventType).feed(data, eventType);
     }
@@ -136,7 +134,6 @@ class ProvidersInterface {
 
     static set mapMatchingMaxDistance(maxDistance) {
         AbsolutePosition.mapMatchingMaxDistance = maxDistance;
-        ProvidersLogger.feedProvidersMM({ mapMatchingMaxDistance: maxDistance });
     }
 
     static get mapMatchingMinDistance() {
@@ -145,7 +142,6 @@ class ProvidersInterface {
 
     static set mapMatchingMinDistance(minDistance) {
         AbsolutePosition.mapMatchingMinDistance = minDistance;
-        ProvidersLogger.feedProvidersMM({ mapMatchingMinDistance: minDistance });
     }
 
     static get mapMatchingMaxAngleBearing() {
@@ -154,7 +150,6 @@ class ProvidersInterface {
 
     static set mapMatchingMaxAngleBearing(maxAngleBearing) {
         AbsolutePosition.mapMatchingMaxAngleBearing = maxAngleBearing;
-        ProvidersLogger.feedProvidersMM({ mapMatchingMaxAngleBearing: maxAngleBearing });
     }
 }
 

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

@@ -16,7 +16,6 @@ import AskImuOnDesktopError from '../../../errors/AskImuOnDesktopError.js';
 import MissingMagnetometerError from '../../../errors/MissingMagnetometerError.js';
 import MissingSensorError from '../../../errors/MissingSensorError.js';
 import { AbsolutePosition } from '../../../Providers.js';
-import ProvidersLogger from '../../../logger/ProvidersLogger.js';
 
 
 /**
@@ -136,7 +135,6 @@ class AbsoluteAttitudeFromBrowserProvider extends Provider {
 
 
     onDeviceOrientationChromeEvent = e => {
-        ProvidersLogger.feedImuData(e);
 
         this.magQuaternionTimestamp = e.timeStamp / 1e3;
 
@@ -153,7 +151,6 @@ class AbsoluteAttitudeFromBrowserProvider extends Provider {
 
 
     onDeviceOrientationSafariEvent = e => {
-        ProvidersLogger.feedImuData(e);
 
         this.magQuaternionTimestamp = e.timeStamp / 1e3;
 

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

@@ -7,7 +7,6 @@ import EventType from '../../../events/EventType.js';
 import AskImuOnDesktopError from '../../../errors/AskImuOnDesktopError.js';
 import MissingSensorError from '../../../errors/MissingSensorError.js';
 import RelativeAttitudeFromInertialProvider from './RelativeAttitudeFromInertialProvider.js';
-import ProvidersLogger from '../../../logger/ProvidersLogger.js';
 
 
 /**
@@ -80,7 +79,6 @@ class RelativeAttitudeFromBrowserProvider extends Provider {
 
 
     onDeviceOrientationEvent = e => {
-        ProvidersLogger.feedImuData(e);
 
         const timestamp = e.timeStamp / 1e3;
 

package/src/providers/imu/ImuProvider.js

@@ -6,7 +6,6 @@ import {
 import Provider from '../Provider.js';
 import EventType from '../../events/EventType';
 import AskImuOnDesktopError from '../../errors/AskImuOnDesktopError.js';
-import ProvidersLogger from '../../logger/ProvidersLogger.js';
 
 /**
  * Imu (Inertial Measurement Unit) provider retrieve acceleration data
@@ -83,8 +82,6 @@ class ImuProvider extends Provider {
      * @private
      */
     parseDeviceMotionEvent = e => {
-        ProvidersLogger.feedImuData(e);
-
         const events = [];
 
         const timestamp = e.timeStamp / 1e3;

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

@@ -8,7 +8,6 @@ import Provider from '../../Provider.js';
 import GeolocationPermissionDeniedError from '../../../errors/GeolocationPermissionDeniedError.js';
 import GeolocationPositionUnavailableError from '../../../errors/GeolocationPositionUnavailableError.js';
 import Constants from '../../Constants.js';
-import ProvidersLogger from '../../../logger/ProvidersLogger.js';
 
 const POSITION_OPTIONS = {
     enableHighAccuracy: true,
@@ -73,7 +72,6 @@ class GnssWifiProvider extends Provider {
      * @private
      */
     onNewPosition = geolocation => {
-        ProvidersLogger.feedGeolocation(geolocation);
 
         const { coords } = geolocation;
         if (!coords) {

package/src/logger/ProvidersLogger.js

@@ -1,78 +0,0 @@
-import ProvidersOptions from '../ProvidersOptions';
-import ProvidersLoggerConverter from './ProvidersLoggerConverter.js';
-
-import { NavigationLogger } from '@wemap/navigation-logger';
-import { TimeUtils } from '@wemap/utils';
-
-class ProvidersLogger {
-
-    static logs = [];
-    static currentLogIndex = 0;
-
-    static Converter = ProvidersLoggerConverter;
-
-    static feedImuData(event) {
-        if (!NavigationLogger.isRecording) {
-            return;
-        }
-        this._feed(ProvidersLoggerConverter.imuDataToLog(TimeUtils.preciseTime, event));
-    }
-
-    static feedGeolocation(geolocationEvent) {
-        if (!NavigationLogger.isRecording) {
-            return;
-        }
-        this._feed(ProvidersLoggerConverter.geolocationToLog(TimeUtils.preciseTime, geolocationEvent));
-    }
-
-    static feedExternalData(eventType, data) {
-        if (!NavigationLogger.isRecording) {
-            return;
-        }
-        this._feed(ProvidersLoggerConverter.externalDataToLog(TimeUtils.preciseTime, eventType, data));
-    }
-
-    static feedProvidersMM(obj) {
-        if (!NavigationLogger.isRecording) {
-            return;
-        }
-        this._feed(ProvidersLoggerConverter.providersMMToLog(TimeUtils.preciseTime, obj));
-    }
-
-    static _feed(line) {
-        this.logs[this.currentLogIndex++] = line;
-    }
-
-    static _onStart() {
-        fetch(NavigationLogger.apiUrl + '/providers-config', {
-            method: 'POST',
-            headers: {
-                'Accept': 'application/json',
-                'Content-Type': 'application/json'
-            },
-            body: JSON.stringify({ ProvidersOptions })
-        });
-    }
-
-    static _onFlush() {
-
-        if (this.logs.length === 0) {
-            return;
-        }
-
-        fetch(NavigationLogger.apiUrl + '/providers', {
-            method: 'POST',
-            headers: { 'Content-Type': 'text/plain' },
-            body: this.logs.join('\n')
-        });
-
-        this.logs = [];
-        this.currentLogIndex = 0;
-    }
-
-}
-
-NavigationLogger.on('started', () => ProvidersLogger._onStart());
-NavigationLogger.on('flush', () => ProvidersLogger._onFlush());
-
-export default ProvidersLogger;

package/src/logger/ProvidersLoggerConverter.js

@@ -1,275 +0,0 @@
-/* eslint-disable complexity */
-import {
-    UserPosition, AbsoluteHeading, Attitude
-} from '@wemap/geo';
-import {
-    Network, Itinerary
-} from '@wemap/graph';
-
-import { EventType } from '@wemap/providers';
-
-const SEPARATOR = ',';
-
-const PRECISION = 1e-6;
-const PRECISION_INV = 1 / PRECISION;
-const round = num => typeof num === 'number' ? Math.round(num * PRECISION_INV) / PRECISION_INV : num;
-
-class ProvidersLoggerConverter {
-
-    static geolocationToLog(time, event) {
-        return [
-            2,
-            round(time),
-            round(event.timestamp),
-            event.coords.latitude,
-            event.coords.longitude,
-            typeof event.coords.altitude === 'number' ? round(event.coords.altitude) : null,
-            round(event.coords.accuracy),
-            typeof event.coords.altitudeAccuracy === 'number' ? round(event.coords.altitudeAccuracy) : null,
-            typeof event.coords.heading === 'number' ? round(event.coords.heading) : null,
-            typeof event.coords.speed === 'number' ? round(event.coords.speed) : null
-        ].join(SEPARATOR);
-    }
-
-    static imuDataToLog(time, event) {
-        switch (event.type) {
-
-        case 'devicemotion':
-            const acc = event.accelerationIncludingGravity;
-            const gyr = event.rotationRate;
-            const linearAcc = event.acceleration;
-            return [
-                3,
-                event.type,
-                round(time),
-                round(event.timeStamp),
-                acc && typeof acc.x === 'number' ? round(acc.x) : null,
-                acc && typeof acc.y === 'number' ? round(acc.y) : null,
-                acc && typeof acc.z === 'number' ? round(acc.z) : null,
-                gyr && typeof gyr.alpha === 'number' ? round(gyr.alpha) : null,
-                gyr && typeof gyr.beta === 'number' ? round(gyr.beta) : null,
-                gyr && typeof gyr.gamma === 'number' ? round(gyr.gamma) : null,
-                linearAcc && typeof linearAcc.x === 'number' ? round(linearAcc.x) : null,
-                linearAcc && typeof linearAcc.y === 'number' ? round(linearAcc.y) : null,
-                linearAcc && typeof linearAcc.z === 'number' ? round(linearAcc.z) : null,
-                round(event.interval)
-            ].join(SEPARATOR);
-
-        case 'deviceorientation':
-            return [
-                3,
-                event.type,
-                round(time),
-                round(event.timeStamp),
-                round(event.alpha),
-                round(event.beta),
-                round(event.gamma),
-                round(event.webkitCompassHeading),
-                event.absolute ? 1 : 0
-            ].join(SEPARATOR);
-
-        case 'deviceorientationabsolute':
-            return [
-                3,
-                event.type,
-                round(time),
-                round(event.timeStamp),
-                round(event.alpha),
-                round(event.beta),
-                round(event.gamma),
-                event.absolute ? 1 : 0
-            ].join(SEPARATOR);
-        }
-
-        throw new Error(`Cannot parse event: ${event.type}`, event);
-    }
-
-    static externalDataToLog(time, eventType, data) {
-        switch (eventType) {
-        case EventType.Network:
-            if (data instanceof Itinerary) {
-                return [4, 'itinerary', round(time), data === null ? null : JSON.stringify(data.toCompressedJson())].join(SEPARATOR);
-            }
-            return [4, 'network', round(time), data === null ? null : JSON.stringify(data.toCompressedJson())].join(SEPARATOR);
-        case EventType.AbsolutePosition:
-            return [4, 'absolute-position', round(time), JSON.stringify(data.toJson())].join(SEPARATOR);
-        case EventType.AbsoluteHeading:
-            return [4, 'absolute-heading', round(time), JSON.stringify(data.toJson())].join(SEPARATOR);
-        case EventType.AbsoluteAttitude:
-            return [4, 'absolute-attitude', round(time), JSON.stringify(data.toJson())].join(SEPARATOR);
-        }
-        return [4, 'unknown', eventType].join(SEPARATOR);
-    }
-
-    static providersMMToLog(time, obj) {
-        return [5, time, JSON.stringify(obj)].join(SEPARATOR);
-    }
-
-
-    static logToObj(str) {
-        const logType = parseInt(str[0], 10);
-        switch (logType) {
-        case 2:
-            return this.logToGeolocation(str);
-        case 3:
-            return this.logToImu(str);
-        case 4:
-            return this.logToExternalData(str);
-        case 5:
-            return this.logToProvidersMM(str);
-        }
-
-        throw new Error(`Cannot parse log: ${str}`);
-    }
-
-    static logToGeolocation(str) {
-        const array = str.split(SEPARATOR).map(parseFloat);
-        return {
-            type: 'geolocation',
-            time: array[1],
-            data: {
-                timestamp: array[2],
-                coords: {
-                    latitude: array[3],
-                    longitude: array[4],
-                    altitude: array[5],
-                    accuracy: array[6],
-                    altitudeAccuracy: array[7],
-                    heading: array[8],
-                    speed: array[9]
-                }
-            }
-        };
-    }
-
-    static logToImu(str) {
-
-        const indexOfSecondComma = str.indexOf(SEPARATOR, 2);
-        const eventName = str.substring(2, indexOfSecondComma);
-        const data = str.substring(indexOfSecondComma + 1).split(SEPARATOR).map(parseFloat);
-
-        const event = new CustomEvent(eventName);
-        Object.defineProperties(event, { timeStamp: { writable: true } });
-
-        switch (eventName) {
-        case 'devicemotion':
-            Object.assign(event, {
-                timeStamp: data[1],
-                accelerationIncludingGravity: {
-                    x: data[2],
-                    y: data[3],
-                    z: data[4]
-                },
-                rotationRate: {
-                    alpha: data[5],
-                    beta: data[6],
-                    gamma: data[7]
-                },
-                acceleration: {
-                    x: data[8],
-                    y: data[9],
-                    z: data[10]
-                }
-            });
-            break;
-
-        case 'deviceorientation':
-            Object.assign(event, {
-                timeStamp: data[1],
-                alpha: data[2],
-                beta: data[3],
-                gamma: data[4],
-                webkitCompassHeading: data[5],
-                absolute: data[6] === 1
-            });
-            break;
-
-
-        case 'deviceorientationabsolute':
-            Object.assign(event, {
-                timeStamp: data[1],
-                alpha: data[2],
-                beta: data[3],
-                gamma: data[4],
-                absolute: data[5] === 1
-            });
-            break;
-        }
-
-        return {
-            type: 'imu',
-            time: data[0],
-            data: event
-        };
-    }
-
-    static logToExternalData(str) {
-
-        const indexOfSecondComma = str.indexOf(SEPARATOR, 2);
-        const eventTypeStr = str.substring(2, indexOfSecondComma);
-
-        const indexOfThirdComma = str.indexOf(SEPARATOR, indexOfSecondComma + 1);
-        const time = parseFloat(str.substring(indexOfSecondComma + 1, indexOfThirdComma));
-
-        const dataStr = str.substring(indexOfThirdComma + 1);
-
-        let data;
-        switch (eventTypeStr) {
-
-        case 'network':
-            data = {
-                eventType: EventType.Network,
-                data: dataStr === '' ? null : Network.fromCompressedJson(JSON.parse(dataStr))
-            };
-            break;
-
-        case 'itinerary':
-            data = {
-                eventType: EventType.Network,
-                data: dataStr === '' ? null : Itinerary.fromCompressedJson(JSON.parse(dataStr))
-            };
-            break;
-
-        case 'absolute-position':
-            data = {
-                eventType: EventType.AbsolutePosition,
-                data: dataStr === '' ? null : UserPosition.fromJson(JSON.parse(dataStr))
-            };
-            break;
-
-        case 'absolute-attitude':
-            data = {
-                eventType: EventType.AbsoluteAttitude,
-                data: dataStr === '' ? null : Attitude.fromJson(JSON.parse(dataStr))
-            };
-            break;
-
-        case 'absolute-heading':
-            data = {
-                eventType: EventType.AbsoluteHeading,
-                data: dataStr === '' ? null : AbsoluteHeading.fromJson(JSON.parse(dataStr))
-            };
-            break;
-
-        default:
-            throw new Error(`Cannot parse eventType: ${eventTypeStr}`);
-        }
-
-        return {
-            type: 'external',
-            time,
-            data
-        };
-    }
-
-    static logToProvidersMM(str) {
-        const array = str.split(SEPARATOR);
-        return {
-            type: 'providersMM',
-            time: parseFloat(array[1]),
-            data: JSON.parse(array[2])
-        };
-    }
-}
-
-export default ProvidersLoggerConverter;