@aibee/crc-bmap 0.0.41 → 0.0.43

package/lib/bmap.esm.js

@@ -1231,6 +1231,7 @@ var Floor = class extends Object3D7 {
   addGrounds(grounds) {
     grounds.forEach((ground) => {
       if (!this.grounds.has(ground)) {
+        ground.options.height += ground.options.zIndex / 1e5;
         this.grounds.add(ground);
         this.groundUpper.add(ground);
       }
@@ -1240,6 +1241,7 @@ var Floor = class extends Object3D7 {
   changeGroundMaxHeight() {
     const grounds = Array.from(this.grounds);
     this.groundMaxHeight = this.grounds.size > 0 ? Math.max(...grounds.map((ground) => ground.options.height + ground.options.airHeight)) : 0;
+    this.graphicLayer.position.z = this.groundMaxHeight;
   }
   get hasElement() {
     return !!(this.grounds.size || this.graphicLayer.children.length);
@@ -1256,7 +1258,7 @@ var Floor = class extends Object3D7 {
     this.add(this.shadow);
   }
   addGraphic(graphicOptions) {
-    graphicOptions.airHeight = Math.max(this.groundMaxHeight, graphicOptions.airHeight || 0);
+    graphicOptions.height += (graphicOptions.height || 0) / 1e5;
     return this.graphicLayer.createGraphic(graphicOptions);
   }
   addPoi(poiOptions) {
@@ -1919,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;
         }
@@ -1940,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);
         }
       });
@@ -1962,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);
@@ -2157,6 +2164,14 @@ var Context = class extends EventDispatcher5 {
    * @param polar 弧度
    */
   setPolarAngle(polar, duration = 500) {
+    if (duration === 0) {
+      this.control.maxPolarAngle = polar;
+      this.control.minPolarAngle = polar;
+      this.control.update();
+      this.control.maxPolarAngle = this.config.control.maxPolar;
+      this.control.minPolarAngle = 0;
+      return Promise.resolve();
+    }
     return timeoutPromise(
       new Promise((resolve) => {
         const start = { polar: this.control.getPolarAngle() };
@@ -2178,6 +2193,39 @@ var Context = class extends EventDispatcher5 {
       duration + 500
     );
   }
+  /**
+   * 设置横向旋转角度
+   * @param azimuthal 弧度
+   */
+  setAzimuthalAngle(azimuthal, duration = 500) {
+    if (duration === 0) {
+      this.control.maxAzimuthAngle = azimuthal;
+      this.control.minAzimuthAngle = azimuthal;
+      this.control.update();
+      this.control.maxAzimuthAngle = Infinity;
+      this.control.minAzimuthAngle = Infinity;
+    }
+    return timeoutPromise(
+      new Promise((resolve) => {
+        const start = { azimuthal: this.control.getAzimuthalAngle() };
+        const end = { azimuthal };
+        const tween = new Tween(start, this.tweenGroup).to(end, duration).onUpdate(() => {
+          this.control.maxAzimuthAngle = start.azimuthal;
+          this.control.minAzimuthAngle = start.azimuthal;
+          this.control.update();
+        }).onComplete(() => {
+          this.control.enabled = true;
+          this.control.maxAzimuthAngle = Infinity;
+          this.control.minAzimuthAngle = Infinity;
+          this.tweenGroup.remove(tween);
+          resolve(true);
+        }).onStart(() => {
+          this.control.enabled = false;
+        }).start();
+      }),
+      duration + 500
+    );
+  }
   getCameraLookAt() {
     return new Vector38().subVectors(this.control.target, this.camera.position);
   }
@@ -2188,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,
@@ -2226,18 +2279,21 @@ var Context = class extends EventDispatcher5 {
    */
   fitCameraToObject(object, padding = [20, 20, 20, 20], duration = 500) {
     const [top, right, bottom, left] = padding;
-    const { clientWidth, clientHeight } = this.container;
+    const { clientSize: { width, height } } = this;
+    const polar = this.control.getPolarAngle();
+    this.setPolarAngle(0, 0);
     const boundingBox = new Box36().setFromObject(object);
+    this.setPolarAngle(polar, 0);
     const { max, min } = boundingBox;
-    const max2d = vector3ToDevice(max, this.camera, clientWidth, clientHeight);
-    const min2d = vector3ToDevice(min, this.camera, clientWidth, clientHeight);
+    const max2d = vector3ToDevice(max, this.camera, width, height);
+    const min2d = vector3ToDevice(min, this.camera, width, height);
     const boundingBox2d = new Box2().setFromPoints([
       new Vector23(max2d.x, max2d.y),
       new Vector23(min2d.x, min2d.y)
     ]);
     const size = boundingBox2d.getSize(new Vector23());
-    const xScale = (clientWidth - right - left) / size.x;
-    const yScale = (clientHeight - top - bottom) / size.y;
+    const xScale = (width - right - left) / size.x;
+    const yScale = (height - top - bottom) / size.y;
     const scale = Math.min(xScale, yScale);
     const center2 = new Vector38((max.x + min.x) / 2, (max.y + min.y) / 2, max.z);
     return this.setZoom(scale * this.camera.zoom, center2, duration);
@@ -2341,6 +2397,11 @@ function getConfig(config) {
 }
 
 // src/bmap.ts
+var MapTypePolar = /* @__PURE__ */ ((MapTypePolar2) => {
+  MapTypePolar2[MapTypePolar2["D2"] = 0] = "D2";
+  MapTypePolar2[MapTypePolar2["D3"] = 0.9] = "D3";
+  return MapTypePolar2;
+})(MapTypePolar || {});
 var BMap = class extends EventDispatcher6 {
   constructor(container, config = {}) {
     super();
@@ -2353,6 +2414,7 @@ var BMap = class extends EventDispatcher6 {
     __publicField(this, "svgPolygon");
     __publicField(this, "basicZoom", 1);
     __publicField(this, "prevCameraZoom", 1);
+    __publicField(this, "type", "2d");
     __publicField(this, "floorDataMap", /* @__PURE__ */ new Map());
     __publicField(this, "buildingGroundMap", /* @__PURE__ */ new Map());
     __publicField(this, "currentBuildGround", null);
@@ -2484,8 +2546,7 @@ var BMap = class extends EventDispatcher6 {
     curFloor.addGrounds(groundGraphics);
     const graphicData = data.filter((item) => item.info.group !== "ground");
     graphicData.forEach((item, index) => {
-      item.info.airHeight = 5;
-      item.info.height = 5 + index * 1e-4;
+      item.info.height = 5;
     });
     const legacyToGraphicMap = /* @__PURE__ */ new Map();
     const graphics = graphicData.map((item) => {
@@ -2498,32 +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.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;
@@ -2586,12 +2646,21 @@ var BMap = class extends EventDispatcher6 {
    * @param duration
    */
   changeMapType(type, duration = 500) {
+    this.type = type;
     if (type === "2d") {
-      return this.context.setPolarAngle(0, duration);
+      return this.context.setPolarAngle(0 /* D2 */, duration);
     } else {
-      return this.context.setPolarAngle(0.9, duration);
+      return this.context.setPolarAngle(0.9 /* D3 */, duration);
     }
   }
+  resetView(duration = 300) {
+    return __async(this, null, function* () {
+      const time = duration / 3;
+      yield this.context.setAzimuthalAngle(0, time);
+      yield this.changeMapType(this.type, time);
+      yield this.context.fitCameraToGround(void 0, time);
+    });
+  }
   /**
    * 缩小地图
    * @param zoom
@@ -2776,6 +2845,7 @@ export {
   HeatmapElement,
   HoverHelper,
   Layer,
+  MapTypePolar,
   Overlay,
   Poi,
   PoiLayer,