@wemap/providers 6.2.1 → 6.2.2

package/helpers/CustomMapProvider.js

@@ -0,0 +1,63 @@
+import { Evented } from 'mapbox-gl';
+import {
+    PositionSmoother, ProvidersInterface, EventType
+} from '@wemap/providers';
+
+export default class CustomMapProvider extends Evented {
+
+    attitudeProviderId = null;
+    positionProviderId = null;
+    smoother = null;
+
+    start() {
+
+        /**
+         * Attitude
+         */
+        this.attitudeProviderId = ProvidersInterface.addEventListener(
+            EventType.AbsoluteAttitude,
+            attitude => this.fire('heading.changed', { heading: attitude.headingDegrees })
+        );
+
+        // There is no sense to show the last known attitude on the map
+        // this.fire('heading.changed' : { heading: ProvidersInterface.getLastKnown(EventType.AbsoluteAttitude)});
+
+
+        /**
+         * Position
+         */
+
+        this.smoother = new PositionSmoother(position => {
+            this.fire('position.changed', { position });
+        });
+
+        this.positionProviderId = ProvidersInterface.addEventListener(
+            EventType.AbsolutePosition,
+            position => this.smoother.feed(position)
+        );
+
+        const lastKnownPosition = ProvidersInterface.getLastKnown(EventType.AbsolutePosition);
+        if (lastKnownPosition) {
+            this.fire('position.changed', { position: lastKnownPosition });
+        }
+    }
+
+    stop() {
+
+        /**
+         * Attitude
+         */
+
+        ProvidersInterface.removeEventListener(this.attitudeProviderId);
+
+
+        /**
+         * Position
+         */
+
+        ProvidersInterface.removeEventListener(this.positionProviderId);
+
+        this.smoother.clear();
+        this.smoother = null;
+    }
+}

package/package.json

@@ -9,16 +9,17 @@
   ],
   "dependencies": {
     "@wemap/camera": "^6.1.0",
-    "@wemap/geo": "^6.0.0",
+    "@wemap/geo": "^6.2.2",
     "@wemap/geomagnetism": "^0.1.1",
     "@wemap/logger": "^6.0.0",
-    "@wemap/map": "^6.1.2",
+    "@wemap/map": "^6.2.2",
     "@wemap/maths": "^6.0.0",
-    "@wemap/osm": "^6.0.0",
+    "@wemap/osm": "^6.2.2",
     "@wemap/utils": "^6.0.0"
   },
   "description": "A package using different geoloc systems",
   "devDependencies": {
+    "map-gl-geolocation": "^0.3.0",
     "mapbox-gl": "^1.11.1"
   },
   "homepage": "https://github.com/wemap/wemap-modules-js#readme",
@@ -40,6 +41,6 @@
     "url": "git+https://github.com/wemap/wemap-modules-js.git"
   },
   "type": "module",
-  "version": "6.2.1",
-  "gitHead": "0d2771fd12d66b079ff5467d3f8d9064091a0c30"
+  "version": "6.2.2",
+  "gitHead": "ee717a21b2f01820472df0112da9373044f267f9"
 }

package/src/providers/steps/StepDetectionMinMaxPeaks2.js

@@ -1,5 +1,3 @@
-import { Vector3 } from '@wemap/maths';
-
 class StepDetectionMinMaxPeaks2 {
 
     // in seconds
@@ -16,11 +14,6 @@ class StepDetectionMinMaxPeaks2 {
     static VERTICAL_ACC_POSITIVE_PEAK_THRESHOLD = 0.75;
     static VERTICAL_ACC_NEGATIVE_PEAK_THRESHOLD = -0.3;
 
-    // in rad.s-1
-    static HIGH_ROTATION_THRESHOLD = 1.35
-    // in seconds
-    static HIGH_ROTATION_DURATION = 0.3
-
 
     constructor() {
         this.slidingWindow = [];
@@ -30,22 +23,14 @@ class StepDetectionMinMaxPeaks2 {
         this.influence = 0.2;
     }
 
-    _parseGyroscope(values, timestamp) {
-        const rotationSpeed = Vector3.norm(values);
-        if (rotationSpeed > StepDetectionMinMaxPeaks2.HIGH_ROTATION_THRESHOLD) {
-            this.lastHighRotation = timestamp;
-        }
-    }
 
     compute(timestamp, linearAcc, angularRate) {
 
-        this._parseGyroscope(angularRate, timestamp);
-
         const verticalAcc = this.influence * (linearAcc[2] * 2) + (1 - this.influence) * this.previousVerticalAcc;
         this.previousVerticalAcc = verticalAcc;
 
 
-        if (timestamp - this.lastHighRotation < StepDetectionMinMaxPeaks2.HIGH_ROTATION_DURATION) {
+        if (Math.sqrt(angularRate[0] ** 2 + angularRate[1] ** 2 + angularRate[2] ** 2) > 0.75) {
             return false;
         }
 

package/helpers/addGeolocationOnMap.js

@@ -1,104 +0,0 @@
-import { Map } from 'mapbox-gl';
-
-import { GeolocationLayer } from '@wemap/map';
-import {
-    PositionSmoother, ProvidersInterface, EventType
-} from '@wemap/providers';
-import { TimeUtils } from '@wemap/utils';
-
-
-/**
- * Create map.geolocation object
- * @param {Map} map
- */
-function addGeolocationOnMap(map) {
-
-    let smoother;
-
-    let attitudeProviderId;
-    let positionProviderId;
-
-    let isStarted = false;
-
-    Object.assign(map, { geolocation: new GeolocationLayer(map) });
-
-    Object.assign(map.geolocation, {
-
-        start: () => {
-
-            if (isStarted) {
-                return;
-            }
-            isStarted = true;
-
-            /**
-             * Attitude
-             */
-            attitudeProviderId = ProvidersInterface.addEventListener(
-                EventType.AbsoluteAttitude,
-                attitude => map.geolocation.updateHeading(attitude.headingDegrees)
-            );
-
-            // There is no sense to show the last known attitude on the map
-            // map.geolocation.updateHeading(ProvidersInterface.getLastKnown(EventType.AbsoluteAttitude));
-
-
-            /**
-             * Position
-             */
-
-            const positionTransform = input => {
-                if (input === null) {
-                    return null;
-                }
-                return Object.assign(input.clone(),
-                    { timestamp: TimeUtils.preciseTimeToUnixTimestamp(input.time * 1e3) }
-                );
-            };
-
-            smoother = new PositionSmoother(position => {
-                map.geolocation.updatePosition(positionTransform(position));
-            });
-
-            positionProviderId = ProvidersInterface.addEventListener(
-                EventType.AbsolutePosition,
-                position => smoother.feed(position)
-            );
-
-            const lastKnownPosition = ProvidersInterface.getLastKnown(EventType.AbsolutePosition);
-            if (lastKnownPosition) {
-                map.geolocation.updatePosition(positionTransform(lastKnownPosition));
-            }
-        },
-
-        stop: () => {
-
-            if (!isStarted) {
-                return;
-            }
-
-            /**
-             * Attitude
-             */
-
-            ProvidersInterface.removeEventListener(attitudeProviderId);
-
-
-            /**
-             * Position
-             */
-
-            ProvidersInterface.removeEventListener(positionProviderId);
-            smoother.clear();
-            smoother = null;
-
-            isStarted = false;
-        }
-    });
-
-    map.geolocation.on('start.clicked', map.geolocation.start);
-    map.geolocation.on('stop.clicked', map.geolocation.stop);
-}
-
-
-export default addGeolocationOnMap;