@aibee/crc-bmap 0.8.42 → 0.8.44

package/lib/bmap.esm.js

@@ -12798,7 +12798,7 @@ import { isNil as isNil5 } from "lodash";
 import { EventDispatcher as EventDispatcher19 } from "three";
 
 // ../lib/src/plugins/car-inertial-position/utils.js
-import { BufferGeometry as BufferGeometry7, Line as Line3, LineBasicMaterial as LineBasicMaterial3, Vector2 as Vector218, Vector3 as Vector326 } from "three";
+import { Vector2 as Vector218 } from "three";
 function linearFit(points) {
   const n = points.length;
   let sumX = 0, sumY = 0, sumXY = 0, sumX2 = 0;
@@ -12849,17 +12849,8 @@ function calculateLineDirection(points) {
   const { start, end } = getLineEndpoints(m, b, filteredPoints);
   const radians = new Vector218().subVectors(new Vector218(end[0], end[1]), new Vector218(start[0], start[1])).angle();
   const angle = 360 - (radians / Math.PI * 180 - 90 + 360) % 360;
-  const geometry = new BufferGeometry7();
-  const center2 = window.map.buildingCenter;
-  if (center2) {
-    geometry.setFromPoints([
-      new Vector326(start[0] - center2[0], start[1] - center2[1], 10),
-      new Vector326(end[0] - center2[0], end[1] - center2[1], 10)
-    ]);
-    const line = new Line3(geometry, new LineBasicMaterial3({
-      color: 65535
-    }));
-    window.map.context.scene.add(line);
+  if (Number.isNaN(angle)) {
+    return null;
   }
   return angle;
 }
@@ -12874,6 +12865,7 @@ function calculateInstantaneousSpeed(positions) {
     const deltaTime = current.time - prev.time;
     if (deltaTime > 0) {
       const speed = distance / deltaTime;
+      console.log("speedDelta", prev.type, current.type, transformSpeed(speed), distance, deltaTime);
       speeds.push(speed);
     } else {
       speeds.push(0);
@@ -12882,23 +12874,14 @@ function calculateInstantaneousSpeed(positions) {
   return speeds;
 }
 function predictFutureSpeed(positions, timeIntervalMs) {
-  const speeds = calculateInstantaneousSpeed(positions);
-  const n = speeds.length;
-  if (n === 0) {
-    return 0;
-  }
-  const currentSpeed = speeds[n - 1];
-  let acceleration = 0;
-  if (n > 1) {
-    const speedDifferences = speeds.slice(1).map((speed, index) => speed - speeds[index]);
-    const time = positions.slice(1).reduce((sum, cur, index) => sum + (cur.time - positions[index].time), 0);
-    if (!time) {
-      return 0;
-    }
-    acceleration = speedDifferences.reduce((sum, value) => sum + value, 0) / time;
-  }
-  const futureSpeed = Math.max(currentSpeed + acceleration * timeIntervalMs, 0);
-  return futureSpeed;
+  const first = positions[0];
+  const last = positions.slice(-1)[0];
+  const distance = positions.slice(1).reduce((sum, cur, index) => {
+    const l = getLength(cur.position, positions[index].position);
+    return sum + l;
+  }, 0);
+  const time = last.time - first.time;
+  return distance / time;
 }
 function transformSpeed(speed) {
   return speed * 60 * 60;
@@ -12910,7 +12893,7 @@ function predictFuturePosition(lastPosition, speed, angle, time) {
   const vX = Math.cos(angleInRadians);
   const vY = Math.sin(angleInRadians);
   const dir = new Vector218(vX, vY);
-  vec.add(dir.normalize().multiplyScalar(distance));
+  vec.add(dir.normalize().multiplyScalar(distance + 2));
   return [
     vec.x,
     vec.y
@@ -13066,13 +13049,14 @@ var CarInertialPosition = class extends EventDispatcher20 {
   startCompass() {
     this.compass.start();
   }
-  setPosition(position, time) {
+  setPosition(position, time, duration) {
     this.history.push({
       position,
       time,
+      clientTime: Date.now() - duration,
       type: "vision"
     });
-    const MAX_DISTANCE = 20;
+    const MAX_DISTANCE = 5;
     for (let i = 0; i < this.history.length; i++) {
       const item = this.history[i];
       const distance = getLength(item.position, position);
@@ -13083,20 +13067,21 @@ var CarInertialPosition = class extends EventDispatcher20 {
         break;
       }
     }
-    const posInfo = this.getPosition();
+    const posInfo = this.getPosition("vision");
     this.dispatchEvent({
       type: "change-pos",
       value: posInfo
     });
     this.startPositionTimer();
   }
-  setBeaconPosition(position, time) {
+  setBeaconPosition(position, time, duration) {
     this.history.push({
       position,
       time,
+      clientTime: Date.now() - duration,
       type: "beacon"
     });
-    const posInfo = this.getPosition();
+    const posInfo = this.getPosition("beacon");
     this.dispatchEvent({
       type: "change-pos",
       value: posInfo
@@ -13111,7 +13096,7 @@ var CarInertialPosition = class extends EventDispatcher20 {
       this.timer.clearTimeout(this.autoCleanTimer);
     }
     this.positionTimer = this.timer.setInterval(() => {
-      const posInfo = this.getPosition();
+      const posInfo = this.getPosition("pdr");
       this.dispatchEvent({
         type: "change-pos",
         value: posInfo
@@ -13122,7 +13107,7 @@ var CarInertialPosition = class extends EventDispatcher20 {
       this.positionTimer = null;
     }, 1e3);
   }
-  getPosition() {
+  getPosition(from) {
     if (this.history.length === 0) {
       return {
         success: false,
@@ -13152,7 +13137,7 @@ var CarInertialPosition = class extends EventDispatcher20 {
         value: angle
       });
     }
-    const lastTime = lastHistory.time;
+    const lastTime = lastHistory.clientTime;
     const deltaTime = Date.now() - lastTime;
     const speed = predictFutureSpeed(this.history, deltaTime);
     const pos = this.compassAngle ? predictFuturePosition(lastHistory.position, speed, 360 - this.compassAngle, deltaTime) : lastHistory.position;
@@ -13339,7 +13324,7 @@ function closeDb(db = _db) {
 }
 
 // ../lib/src/loader/AibeeLoader/index.js
-import { Vector3 as Vector327, EventDispatcher as EventDispatcher21 } from "three";
+import { Vector3 as Vector326, EventDispatcher as EventDispatcher21 } from "three";
 
 // ../lib/src/loader/AibeeLoader/layer.js
 function transformLayers(layer, floor) {
@@ -13811,7 +13796,7 @@ var AibeeLoader = class extends EventDispatcher21 {
   }
   changeFloorBox(data, floor) {
     floor.updateBox();
-    const size = floor.box.getSize(new Vector327());
+    const size = floor.box.getSize(new Vector326());
     const max = Math.max(size.x, size.y, size.z);
     floor.userData.height = max / 4 + data.floorHeight;
   }