@aibee/crc-bmap 0.0.73 → 0.0.75

package/lib/bmap.esm.js

@@ -44,7 +44,7 @@ var __async = (__this, __arguments, generator) => {
 };
 
 // src/bmap.ts
-import { EventDispatcher as EventDispatcher7, Vector3 as Vector313 } from "three";
+import { EventDispatcher as EventDispatcher7 } from "three";
 
 // src/utils/timer.ts
 var Timer = class {
@@ -991,18 +991,13 @@ var Poi = class extends EventDispatcher2 {
     return __async(this, null, function* () {
       yield sleepOnePromise();
       const { width, height } = this.div.getBoundingClientRect();
-      const { boxScale } = this.context.config.poi;
       this.size = {
-        width: width * boxScale,
-        height: height * boxScale
+        width: width + 2,
+        height: height + 2
       };
     });
   }
   renderHelperBox() {
-    const div = document.createElement("div");
-    const box = this.getBox();
-    div.style.cssText = `position: absolute; top: ${box.top}px;left: ${box.left}px;width: ${box.right - box.left}px;height: ${box.bottom - box.top}px;border: 1px solid red;`;
-    this.context.container.appendChild(div);
   }
   get clientPos() {
     return this.overlay.clientPos;
@@ -1066,7 +1061,6 @@ var Poi = class extends EventDispatcher2 {
       img.style.border = `${this.options.icon_border.width}px solid ${this.options.icon_border.color}`;
     }
     img.onload = () => {
-      this._changePosition();
       this.resetSize();
     };
     this.img = img;
@@ -1094,8 +1088,7 @@ var Poi = class extends EventDispatcher2 {
       if (this.showTextStatus === visible) {
         return;
       }
-      console.log("visible", visible);
-      this.textDiv.style.display = visible ? "block" : "none";
+      this.textDiv.style.visibility = visible ? "visible" : "hidden";
       this.showTextStatus = visible;
     }
   }
@@ -1105,21 +1098,29 @@ var Poi = class extends EventDispatcher2 {
     }
     this.changeOverlayVisible(visible);
   }
