@aibee/crc-bmap 0.6.4 → 0.6.6

package/lib/bmap.esm.js

@@ -6499,7 +6499,7 @@ var Control = class extends MapControls {
    * @param center
    * @returns
    */
-  setZoomByDuration(zoom, center2, force = false, duration = 500) {
+  async setZoomByDuration(zoom, center2, force = false, duration = 500) {
     const lookAtVector = this.getCameraLookAt();
     const start = {
       zoom: this.camera.zoom,
@@ -8408,6 +8408,7 @@ var PositionNavigation = class extends EventDispatcher10 {
     this.offset = false;
     this.reset = false;
     this.routeIndex = 0;
+    this.pointIndex = 0;
     if (!paths.length) {
       return;
     }
@@ -8441,7 +8442,6 @@ var PositionNavigation = class extends EventDispatcher10 {
       ...allPath.slice(routeIndex + 1)
     ];
     const { distance, closestPoint, index, i } = paths.reduce((obj, cur, index2) => {
-      console.log("cur", cur.floor, floor);
       if (cur.floor !== floor) {
         return obj;
       }
@@ -8584,6 +8584,7 @@ var PositionNavigation = class extends EventDispatcher10 {
   }
   getNavigationInfo() {
     const { total: remainDistance, curRoute: curRouteRemainDistance } = this.getRemainDistance();
+    console.log(remainDistance, curRouteRemainDistance, this.paths);
     const nextDirInfo = this.getNextDirDistance();
     if (!nextDirInfo) {
       return null;
@@ -8616,6 +8617,150 @@ var PositionNavigation = class extends EventDispatcher10 {
   }
 };
 
+// src/utils/taskQueue.ts
+import { EventDispatcher as EventDispatcher11 } from "three";
+var TaskQueue = class extends EventDispatcher11 {
+  // 任务队列
+  _task = [];
+  // 是否开始执行任务
+  started = false;
+  // 当前正在执行的任务
+  activeTask = null;
+  _id = 0;
+  constructor(start = true) {
+    super();
+    if (start) {
+      this.start();
+    }
+  }
+  /**
+   * 判断任务是否有效
+   * @param task
+   * @return {boolean}
+   * @private
+   */
+  _isEffectiveTask(task) {
+    return task && typeof task.run === "function";
+  }
+  /**
+   * 根据tid获取元素的位置
+   * @param tid
+   * @return {number}
+   * @private
+   */
+  _getIndexByTid(tid) {
+    return this._task.findIndex((task) => task.tid === tid);
+  }
+  /**
+   * 创建任务
+   * @param task
+   * @private
+   */
+  _createTask(task) {
+    if (this._isEffectiveTask(task)) {
+      return { ...task, tid: ++this._id, meta: task.meta || {} };
+    }
+    return false;
+  }
+  get task() {
+    return [...this._task];
+  }
+  /**
+   * 获取当前队列中的任务
+   */
+  getTasks() {
+    return [...this._task];
+  }
+  /**
+   * 添加任务
+   * @param task
+   * @return
+   */
+  add(task) {
+    if (this._isEffectiveTask(task)) {
+      const $task = this._createTask(task);
+      this._task.push($task);
+      if (this.started && !this.activeTask) {
+        this.start();
+      }
+      return $task.tid;
+    }
+    return false;
+  }
+  /**
+   * 替换队列中的某个任务
+   * @param id
+   * @param task
+   */
+  replace(id, task) {
+    if (!this._isEffectiveTask(task)) {
+      console.warn("[TaskQueue] replace\u65B9\u6CD5\u4F20\u5165\u7684task\u53C2\u6570\u683C\u5F0F\u4E0D\u6B63\u786E");
+      return false;
+    }
+    const index = this._getIndexByTid(id);
+    if (index === -1) {
+      console.warn(`[TaskQueue] \u6CA1\u6709\u627E\u5230id=${id}\u7684\u4EFB\u52A1`);
+      return false;
+    }
+    const $task = this._createTask(task);
+    this._task.splice(index, 1, $task);
+    return $task.tid;
+  }
+  /**
+   * 根据id删除对应的task
+   * @param id
+   */
+  remove(id) {
+    const index = this._getIndexByTid(id);
+    if (index === -1) {
+      console.warn(`[TaskQueue] remove\u65B9\u6CD5\u4F20\u5165\u7684id\uFF1A${id}\u627E\u4E0D\u5230\u5BF9\u5E94\u7684task`);
+      return false;
+    }
+    this._task.splice(index, 1);
+    return true;
+  }
+  /**
+   * 清空队列
+   */
+  clear() {
+    this._task.length = 0;
+  }
+  /**
+   * 开始执行任务，默认在构造函数中执行
+   */
+  start() {
+    this.started = true;
+    if (!this.activeTask && this._task.length) {
+      this.exec();
+    }
+  }
+  /**
+   * 停止执行队列中的任务，不包括当前执行中的任务
+   */
+  stop() {
+    this.started = false;
+  }
+  /**
+   * 从任务队列中的第一个任务开始执行
+   */
+  async exec() {
+    if (!this.started || !this._task.length) {
+      return false;
+    }
+    const $task = this._task.shift();
+    this.activeTask = $task;
+    this.dispatchEvent({ type: "active-task-start", task: $task });
+    try {
+      await $task.run();
+    } catch (e) {
+      console.warn("[task run err]", e, $task);
+    }
+    this.activeTask = null;
+    this.dispatchEvent({ type: "active-task-end", task: $task });
+    return this.exec();
+  }
+};
+
 // src/plugins/navigation/navigation.ts
 var defaultConfig4 = {
   path: {},
@@ -8647,7 +8792,8 @@ var Navigation = class extends Plugin {
   movedDistance = 0;
   pathStart = [0, 0];
   tweenUtil = new TweenUtil();
-  toPositionPromise;
+  taskQueue = new TaskQueue();
+  // toPositionPromise?: Promise<any> | null
   // 处理路线动画
   animationPathOptions = {
     cPathIndex: 0
@@ -8695,15 +8841,24 @@ var Navigation = class extends Plugin {
       if (info.routeIndex !== this.curPathIndex) {
         return;
       }
-      if (!this.toPositionPromise) {
-        this.toPositionPromise = this.toPositionBySpeed(info.pos, this.options.speed);
-      } else {
-        this.toPositionPromise.finally(() => {
-          return this.toPositionBySpeed(info.pos, this.options.speed);
-        });
-      }
+      this.toPositionByTask(info.pos);
     }
   };
+  toPositionByTask(pos) {
+    const tasks = this.taskQueue.getTasks();
+    const tid = tasks.find((item) => item.meta.type === "toPosition")?.tid;
+    const newTask = {
+      run: () => this.toPositionBySpeed(pos, this.options.speed),
+      meta: {
+        type: "toPosition"
+      }
+    };
+    if (tid) {
+      this.taskQueue.replace(tid, newTask);
+    } else {
+      this.taskQueue.add(newTask);
+    }
+  }
   pauseAnimation() {
     this.tweenUtil.pause();
     this.positionNavigation.tweenUtil.pause();
@@ -8714,7 +8869,8 @@ var Navigation = class extends Plugin {
   }
   clearTween() {
     this.tweenUtil.clear();
-    this.toPositionPromise = null;
+    this.taskQueue.clear();
+    this.bmap.context.control.enabled = true;
   }
   unRegistryEvent() {
     this.bmap.context.removeEventListener("update", this.onUpdate);
@@ -8762,7 +8918,6 @@ var Navigation = class extends Plugin {
   }
   onSwitchFloor = ({ data: { curFloor } }) => {
     this.clearTween();
-    this.toPositionPromise = null;
     if (this.paths[this.curPathIndex]) {
       const curFloorPathData = this.paths[this.curPathIndex];
       this.setCurFloorPath(curFloorPathData ?? null);
@@ -8880,7 +9035,7 @@ var Navigation = class extends Plugin {
     }
     const { control } = this.bmap.context;
     const time = duration / Math.PI * 6 * diffAngle;
-    return new Promise((resolve) => {
+    return timeoutPromise(new Promise((resolve) => {
       const start = { azimuthal: control.getAzimuthalAngle() };
       const end = { azimuthal: angle };
       const tween = new Tween4(start, this.tweenUtil.group).to(end, time).easing(Easing.Quadratic.InOut).onUpdate(async () => {
@@ -8896,14 +9051,30 @@ var Navigation = class extends Plugin {
       }).onStart(() => {
         control.enabled = false;
       }).start();
+    }), time + 500).finally(() => {
+      this.bmap.context.control.enabled = true;
     });
   }
   async initNavigationCamera(duration = 1e3) {
-    this.clearTween();
-    this.bmap.context.control.clearTween();
-    await this.initCameraZoom(duration / 2);
-    await this.changeCameraToPathUp(duration / 4);
-    await this.translateCameraToStartPoi(duration / 4);
+    const tasks = this.taskQueue.getTasks();
+    const tid = tasks.find((item) => item.meta.type === "initNavigationCamera")?.tid;
+    const newTask = {
+      run: () => timeoutPromise((async () => {
+        await this.initCameraZoom(duration / 2);
+        await this.changeCameraToPathUp(duration / 4);
+        await this.translateCameraToStartPoi(duration / 4);
+      })(), duration + 500).finally(() => {
+        this.bmap.context.control.enabled = true;
+      }),
+      meta: {
+        type: "initNavigationCamera"
+      }
+    };
+    if (tid) {
+      this.taskQueue.replace(tid, newTask);
+    } else {
+      this.taskQueue.add(newTask);
+    }
   }
   async translateCameraToStartPoi(duration = 100) {
     if (!this.startPoi) {
@@ -8955,7 +9126,9 @@ var Navigation = class extends Plugin {
         }).start();
       }),
       duration + 500
-    );
+    ).then(() => {
+      this.bmap.context.control.enabled = true;
+    });
   }
   async initCameraZoom(duration = 100) {
     if (!this.startPoi) {
@@ -8969,7 +9142,9 @@ var Navigation = class extends Plugin {
       zoom,
       this.startPoi.position,
       duration
-    );
+    ).finally(() => {
+      this.bmap.context.control.enabled = true;
+    });
   }
   // 根据定位 实时导航
   toPosition(floor, pos) {
@@ -9011,7 +9186,9 @@ var Navigation = class extends Plugin {
         this.tweenUtil.remove(tween);
         resolve(true);
       }).start();
-    }), time * 1e3 + 500);
+    }), time * 1e3 + 500).finally(() => {
+      this.bmap.context.control.enabled = true;
+    });
   }
   async moveDistance(distance, tween) {
     this.movedDistance = distance;
@@ -9127,7 +9304,7 @@ var MulFloors = class extends Plugin {
 };
 
 // src/plugins/nav-path/nav-path.ts
-import { EventDispatcher as EventDispatcher11 } from "three";
+import { EventDispatcher as EventDispatcher12 } from "three";
 
 // inline-worker:__inline-worker
 function inlineWorker(scriptText) {
@@ -9144,7 +9321,7 @@ function Worker2() {
 }
 
 // src/plugins/nav-path/nav-path.ts
-var NavPath = class extends EventDispatcher11 {
+var NavPath = class extends EventDispatcher12 {
   worker = Worker2();
   initRoadStatus = false;
   constructor() {
@@ -9194,7 +9371,7 @@ var NavPath = class extends EventDispatcher11 {
 };
 
 // src/plugins/cr-nav-path/cr-nav-path.ts
-import { EventDispatcher as EventDispatcher12 } from "three";
+import { EventDispatcher as EventDispatcher13 } from "three";
 
 // src/plugins/cr-nav-path/cr-path.worker.ts
 function Worker3() {
@@ -9202,7 +9379,7 @@ function Worker3() {
 }
 
 // src/plugins/cr-nav-path/cr-nav-path.ts
-var CrNavPath = class extends EventDispatcher12 {
+var CrNavPath = class extends EventDispatcher13 {
   worker = Worker3();
   initRoadStatus = false;
   constructor() {
@@ -9540,12 +9717,12 @@ var BMapSelect = class extends Plugin {
 
 // src/plugins/pdr-position/sensor.ts
 import { cloneDeep as cloneDeep4, isNil, throttle as throttle2 } from "lodash";
-import { EventDispatcher as EventDispatcher13 } from "three";
+import { EventDispatcher as EventDispatcher14 } from "three";
 var defaultSensorOptions = {
   time: 1e3,
   elements: ["compass" /* COMPASS */, "deviceMotion" /* DEVICE_MOTION */, "acceleration" /* ACCELERATION */, "gps" /* GPS */]
 };
-var Sensor = class extends EventDispatcher13 {
+var Sensor = class extends EventDispatcher14 {
   options;
   gpsTimer = null;
   data = [];
@@ -9677,7 +9854,7 @@ var Sensor = class extends EventDispatcher13 {
 };
 
 // src/plugins/pdr-position/position.ts
-import { EventDispatcher as EventDispatcher14 } from "three";
+import { EventDispatcher as EventDispatcher15 } from "three";
 
 // src/plugins/pdr-position/utils.ts
 function gaussLikelihood(avg, std) {
@@ -10543,7 +10720,7 @@ var PositioningSystem = class {
 };
 
 // src/plugins/pdr-position/position.ts
-var PdrPosition = class extends EventDispatcher14 {
+var PdrPosition = class extends EventDispatcher15 {
   sensor;
   pdr;
   _pause = false;