@wemap/providers 11.0.0-alpha.26 → 11.0.0-alpha.4

package/dist/index.js

@@ -307,7 +307,6 @@ const Constants = {
 const _GnssWifiProvider = class extends Provider {
   constructor() {
     super(...arguments);
-    __publicField(this, "discardPositionsAbove", _GnssWifiProvider.DEFAULT_DISCARD_POSITIONS_ABOVE);
     __publicField(this, "geoLocationId");
     __publicField(this, "getName", () => "GnssWifi");
     __publicField(this, "onNewPosition", (geolocation) => {
@@ -329,9 +328,6 @@ const _GnssWifiProvider = class extends Provider {
         coords.accuracy,
         bearing
       );
-      if (typeof this.discardPositionsAbove === "number" && coords.accuracy > this.discardPositionsAbove) {
-        return;
-      }
       this.notify(position);
     });
     __publicField(this, "onPositionError", (error) => {
@@ -374,7 +370,6 @@ __publicField(GnssWifiProvider, "POSITION_OPTIONS", {
   timeout: Infinity,
   maximumAge: 0
 });
-__publicField(GnssWifiProvider, "DEFAULT_DISCARD_POSITIONS_ABOVE", 50);
 const GnssWifiProvider$1 = new GnssWifiProvider();
 const _MissingArCoreError = class extends Error {
   constructor(message) {
@@ -749,7 +744,7 @@ class ImuProvider extends Provider {
         } = e.accelerationIncludingGravity;
         if (typeof x === "number" && typeof y === "number" && typeof z === "number") {
           acc = [x, y, z];
-          if (utils.BrowserUtils.getName() === utils.Browser.SAFARI || utils.BrowserUtils.getName() === utils.Browser.IOS_WEBVIEW) {
+          if (utils.BrowserUtils.name === utils.Browser.SAFARI || utils.BrowserUtils.name === utils.Browser.IOS_WEBVIEW) {
             acc[0] *= -1;
             acc[1] *= -1;
             acc[2] *= -1;
@@ -1313,25 +1308,6 @@ 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() {
@@ -1361,6 +1337,25 @@ 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,9 +2005,7 @@ const _AbsolutePositionProvider = class extends Provider {
   start() {
     GeoRelativePositionProvider$1.getAvailability().then((error) => {
       if (!error) {
-        this._relativePositionProviderId = GeoRelativePositionProvider$1.addEventListener(
-          (e) => this._onRelativePosition(e)
-        );
+        this._relativePositionProviderId = GeoRelativePositionProvider$1.addEventListener(this._onRelativePosition);
       }
     });
     this._gnssWifiProviderId = GnssWifiProvider$1.addEventListener(
@@ -2235,7 +2228,7 @@ class AbsoluteAttitudeFromBrowser extends Provider {
   }
   start() {
     const subscribe = () => {
-      switch (utils.BrowserUtils.getName()) {
+      switch (utils.BrowserUtils.name) {
         case utils.Browser.CHROME:
           window.addEventListener(
             "deviceorientationabsolute",
@@ -2276,7 +2269,7 @@ class AbsoluteAttitudeFromBrowser extends Provider {
     }
   }
   stop() {
-    switch (utils.BrowserUtils.getName()) {
+    switch (utils.BrowserUtils.name) {
       case utils.Browser.CHROME:
         window.removeEventListener(
           "deviceorientationabsolute",
@@ -2647,7 +2640,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, "_geoGraphProjectionHandler");
+    __publicField(this, "_mapMatching");
     __publicField(this, "_internalProvidersStarted", false);
     __publicField(this, "_straightLineProviderId");
     __publicField(this, "_turnProviderId");
@@ -2659,18 +2652,18 @@ const _MapMatchingHandler = class extends Provider {
     __publicField(this, "getName", () => "MapMatchingHandler");
     __publicField(this, "availability", () => Promise.resolve());
     __publicField(this, "_manageStartStop", () => {
-      if (this.graph && !this._internalProvidersStarted) {
+      if (this.network && !this._internalProvidersStarted) {
         this._startInternalProviders();
-      } else if (!this.graph && this._internalProvidersStarted) {
+      } else if (!this.network && this._internalProvidersStarted) {
         this._stopInternalProviders();
       }
     });
-    this._geoGraphProjectionHandler = new geo.GeoGraphProjectionHandler();
-    this._geoGraphProjectionHandler.maxDistance = _MapMatchingHandler.DEFAULT_MM_MAX_DIST;
-    this._geoGraphProjectionHandler.maxAngleBearing = _MapMatchingHandler.DEFAULT_MM_MAX_ANGLE;
+    this._mapMatching = new geo.MapMatching();
+    this._mapMatching.maxDistance = _MapMatchingHandler.DEFAULT_MM_MAX_DIST;
+    this._mapMatching.maxAngleBearing = _MapMatchingHandler.DEFAULT_MM_MAX_ANGLE;
   }
   start() {
-    if (this.graph) {
+    if (this.network) {
       this._startInternalProviders();
     }
   }
@@ -2698,19 +2691,19 @@ const _MapMatchingHandler = class extends Provider {
   get enabled() {
     return ProvidersOptions.useMapMatching;
   }
-  get graph() {
-    return this._geoGraphProjectionHandler.graph;
+  get network() {
+    return this._mapMatching.network;
   }
-  set graph(graph) {
-    this._geoGraphProjectionHandler.graph = graph;
+  set network(network) {
+    this._mapMatching.network = network;
     this._itineraryInfoManager = null;
-    this.notify({ ...graph && { graph } });
+    this.notify({ ...network && { network } });
     this._manageStartStop();
     if (this.canUseMapMatching())
       ;
   }
   set itinerary(itinerary) {
-    this._geoGraphProjectionHandler.graph = itinerary ? itinerary.toGraph() : null;
+    this._mapMatching.network = itinerary ? itinerary.toNetwork() : null;
     this._itineraryInfoManager = new routers.ItineraryInfoManager(itinerary);
     this.notify({ ...itinerary && { itinerary } });
     this._manageStartStop();
@@ -2719,7 +2712,7 @@ const _MapMatchingHandler = class extends Provider {
     }
   }
   canUseMapMatching() {
-    return this.enabled && this.graph;
+    return this.enabled && this.network;
   }
   _notifyPositionFromItineraryInput(itinerary) {
     if (!this._useItineraryStartAsPosition || itinerary.from) {
@@ -2856,7 +2849,7 @@ const _MapMatchingHandler = class extends Provider {
     }
     const firstProjection = this._lastProjections[0];
     return !this._lastProjections.some(
-      (projection) => !(projection.nearestElement instanceof geo.GeoGraphEdge) || !(firstProjection.nearestElement instanceof geo.GeoGraphEdge) || maths.diffAngleLines(projection.nearestElement.bearing, firstProjection.nearestElement.bearing) > this._lastProjectionsEdgeAngleThreshold
+      (projection) => !(projection.nearestElement instanceof geo.GraphEdge) || !(firstProjection.nearestElement instanceof geo.GraphEdge) || maths.diffAngleLines(projection.nearestElement.bearing, firstProjection.nearestElement.bearing) > this._lastProjectionsEdgeAngleThreshold
     );
   }
   _nodeHasTurn(node) {
@@ -2872,12 +2865,12 @@ const _MapMatchingHandler = class extends Provider {
     return false;
   }
   _hasTurnInCircle(center, radius) {
-    const network = this._geoGraphProjectionHandler.graph;
+    const network = this._mapMatching.network;
     if (!network) {
       return false;
     }
-    return network.vertices.filter(
-      (vertex) => vertex.coords.distanceTo(center) <= radius && geo.Level.intersect(vertex.coords.level, center.level)
+    return network.nodes.filter(
+      (node) => node.coords.distanceTo(center) <= radius && geo.Level.intersect(node.coords.level, center.level)
     ).some(this._nodeHasTurn);
   }
   tryOrientationMatching(projection) {
@@ -2888,7 +2881,7 @@ const _MapMatchingHandler = class extends Provider {
       return;
     }
     const { nearestElement, origin } = projection;
-    if (!(nearestElement instanceof geo.GeoGraphEdge)) {
+    if (!(nearestElement instanceof geo.GraphEdge)) {
       return;
     }
     let matchingDirection;
@@ -2908,13 +2901,13 @@ const _MapMatchingHandler = class extends Provider {
     this._countStepsFromLastMatching = 0;
   }
   getProjection(position, useDistance, useBearing) {
-    return this._geoGraphProjectionHandler.getProjection(position, useDistance, useBearing);
+    return this._mapMatching.getProjection(position, useDistance, useBearing);
   }
   get maxDistance() {
-    return this._geoGraphProjectionHandler.maxDistance;
+    return this._mapMatching.maxDistance;
   }
   set maxDistance(maxDistance) {
-    this._geoGraphProjectionHandler.maxDistance = maxDistance;
+    this._mapMatching.maxDistance = maxDistance;
   }
   get minDistance() {
     return this._mapMatchingMinDistance;
@@ -2923,10 +2916,10 @@ const _MapMatchingHandler = class extends Provider {
     this._mapMatchingMinDistance = minDistance;
   }
   get maxAngleBearing() {
-    return this._geoGraphProjectionHandler.maxAngleBearing;
+    return this._mapMatching.maxAngleBearing;
   }
   set maxAngleBearing(maxAngleBearing) {
-    this._geoGraphProjectionHandler.maxAngleBearing = maxAngleBearing;
+    this._mapMatching.maxAngleBearing = maxAngleBearing;
   }
   get useItineraryStartAsPosition() {
     return this._useItineraryStartAsPosition;
@@ -3268,7 +3261,6 @@ 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;