@aibee/crc-bmap 0.0.42 → 0.0.43

package/lib/bmap.esm.js

@@ -1921,14 +1921,19 @@ var HoverHelper = class extends EventDispatcher4 {
     __publicField(this, "curGraphics", /* @__PURE__ */ new Set());
     __publicField(this, "timer", new Timer());
     __publicField(this, "graphicTimerMap", /* @__PURE__ */ new Map());
-    __publicField(this, "onPointerMove", ({ graphics }) => {
-      if (!graphics.length && this.curGraphics.size) {
+    __publicField(this, "onPointerMove", ({ graphics, pois }) => {
+      const poiGraphics = pois.map((item) => {
+        var _a;
+        return (_a = this.context.currentFloor) == null ? void 0 : _a.graphicLayer.graphicMap.get(item.options.id);
+      });
+      if (!graphics.length && !poiGraphics && this.curGraphics.size) {
         this.curGraphics.clear();
         this.handleHoverGraphicsChange();
         return;
       }
       const { time } = this.context.config.hover;
-      graphics.forEach((graphic) => {
+      const allGraphics = /* @__PURE__ */ new Set([...graphics, ...poiGraphics]);
+      allGraphics.forEach((graphic) => {
         if (this.graphicTimerMap.get(graphic)) {
           return;
         }
@@ -1942,14 +1947,14 @@ var HoverHelper = class extends EventDispatcher4 {
         this.graphicTimerMap.set(graphic, timer);
       });
       this.graphicTimerMap.forEach((timer, graphic) => {
-        if (!graphics.includes(graphic)) {
+        if (!allGraphics.has(graphic)) {
           this.timer.clearTimeout(timer);
           this.graphicTimerMap.delete(graphic);
         }
       });
       const size = this.curGraphics.size;
       this.curGraphics.forEach((graphic) => {
-        if (!graphics.includes(graphic)) {
+        if (!allGraphics.has(graphic)) {
           this.curGraphics.delete(graphic);
         }
       });
@@ -1964,7 +1969,7 @@ var HoverHelper = class extends EventDispatcher4 {
     this.registryEvent();
   }
   handleHoverGraphicsChange(graphics = this.curGraphics) {
-    this.dispatchEvent({ type: "hover-change", graphics: Array.from(this.curGraphics) });
+    this.dispatchEvent({ type: "hover-change", graphics: Array.from(graphics) });
   }
   registryEvent() {
     this.context.addEventListener("pointer-over", this.onPointerMove);
@@ -2199,7 +2204,6 @@ var Context = class extends EventDispatcher5 {
       this.control.update();
       this.control.maxAzimuthAngle = Infinity;
       this.control.minAzimuthAngle = Infinity;
-      return Promise.resolve();
     }
     return timeoutPromise(
       new Promise((resolve) => {
@@ -2232,13 +2236,18 @@ var Context = class extends EventDispatcher5 {
    * @returns
    */
   setZoom(zoom, center2, duration = 500) {
+    const lookAtVector = this.getCameraLookAt();
+    const start = {
+      zoom: this.camera.zoom,
+      target: this.control.target.clone()
+    };
+    if (!duration) {
+      this.camera.position.copy(start.target.clone().sub(lookAtVector));
+      this.control.target.copy(start.target);
+      this.camera.zoom = start.zoom;
+    }
     return timeoutPromise(
       new Promise((resolve) => {
-        const start = {
-          zoom: this.camera.zoom,
-          target: this.control.target.clone()
-        };
-        const lookAtVector = this.getCameraLookAt();
         const tween = new Tween(start, this.tweenGroup).to(
           {
             zoom,
@@ -2550,33 +2559,31 @@ var BMap = class extends EventDispatcher6 {
     curFloor.userData.legacyToGraphicMap = legacyToGraphicMap;
     return { curFloor, graphics };
   }
-  switchFloor(_0) {
-    return __async(this, arguments, function* ({ brand, project, phase, building, floor, ts, resource_type_list }) {
-      const floorKey = this.getFloorKey({ brand, project, phase, building, floor, ts, resource_type_list });
-      const curFloorData = this.floorDataMap.get(floorKey);
-      this.context.control.removeEventListener("change", this.onControlChange);
-      if (curFloorData) {
-        const buildingKey = this.getBuildingKey({ brand, project, phase, building });
-        this.currentBuildGround = this.buildingGroundMap.get(buildingKey) || null;
-        const createdFloor = this.createFloor(curFloorData);
-        if (createdFloor) {
-          this.context.switchFloor(createdFloor.curFloor);
-          this.context.control.minZoom = 0;
-          this.context.control.maxZoom = Infinity;
-          yield this.context.setAzimuthalAngle(0, 0);
-          yield this.context.fitCameraToGround(void 0, 0);
-          this.basicZoom = this.context.camera.zoom;
-          this.context.control.minZoom = this.basicZoom;
-          this.context.control.maxZoom = this.basicZoom * 25;
-          this.context.control.addEventListener("change", this.onControlChange);
-          this.onControlChange();
-        } else {
-          console.warn("[switchFloor error] [" + floor + "] \u697C\u5C42\u6CA1\u6709\u6570\u636E");
-        }
+  switchFloor({ brand, project, phase, building, floor, ts, resource_type_list }) {
+    const floorKey = this.getFloorKey({ brand, project, phase, building, floor, ts, resource_type_list });
+    const curFloorData = this.floorDataMap.get(floorKey);
+    this.context.control.removeEventListener("change", this.onControlChange);
+    if (curFloorData) {
+      const buildingKey = this.getBuildingKey({ brand, project, phase, building });
+      this.currentBuildGround = this.buildingGroundMap.get(buildingKey) || null;
+      const createdFloor = this.createFloor(curFloorData);
+      if (createdFloor) {
+        this.context.switchFloor(createdFloor.curFloor);
+        this.context.control.minZoom = 0;
+        this.context.control.maxZoom = Infinity;
+        this.context.setAzimuthalAngle(0, 0);
+        this.context.fitCameraToGround(void 0, 0);
+        this.basicZoom = this.context.camera.zoom;
+        this.context.control.minZoom = this.basicZoom;
+        this.context.control.maxZoom = this.basicZoom * 25;
+        this.context.control.addEventListener("change", this.onControlChange);
+        this.onControlChange();
       } else {
-        console.warn("[switchFloor error] \u6CA1\u6709\u8FD9\u4E2A\u697C\u5C42\uFF0C\u8BF7\u5148\u8C03\u7528load\u65B9\u6CD5\u52A0\u8F7D\u697C\u5C42");
+        console.warn("[switchFloor error] [" + floor + "] \u697C\u5C42\u6CA1\u6709\u6570\u636E");
       }
-    });
+    } else {
+      console.warn("[switchFloor error] \u6CA1\u6709\u8FD9\u4E2A\u697C\u5C42\uFF0C\u8BF7\u5148\u8C03\u7528load\u65B9\u6CD5\u52A0\u8F7D\u697C\u5C42");
+    }
   }
   addHeatmap(data) {
     var _a;