@aibee/crc-bmap 0.8.10 → 0.8.12

package/lib/bmap.esm.js

@@ -1657,7 +1657,7 @@ var require_typed_function = __commonJS({
 });
 
 // src/bmap.ts
-import { EventDispatcher as EventDispatcher10, Vector3 as Vector323 } from "three";
+import { EventDispatcher as EventDispatcher11, Vector3 as Vector323 } from "three";
 
 // src/utils/timer.ts
 var Timer = class {
@@ -3745,9 +3745,168 @@ var ClickHelper = class extends EventDispatcher {
   }
 };
 
+// src/utils/taskQueue.ts
+import { isNil } from "lodash";
+import { EventDispatcher as EventDispatcher2 } from "three";
+var TaskQueue = class extends EventDispatcher2 {
+  // 任务队列
+  _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;
+  }
+  replaceByMetaType(task) {
+    const type = task.meta?.type;
+    if (isNil(type)) {
+      return this.add(task);
+    } else {
+      const findTask = this._task.find((item) => item.meta.type === type);
+      if (findTask) {
+        return this.replace(findTask.tid, task);
+      } else {
+        return this.add(task);
+      }
+    }
+  }
+  /**
+   * 根据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 });
+    let res;
+    try {
+      res = await $task.run();
+    } catch (e2) {
+      console.warn("[task run err]", e2, $task);
+    }
+    this.activeTask = null;
+    this.dispatchEvent({ type: "active-task-end", task: $task, res });
+    return this.exec();
+  }
+};
+
 // src/context/context.ts
 import {
-  EventDispatcher as EventDispatcher9,
+  EventDispatcher as EventDispatcher10,
   Box2 as Box23,
   Vector3 as Vector322,
   Vector2 as Vector212,
@@ -3758,7 +3917,7 @@ import {
 } from "three";
 
 // src/operations/selection/selection.ts
-import { EventDispatcher as EventDispatcher5 } from "three";
+import { EventDispatcher as EventDispatcher6 } from "three";
 
 // src/elements/graphic.ts
 import {
@@ -4560,17 +4719,17 @@ var Shadow = class extends Object3D2 {
 };
 
 // src/elements/poi.ts
-import { EventDispatcher as EventDispatcher3, Vector3 as Vector37 } from "three";
+import { EventDispatcher as EventDispatcher4, Vector3 as Vector37 } from "three";
 
 // src/elements/overlay.ts
-import { Box3 as Box32, EventDispatcher as EventDispatcher2, Vector3 as Vector36 } from "three";
+import { Box3 as Box32, EventDispatcher as EventDispatcher3, Vector3 as Vector36 } from "three";
 import { debounce } from "lodash";
 var defaultOptions = {
   autoUpdate: true,
   appendToBody: false,
   autoChangePlacement: false
 };
-var Overlay = class extends EventDispatcher2 {
+var Overlay = class extends EventDispatcher3 {
   constructor(context, options = {}) {
     super();
     this.context = context;
@@ -4873,7 +5032,7 @@ var defaultOptions2 = {
   built_in: false,
   box_only_icon: false
 };
-var Poi = class extends EventDispatcher3 {
+var Poi = class extends EventDispatcher4 {
   constructor(context, options) {
     super();
     this.context = context;
@@ -5789,8 +5948,8 @@ var Floor = class extends Object3D8 {
 };
 
 // src/elements/base-svg.ts
-import { EventDispatcher as EventDispatcher4, Vector3 as Vector312 } from "three";
-var BaseSvg = class extends EventDispatcher4 {
+import { EventDispatcher as EventDispatcher5, Vector3 as Vector312 } from "three";
+var BaseSvg = class extends EventDispatcher5 {
   constructor(context) {
     super();
     this.context = context;
@@ -7292,7 +7451,7 @@ var BoxSelection = class extends BaseSvg {
 };
 
 // src/operations/selection/selection.ts
-var Selection = class extends EventDispatcher5 {
+var Selection = class extends EventDispatcher6 {
   constructor(context) {
     super();
     this.context = context;
@@ -7412,8 +7571,8 @@ var Selection = class extends EventDispatcher5 {
 };
 
 // src/operations/hover/hover-helper.ts
-import { EventDispatcher as EventDispatcher6, Vector2 as Vector210 } from "three";
-var HoverHelper = class extends EventDispatcher6 {
+import { EventDispatcher as EventDispatcher7, Vector2 as Vector210 } from "three";
+var HoverHelper = class extends EventDispatcher7 {
   constructor(context) {
     super();
     this.context = context;
@@ -7623,7 +7782,7 @@ import { Tween as Tween2, Group as TweenGroup } from "@tweenjs/tween.js";
 
 // src/context/OrbitControls.ts
 import {
-  EventDispatcher as EventDispatcher7,
+  EventDispatcher as EventDispatcher8,
   MOUSE,
   Quaternion,
   Spherical,
@@ -7637,7 +7796,7 @@ import {
 var _ray = new Ray2();
 var _plane = new Plane();
 var TILT_LIMIT = Math.cos(70 * MathUtils.DEG2RAD);
-var OrbitControls = class extends EventDispatcher7 {
+var OrbitControls = class extends EventDispatcher8 {
   object;
   domElement;
   rotateLineStart = new Vector211();
@@ -8606,12 +8765,12 @@ var Control = class extends OrbitControls {
 
 // src/context/renderer.ts
 import {
-  EventDispatcher as EventDispatcher8,
+  EventDispatcher as EventDispatcher9,
   PCFSoftShadowMap,
   WebGLRenderer
 } from "three";
 var Renderer = class extends WebGLRenderer {
-  event = new EventDispatcher8();
+  event = new EventDispatcher9();
   scene;
   camera;
   enable = true;
@@ -8690,7 +8849,7 @@ var ContextCamera = class extends OrthographicCamera2 {
 };
 
 // src/context/context.ts
-var Context = class extends EventDispatcher9 {
+var Context = class extends EventDispatcher10 {
   constructor(container, config4) {
     super();
     this.container = container;
@@ -9070,7 +9229,7 @@ var MapTypePolar = /* @__PURE__ */ ((MapTypePolar2) => {
   MapTypePolar2[MapTypePolar2["D3"] = 1.1] = "D3";
   return MapTypePolar2;
 })(MapTypePolar || {});
