@wemap/providers 11.0.0-alpha.9 → 11.0.0

package/dist/index.js

@@ -749,7 +749,7 @@ class ImuProvider extends Provider {
         } = e.accelerationIncludingGravity;
         if (typeof x === "number" && typeof y === "number" && typeof z === "number") {
           acc = [x, y, z];
-          if (utils.BrowserUtils.name === utils.Browser.SAFARI || utils.BrowserUtils.name === utils.Browser.IOS_WEBVIEW) {
+          if (utils.BrowserUtils.getName() === utils.Browser.SAFARI || utils.BrowserUtils.getName() === utils.Browser.IOS_WEBVIEW) {
             acc[0] *= -1;
             acc[1] *= -1;
             acc[2] *= -1;
@@ -1313,6 +1313,25 @@ const _StepProvider = class extends Provider {
     __publicField(this, "_algorithm", _StepProvider.DEFAULT_ALGORITHM);
     __publicField(this, "_accValues", []);
     __publicField(this, "getName", () => "StepDetector");
+    __publicField(this, "onAccelerometerEvent", (accelerationEvent) => {
+      if (!this.attitudeEvent || !this.angularRateEvent) {
+        return;
+      }
+      const {
+        values: acceleration,
+        timestamp
+      } = accelerationEvent;
+      const linearAcc = _StepProvider.computeLinearAcceleration(
+        this.attitudeEvent.quaternion,
+        acceleration
+      );
+      const stepDetected = this.stepDetector.compute(timestamp, linearAcc, this.angularRateEvent.values);
+      if (stepDetected) {
+        const size = this.stepDetector.lastStepSize * this._stepSizeMultiplier;
+        this.numOfSteps++;
+        this.notify({ size, number: this.numOfSteps });
+      }
+    });
     this.algorithm = this._algorithm;
   }
   availability() {
@@ -1342,25 +1361,6 @@ const _StepProvider = class extends Provider {
     GyroscopeProvider$1.removeEventListener(this.gyroscopeProviderId);
     RelativeAttitudeFromInertialProvider.removeEventListener(this.attitudeProviderId);
   }
-  onAccelerometerEvent(accelerationEvent) {
-    if (!this.attitudeEvent || !this.angularRateEvent) {
-      return;
-    }
-    const {
-      values: acceleration,
-      timestamp
-    } = accelerationEvent;
-    const linearAcc = _StepProvider.computeLinearAcceleration(
-      this.attitudeEvent.quaternion,
-      acceleration
-    );
-    const stepDetected = this.stepDetector.compute(timestamp, linearAcc, this.angularRateEvent.values);
-    if (stepDetected) {
-      const size = this.stepDetector.lastStepSize * this._stepSizeMultiplier;
-      this.numOfSteps++;
-      this.notify({ size, number: this.numOfSteps });
-    }
-  }
   static computeLinearAcceleration(quaternion, acc) {
     const linearAcc = maths.Quaternion.rotateMatlab(maths.Quaternion.inverse(quaternion), acc);
     linearAcc[2] -= geo.Constants.EARTH_GRAVITY;
@@ -2010,7 +2010,9 @@ const _AbsolutePositionProvider = class extends Provider {
   start() {
     GeoRelativePositionProvider$1.getAvailability().then((error) => {
       if (!error) {
-        this._relativePositionProviderId = GeoRelativePositionProvider$1.addEventListener(this._onRelativePosition);
+        this._relativePositionProviderId = GeoRelativePositionProvider$1.addEventListener(
+          (e) => this._onRelativePosition(e)
+        );
       }
     });
     this._gnssWifiProviderId = GnssWifiProvider$1.addEventListener(
@@ -2233,7 +2235,7 @@ class AbsoluteAttitudeFromBrowser extends Provider {
   }
   start() {
     const subscribe = () => {
-      switch (utils.BrowserUtils.name) {
+      switch (utils.BrowserUtils.getName()) {
         case utils.Browser.CHROME:
           window.addEventListener(
             "deviceorientationabsolute",
@@ -2274,7 +2276,7 @@ class AbsoluteAttitudeFromBrowser extends Provider {
     }
   }
   stop() {
-    switch (utils.BrowserUtils.name) {
+    switch (utils.BrowserUtils.getName()) {
       case utils.Browser.CHROME:
         window.removeEventListener(
           "deviceorientationabsolute",
@@ -2645,7 +2647,7 @@ const _MapMatchingHandler = class extends Provider {
     __publicField(this, "_minStepsForOrientationMatching", _MapMatchingHandler.DEFAULT_MIN_STEPS_FOR_ORIENTATION_MATCHING);
     __publicField(this, "_lastProjectionsWindowSize", _MapMatchingHandler.DEFAULT_LAST_PROJECTIONS_WINDOW_SIZE);
     __publicField(this, "_lastProjectionsEdgeAngleThreshold", _MapMatchingHandler.DEFAULT_LAST_PROJECTIONS_EDGE_ANGLE_THRESHOLD);
-    __publicField(this, "_mapMatching");
+    __publicField(this, "_geoGraphProjectionHandler");
     __publicField(this, "_internalProvidersStarted", false);
     __publicField(this, "_straightLineProviderId");
     __publicField(this, "_turnProviderId");
@@ -2657,18 +2659,18 @@ const _MapMatchingHandler = class extends Provider {
     __publicField(this, "getName", () => "MapMatchingHandler");
     __publicField(this, "availability", () => Promise.resolve());
     __publicField(this, "_manageStartStop", () => {
-      if (this.network && !this._internalProvidersStarted) {
+      if (this.graph && !this._internalProvidersStarted) {
         this._startInternalProviders();
-      } else if (!this.network && this._internalProvidersStarted) {
+      } else if (!this.graph && this._internalProvidersStarted) {
         this._stopInternalProviders();
       }
     });
-    this._mapMatching = new geo.MapMatching();
-    this._mapMatching.maxDistance = _MapMatchingHandler.DEFAULT_MM_MAX_DIST;
-    this._mapMatching.maxAngleBearing = _MapMatchingHandler.DEFAULT_MM_MAX_ANGLE;
+    this._geoGraphProjectionHandler = new geo.GeoGraphProjectionHandler();
+    this._geoGraphProjectionHandler.maxDistance = _MapMatchingHandler.DEFAULT_MM_MAX_DIST;
+    this._geoGraphProjectionHandler.maxAngleBearing = _MapMatchingHandler.DEFAULT_MM_MAX_ANGLE;
   }
   start() {
-    if (this.network) {
+    if (this.graph) {
       this._startInternalProviders();
     }
   }
@@ -2696,19 +2698,19 @@ const _MapMatchingHandler = class extends Provider {
   get enabled() {
     return ProvidersOptions.useMapMatching;
   }
-  get network() {
-    return this._mapMatching.network;
+  get graph() {
+    return this._geoGraphProjectionHandler.graph;
   }
-  set network(network) {
-    this._mapMatching.network = network;
+  set graph(graph) {
+    this._geoGraphProjectionHandler.graph = graph;
     this._itineraryInfoManager = null;
-    this.notify({ ...network && { network } });
+    this.notify({ ...graph && { graph } });
     this._manageStartStop();
     if (this.canUseMapMatching())
       ;
   }
   set itinerary(itinerary) {
-    this._mapMatching.network = itinerary ? itinerary.toNetwork() : null;
+    this._geoGraphProjectionHandler.graph = itinerary ? itinerary.toGraph() : null;
     this._itineraryInfoManager = new routers.ItineraryInfoManager(itinerary);
     this.notify({ ...itinerary && { itinerary } });
     this._manageStartStop();
@@ -2717,7 +2719,7 @@ const _MapMatchingHandler = class extends Provider {
     }
   }
   canUseMapMatching() {
-    return this.enabled && this.network;
+    return this.enabled && this.graph;
   }
   _notifyPositionFromItineraryInput(itinerary) {
     if (!this._useItineraryStartAsPosition || itinerary.from) {
@@ -2854,7 +2856,7 @@ const _MapMatchingHandler = class extends Provider {
     }
     const firstProjection = this._lastProjections[0];
     return !this._lastProjections.some(
-      (projection) => !(projection.nearestElement instanceof geo.GraphEdge) || !(firstProjection.nearestElement instanceof geo.GraphEdge) || maths.diffAngleLines(projection.nearestElement.bearing, firstProjection.nearestElement.bearing) > this._lastProjectionsEdgeAngleThreshold
+      (projection) => !(projection.nearestElement instanceof geo.GeoGraphEdge) || !(firstProjection.nearestElement instanceof geo.GeoGraphEdge) || maths.diffAngleLines(projection.nearestElement.bearing, firstProjection.nearestElement.bearing) > this._lastProjectionsEdgeAngleThreshold
     );
   }
   _nodeHasTurn(node) {
@@ -2870,12 +2872,12 @@ const _MapMatchingHandler = class extends Provider {
     return false;
   }
   _hasTurnInCircle(center, radius) {
-    const network = this._mapMatching.network;
+    const network = this._geoGraphProjectionHandler.graph;
     if (!network) {
       return false;
     }
-    return network.nodes.filter(
-      (node) => node.coords.distanceTo(center) <= radius && geo.Level.intersect(node.coords.level, center.level)
+    return network.vertices.filter(
+      (vertex) => vertex.coords.distanceTo(center) <= radius && geo.Level.intersect(vertex.coords.level, center.level)
     ).some(this._nodeHasTurn);
   }
   tryOrientationMatching(projection) {
@@ -2886,7 +2888,7 @@ const _MapMatchingHandler = class extends Provider {
       return;
     }
     const { nearestElement, origin } = projection;
-    if (!(nearestElement instanceof geo.GraphEdge)) {
+    if (!(nearestElement instanceof geo.GeoGraphEdge)) {
       return;
     }
     let matchingDirection;
@@ -2906,13 +2908,13 @@ const _MapMatchingHandler = class extends Provider {
     this._countStepsFromLastMatching = 0;
   }
   getProjection(position, useDistance, useBearing) {
-    return this._mapMatching.getProjection(position, useDistance, useBearing);
+    return this._geoGraphProjectionHandler.getProjection(position, useDistance, useBearing);
   }
   get maxDistance() {
-    return this._mapMatching.maxDistance;
+    return this._geoGraphProjectionHandler.maxDistance;
   }
   set maxDistance(maxDistance) {
-    this._mapMatching.maxDistance = maxDistance;
+    this._geoGraphProjectionHandler.maxDistance = maxDistance;
   }
   get minDistance() {
     return this._mapMatchingMinDistance;
@@ -2921,10 +2923,10 @@ const _MapMatchingHandler = class extends Provider {
     this._mapMatchingMinDistance = minDistance;
   }
   get maxAngleBearing() {
-    return this._mapMatching.maxAngleBearing;
+    return this._geoGraphProjectionHandler.maxAngleBearing;
   }
   set maxAngleBearing(maxAngleBearing) {
-    this._mapMatching.maxAngleBearing = maxAngleBearing;
+    this._geoGraphProjectionHandler.maxAngleBearing = maxAngleBearing;
   }
   get useItineraryStartAsPosition() {
     return this._useItineraryStartAsPosition;
@@ -3266,6 +3268,7 @@ exports.RelativeAttitudeFromBrowserProvider = RelativeAttitudeFromBrowser$1;
 exports.RelativeAttitudeFromEkfProvider = RelativeAttitudeFromEkfProvider;
 exports.RelativeAttitudeFromInertialProvider = RelativeAttitudeFromInertialProvider;
 exports.RelativeAttitudeProvider = RelativeAttitudeProvider$1;
+exports.RelativeRotationCalc = RelativeRotationCalc;
 exports.StepDetectionMinMaxPeaks2 = StepDetectionMinMaxPeaks2;
 exports.StepDetectionMinMaxPeaks3 = StepDetectionMinMaxPeaks3;
 exports.StepProvider = StepProvider$1;