-  getBox() {
+  getBox(boxScale = this.context.config.poi.boxScale) {
     const { width, height } = this.size;
+    const w = width * boxScale;
+    const h = height * boxScale;
     const { x, y } = this.overlay.clientPos;
     return {
-      left: x - width / 2,
-      right: x + width / 2,
-      top: this.options.icon ? y - height : y - height / 2,
-      bottom: this.options.icon ? y : y + height / 2
+      left: x - w / 2,
+      right: x + w / 2,
+      top: this.options.icon ? y - h : y - h / 2,
+      bottom: this.options.icon ? y : y + h / 2
     };
   }
+  getOriginBox() {
+    return this.getBox(1);
+  }
   isContain(x, y) {
     if (!this.overlay.visible) {
       return false;
     }
-    const box = this.getBox();
+    if (!this.visible) {
+      return false;
+    }
+    const box = this.getOriginBox();
     return x >= box.left && x <= box.right && y >= box.top && y <= box.bottom;
   }
   dispose() {
@@ -1308,13 +1309,7 @@ var PoiLayer = class extends Layer {
    */
   collisionDetection() {
     const range = [];
-    const pois = this.pois.filter((item) => {
-      if (item.visible && item.withinDisplayRange) {
-        return true;
-      } else {
-        item.parentSetVisible(false);
-      }
-    });
+    const pois = this.pois.filter((item) => item.visible && item.withinDisplayRange);
     pois.forEach((item, index) => {
       const { left, right, top, bottom } = item.getBox();
       if (index === 0) {
@@ -2161,29 +2156,24 @@ var Selection = class extends EventDispatcher4 {
           }
         }
       });
-      if (!e.ctrlKey) {
+      if (!(isMac ? e.metaKey : e.ctrlKey)) {
         this._list.clear();
       }
       graphics.forEach((item) => this._list.add(item));
       this.selectEnd();
       this.downPoint = null;
     });
+    __publicField(this, "onPointerOut", (e) => {
+      this.disableBoxSelection();
+    });
     __publicField(this, "onKeyDown", (e) => {
       if (isControl(e.key)) {
-        this.isMultipleSelect = true;
-        this.boxSelection.setEnable(true);
-        this.prevPanStatus = this.context.control.enablePan;
-        this.prevRotateStatus = this.context.control.enableRotate;
-        this.context.control.enablePan = false;
-        this.context.control.enableRotate = false;
+        this.enableBoxSelection();
       }
     });
     __publicField(this, "onKeyUp", (e) => {
       if (isControl(e.key)) {
-        this.isMultipleSelect = false;
-        this.boxSelection.setEnable(false);
-        this.context.control.enablePan = !!this.prevPanStatus;
-        this.context.control.enableRotate = !!this.prevRotateStatus;
+        this.disableBoxSelection();
       }
     });
     __publicField(this, "onBoxSelected", ({ list }) => {
@@ -2200,19 +2190,42 @@ var Selection = class extends EventDispatcher4 {
   get list() {
     return this._list;
   }
+  enableBoxSelection() {
+    if (this.isMultipleSelect) {
+      return;
+    }
+    this.isMultipleSelect = true;
+    this.boxSelection.setEnable(true);
+    this.prevPanStatus = this.context.control.enablePan;
+    this.prevRotateStatus = this.context.control.enableRotate;
+    this.context.control.enablePan = false;
+    this.context.control.enableRotate = false;
+  }
+  disableBoxSelection() {
+    if (this.isMultipleSelect) {
+      this.isMultipleSelect = false;
+      this.boxSelection.setEnable(false);
+      this.context.control.enablePan = !!this.prevPanStatus;
+      this.context.control.enableRotate = !!this.prevRotateStatus;
+    }
+  }
   selectEnd() {
     this.dispatchEvent({ type: "select", graphics: [...this._list], isMultipleSelect: this.isMultipleSelect });
   }
   registryEvent() {
-    this.context.container.addEventListener("pointerdown", this.onPointerDown);
-    this.context.container.addEventListener("pointerup", this.onPointerUp);
+    this.context.container.addEventListener("pointerdown", this.onPointerDown, true);
+    this.context.container.addEventListener("pointerup", this.onPointerUp, true);
+    this.context.container.addEventListener("pointerout", this.onPointerOut);
+    this.context.container.addEventListener("pointercancel", this.onPointerOut);
     window.addEventListener("keydown", this.onKeyDown);
     window.addEventListener("keyup", this.onKeyUp);
     this.boxSelection.addEventListener("selected", this.onBoxSelected);
   }
   unRegistryEvent() {
-    this.context.container.removeEventListener("pointerdown", this.onPointerDown);
-    this.context.container.removeEventListener("pointerup", this.onPointerUp);
+    this.context.container.removeEventListener("pointerdown", this.onPointerDown, true);
+    this.context.container.removeEventListener("pointerup", this.onPointerUp, true);
+    this.context.container.removeEventListener("pointerout", this.onPointerOut);
+    this.context.container.removeEventListener("pointercancel", this.onPointerOut);
     window.removeEventListener("keydown", this.onKeyDown);
     window.removeEventListener("keyup", this.onKeyUp);
     this.boxSelection.removeEventListener("selected", this.onBoxSelected);
@@ -2242,7 +2255,7 @@ var HoverHelper = class extends EventDispatcher5 {
         var _a;
         return (_a = this.context.currentFloor) == null ? void 0 : _a.graphicLayer.graphicMap.get(item.options.id);
       }).filter((graphic) => graphic && graphic.options.geometry.type === "point");
-      if (!graphics.length && !poiGraphics && this.curGraphics.size) {
+      if (!graphics.length && !poiGraphics.length && this.curGraphics.size) {
         this.curGraphics.clear();
         this.handleHoverGraphicsChange();
         return;
@@ -2263,6 +2276,8 @@ var HoverHelper = class extends EventDispatcher5 {
         }
         const timer = this.timer.setTimeout(() => {
           this.curGraphics.add(graphic);
+          this.graphicTimerMap.delete(graphic);
+          this.timer.clearTimeout(timer);
           this.handleHoverGraphicsChange();
         }, time);
         this.graphicTimerMap.set(graphic, timer);
@@ -2753,14 +2768,7 @@ var Context = class extends EventDispatcher6 {
       duration + 500
     );
   }
-  /**
-   * 放大相机到物体占全屏
-   * @param object
-   * @param padding
-   * @param duration
-   * @returns
-   */
-  fitCameraToObject(object, padding = [20, 20, 20, 20], duration = 500, force2DView = true) {
+  getFitCameraToObjectZoom(object, padding = [20, 20, 20, 20], duration = 500, force2DView = true) {
     const [top, right, bottom, left] = padding;
     const { clientSize: { width, height } } = this;
     const polar = this.control.getPolarAngle();
@@ -2781,7 +2789,23 @@ var Context = class extends EventDispatcher6 {
     const yScale = (height - top - bottom) / size.y;
     const scale = Math.min(xScale, yScale);
     const center2 = new Vector312((max.x + min.x) / 2, (max.y + min.y) / 2, max.z);
-    return this.setZoom(scale * this.camera.zoom, center2, duration);
+    return { zoom: scale * this.camera.zoom, center: center2 };
+  }
+  /**
+   * 放大相机到物体占全屏
+   * @param object
+   * @param padding
+   * @param duration
+   * @returns
+   */
+  fitCameraToObject(object, padding = [20, 20, 20, 20], duration = 500, force2DView = true) {
+    const { zoom, center: center2 } = this.getFitCameraToObjectZoom(object, padding, duration, force2DView);
+    return this.setZoom(zoom, center2, duration);
+  }
+  getFitCameraToGroundZoom(padding = [20, 20, 20, 20], duration = 500, force2DView = true) {
+    if (this.currentFloor && this.currentFloor.hasElement) {
+      return this.getFitCameraToObjectZoom(this.currentFloor.groundUpper, padding, duration, force2DView).zoom;
+    }
   }
   fitCameraToGround(padding = [20, 20, 20, 20], duration = 500, force2DView = true) {
     if (this.currentFloor && this.currentFloor.hasElement) {
@@ -2980,8 +3004,8 @@ var BMap = class extends EventDispatcher7 {
       this.context.control.maxZoom = Infinity;
       this.context.camera.zoom = 1;
       this.context.setAzimuthalAngle(0, 0);
-      this.context.fitCameraToGround(void 0, 0);
-      this.basicZoom = this.context.camera.zoom;
+      const basicZoom = this.context.getFitCameraToGroundZoom(void 0, 0);
+      this.basicZoom = basicZoom || 0;
       this.context.control.minZoom = this.basicZoom;
       this.context.control.maxZoom = this.basicZoom * 25;
       this.context.camera.zoom = zoom;
@@ -3158,9 +3182,9 @@ var BMap = class extends EventDispatcher7 {
         position: graphic.getPosition().setZ(0.1)
       }));
       if (model) {
-        const dir = getLongestSideDir(graphic.options.geometry.cds[0]);
-        const angleY = dir.angleTo(new Vector313(0, 1, 0));
-        model.rotateZ(angleY);
+        const { facilityAngle = 0, facilityXScale = 1, facilityYScale = 1 } = graphic.options.userData;
+        model.rotateZ((180 - facilityAngle) / 180 * Math.PI);
+        model.scale.set(facilityXScale, facilityYScale, 1);
       }
     }
   }
@@ -3212,11 +3236,13 @@ var BMap = class extends EventDispatcher7 {
    * @param duration
    */
   translateElementToCenterX(ele, duration = 500) {
-    const { y, z } = this.context.camera.position;
-    const position = ele.getPosition();
-    position.setY(y);
-    position.setZ(z);
-    return this.context.setCameraPosition(position, duration);
+    return __async(this, null, function* () {
+      const { y, z } = this.context.control.target;
+      const position = ele.getPosition();
+      position.setY(y);
+      position.setZ(z);
+      yield this.context.setCameraPosition(position, duration);
+    });
   }
   /**
    * 获取物体的屏幕坐标