-var BMap = class extends EventDispatcher10 {
+var BMap = class extends EventDispatcher11 {
   constructor(container, config4 = {}) {
     super();
     this.container = container;
@@ -9505,8 +9664,8 @@ var BMap = class extends EventDispatcher10 {
 };
 
 // src/plugins/base.ts
-import { EventDispatcher as EventDispatcher11 } from "three";
-var Plugin = class extends EventDispatcher11 {
+import { EventDispatcher as EventDispatcher12 } from "three";
+var Plugin = class extends EventDispatcher12 {
   bmap;
   constructor(bmap) {
     super();
@@ -10415,7 +10574,7 @@ import { Tween as Tween4, Easing } from "@tweenjs/tween.js";
 import { Vector3 as Vector326 } from "three";
 
 // src/plugins/navigation/position-navigation.ts
-import { EventDispatcher as EventDispatcher12 } from "three";
+import { EventDispatcher as EventDispatcher13 } from "three";
 import { Tween as Tween3 } from "@tweenjs/tween.js";
 import { throttle } from "lodash";
 var defaultConfig3 = {
@@ -10424,7 +10583,7 @@ var defaultConfig3 = {
   directionEmitThreshold: 5,
   simulationSpeed: 1
 };
-var PositionNavigation = class extends EventDispatcher12 {
+var PositionNavigation = class extends EventDispatcher13 {
   constructor(navigation, options) {
     super();
     this.navigation = navigation;
@@ -10689,150 +10848,6 @@ var PositionNavigation = class extends EventDispatcher12 {
   }
 };
 
-// src/utils/taskQueue.ts
-import { EventDispatcher as EventDispatcher13 } from "three";
-var TaskQueue = class extends EventDispatcher13 {
-  // 任务队列
-  _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 (e2) {
-      console.warn("[task run err]", e2, $task);
-    }
-    this.activeTask = null;
-    this.dispatchEvent({ type: "active-task-end", task: $task });
-    return this.exec();
-  }
-};
-
 // src/plugins/navigation/start-rotate-helper-poi.ts
 import { DataTexture as DataTexture2, LinearFilter as LinearFilter3, RGBAFormat as RGBAFormat3, Sprite as Sprite2, SpriteMaterial as SpriteMaterial2 } from "three";
 var StartRotateHelperPoi = class _StartRotateHelperPoi extends Poi2 {
@@ -12006,7 +12021,7 @@ var BMapSelect = class extends Plugin {
 };
 
 // src/plugins/pdr-position/sensor.ts
-import { cloneDeep as cloneDeep4, isNil, throttle as throttle2 } from "lodash";
+import { cloneDeep as cloneDeep4, isNil as isNil2, throttle as throttle2 } from "lodash";
 import { EventDispatcher as EventDispatcher16 } from "three";
 var defaultSensorOptions = {
   time: 1e3,
@@ -12048,7 +12063,7 @@ var Sensor = class extends EventDispatcher16 {
   deviceOrientationAbsHandler = throttle2((e2) => {
     const currTime = Date.now();
     const { alpha, beta, gamma } = e2;
-    if (isNil(alpha) || isNil(beta) || isNil(gamma)) {
+    if (isNil2(alpha) || isNil2(beta) || isNil2(gamma)) {
       return;
     }
     let compass;
@@ -12084,7 +12099,7 @@ var Sensor = class extends EventDispatcher16 {
   }
   handleAcceleration = (e2) => {
     const res = e2.accelerationIncludingGravity;
-    if (isNil(res) || isNil(res.x) || isNil(res.y) || isNil(res.z)) {
+    if (isNil2(res) || isNil2(res.x) || isNil2(res.y) || isNil2(res.z)) {
       return;
     }
     this.addAcceleration({
@@ -12134,7 +12149,7 @@ var Sensor = class extends EventDispatcher16 {
     } else {
       window.removeEventListener("deviceorientationabsolute", this.deviceOrientationAbsHandler, { absolute: true });
     }
-    if (!isNil(this.gpsTimer)) {
+    if (!isNil2(this.gpsTimer)) {
       navigator.geolocation.clearWatch(this.gpsTimer);
     }
     this.dispatchTimer && this.timer.clearInterval(this.dispatchTimer);
@@ -24272,7 +24287,7 @@ var StartModel = class extends Object3D20 {
 
 // src/plugins/mul-floor-navigation/mul-floor-navigation.ts
 import { Vector3 as Vector330 } from "three";
-import { isNil as isNil2 } from "lodash";
+import { isNil as isNil3 } from "lodash";
 var MulFloorNavigation = class extends Plugin {
   constructor(bmap, mulFloor) {
     super(bmap);
@@ -24456,7 +24471,7 @@ var MulFloorNavigation = class extends Plugin {
           this.startModel.position.set(translatePos[0], translatePos[1], z);
         }
         const angle = this.getPathDirection(paths[index].points, pos);
-        if (!isNil2(angle)) {
+        if (!isNil3(angle)) {
           this.startModel.setRotationFromAxisAngle(new Vector330(0, 0, 1), angle);
         }
       }).onComplete(() => {
@@ -25017,6 +25032,7 @@ var AibeeLoader = class extends EventDispatcher19 {
   floors = [];
   initDbPromise = Promise.resolve();
   db = null;
+  taskQueue = new TaskQueue();
   async initDb() {
     try {
       const { db, type } = await createDb("aibee_map", 2);
@@ -25185,6 +25201,24 @@ var AibeeLoader = class extends EventDispatcher19 {
     floor2.userData.height = max2 / 4 + data.floorHeight;
   }
   async switchFloor(data) {
+    return new Promise((resolve) => {
+      const task = {
+        run: () => this._switchFloor(data),
+        meta: {
+          type: "switchFloor"
+        }
+      };
+      const tid = this.taskQueue.replaceByMetaType(task);
+      const handleTaskEnd = ({ task: task2, res }) => {
+        if (task2.tid === tid) {
+          this.taskQueue.removeEventListener("active-task-end", handleTaskEnd);
+          resolve(res);
+        }
+      };
+      this.taskQueue.addEventListener("active-task-end", handleTaskEnd);
+    });
+  }
+  async _switchFloor(data) {
     let floorData = data;
     if (typeof data === "string") {
       const jsonData = await this.getFloorJsonData(data);
@@ -25459,6 +25493,7 @@ export {
   Shadow,
   SvgLine,
   SvgPolygon,
+  TaskQueue,
   TextTexture,
   Timer,
   TweenUtil,