@aibee/crc-bmap 0.0.63 → 0.0.65

package/lib/bmap.esm.js

@@ -1966,6 +1966,7 @@ var Selection = class extends EventDispatcher4 {
     __publicField(this, "prevPanStatus");
     __publicField(this, "prevRotateStatus");
     __publicField(this, "downPoint", null);
+    __publicField(this, "isMultipleSelect", false);
     __publicField(this, "onPointerDown", (e) => {
       this.downPoint = { x: e.offsetX, y: e.offsetY };
     });
@@ -1985,7 +1986,7 @@ var Selection = class extends EventDispatcher4 {
         var _a;
         if (!graphicIdSet.has(item.options.id)) {
           const graphic = ((_a = this.context.currentFloor) == null ? void 0 : _a.graphicLayer.graphicMap.get(item.options.id)) || null;
-          if (graphic) {
+          if (graphic && graphic.options.geometry.type === "point") {
             graphics.push(graphic);
             graphicIdSet.add(item.options.id);
           }
@@ -2000,6 +2001,7 @@ var Selection = class extends EventDispatcher4 {
     });
     __publicField(this, "onKeyDown", (e) => {
       if (e.key === "Control") {
+        this.isMultipleSelect = true;
         this.boxSelection.setEnable(true);
         this.prevPanStatus = this.context.control.enablePan;
         this.prevRotateStatus = this.context.control.enableRotate;
@@ -2009,6 +2011,7 @@ var Selection = class extends EventDispatcher4 {
     });
     __publicField(this, "onKeyUp", (e) => {
       if (e.key === "Control") {
+        this.isMultipleSelect = false;
         this.boxSelection.setEnable(false);
         this.context.control.enablePan = !!this.prevPanStatus;
         this.context.control.enableRotate = !!this.prevRotateStatus;
@@ -2029,7 +2032,7 @@ var Selection = class extends EventDispatcher4 {
     return this._list;
   }
   selectEnd() {
-    this.dispatchEvent({ type: "select", graphics: [...this._list] });
+    this.dispatchEvent({ type: "select", graphics: [...this._list], isMultipleSelect: this.isMultipleSelect });
   }
   registryEvent() {
     this.context.container.addEventListener("pointerdown", this.onPointerDown);
@@ -2069,14 +2072,19 @@ var HoverHelper = class extends EventDispatcher5 {
       const poiGraphics = pois.map((item) => {
         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) {
         this.curGraphics.clear();
         this.handleHoverGraphicsChange();
         return;
       }
       const { time } = this.context.config.hover;
-      const allGraphics = /* @__PURE__ */ new Set([...graphics, ...poiGraphics]);
+      const allGraphics = new Set(graphics);
+      if (!allGraphics.size) {
+        poiGraphics.forEach((graphic) => {
+          allGraphics.add(graphic);
+        });
+      }
       allGraphics.forEach((graphic) => {
         if (this.graphicTimerMap.get(graphic)) {
           return;
@@ -2244,8 +2252,8 @@ var Context = class extends EventDispatcher6 {
     __publicField(this, "onPointerleave", () => {
       this.dispatchEvent({ type: "pointer-level" });
     });
-    __publicField(this, "onSelectionSelect", ({ graphics }) => {
-      this.dispatchEvent({ type: "select-graphic", graphics });
+    __publicField(this, "onSelectionSelect", ({ graphics, isMultipleSelect }) => {
+      this.dispatchEvent({ type: "select-graphic", graphics, isMultipleSelect });
     });
     __publicField(this, "onHoverChange", ({ graphics }) => {
       this.dispatchEvent({ type: "hover", graphics });
@@ -2477,11 +2485,13 @@ var Context = class extends EventDispatcher6 {
    * @param duration
    * @returns
    */
-  fitCameraToObject(object, padding = [20, 20, 20, 20], duration = 500) {
+  fitCameraToObject(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();
-    this.setPolarAngle(0, 0);
+    if (force2DView) {
+      this.setPolarAngle(0, 0);
+    }
     const boundingBox = new Box36().setFromObject(object);
     this.setPolarAngle(polar, 0);
     const { max, min } = boundingBox;
@@ -2498,9 +2508,9 @@ var Context = class extends EventDispatcher6 {
     const center2 = new Vector39((max.x + min.x) / 2, (max.y + min.y) / 2, max.z);
     return this.setZoom(scale * this.camera.zoom, center2, duration);
   }
-  fitCameraToGround(padding = [20, 20, 20, 20], duration = 500) {
+  fitCameraToGround(padding = [20, 20, 20, 20], duration = 500, force2DView = true) {
     if (this.currentFloor && this.currentFloor.hasElement) {
-      return this.fitCameraToObject(this.currentFloor.groundUpper, padding, duration);
+      return this.fitCameraToObject(this.currentFloor.groundUpper, padding, duration, force2DView);
     } else {
       return Promise.resolve(false);
     }
@@ -2842,6 +2852,9 @@ var BMap = class extends EventDispatcher7 {
         this.context.control.minZoom = this.basicZoom;
         this.context.control.maxZoom = this.basicZoom * 25;
         this.context.control.addEventListener("change", this.onControlChange);
+        if (this.type === "3d") {
+          this.context.fitCameraToGround([80, 20, 80, 20], 0, false);
+        }
         this.onControlChange();
       } else {
         console.warn("[switchFloor error] [" + floor + "] \u697C\u5C42\u6CA1\u6709\u6570\u636E");