@aibee/crc-bmap 0.0.13 → 0.0.14

package/lib/bmap.esm.js

@@ -538,8 +538,8 @@ var Graphic = class extends Object3D {
     }
     const intersects = raycaster.intersectObject(this.mesh);
     if (intersects[0]) {
-      const position = intersects[0].point;
-      return position;
+      const { point: position, distance } = intersects[0];
+      return { position, distance };
     }
     return false;
   }
@@ -658,6 +658,9 @@ var Overlay = class extends EventDispatcher {
   setVisible(visible, display = "block") {
     this.div.style.display = visible ? display : "none";
   }
+  setOpacity(opacity) {
+    this.div.style.opacity = `${opacity}`;
+  }
   getPosition() {
     if (this.element) {
       if (typeof this.element.getPosition === "function") {
@@ -688,13 +691,14 @@ var Overlay = class extends EventDispatcher {
 var defaultOptions2 = {
   text: "",
   level: 1,
-  collision_enable: true
+  collision_enable: true,
+  opacity: 1
 };
 var Poi = class extends Object3D4 {
   constructor(context, options) {
     super();
     this.context = context;
-    __publicField(this, "span");
+    __publicField(this, "textDiv");
     __publicField(this, "img");
     __publicField(this, "overlay");
     __publicField(this, "options");
@@ -720,7 +724,11 @@ var Poi = class extends Object3D4 {
       }
     });
     this.addEventListener("change-text", ({ value }) => {
-      this.span.textContent = value;
+      this.overlay.div.removeChild(this.textDiv);
+      this.overlay.div.appendChild(this.initText());
+    });
+    this.addEventListener("change-opacity", ({ value }) => {
+      this.overlay.setOpacity(value);
     });
   }
   initDiv() {
@@ -741,11 +749,23 @@ var Poi = class extends Object3D4 {
     return this.position;
   }
   initText() {
-    const span = document.createElement("span");
-    span.style.whiteSpace = "nowrap";
-    span.textContent = this.options.text;
-    this.span = span;
-    return span;
+    const textDiv = document.createElement("div");
+    textDiv.appendChild(this.createTextFragment());
+    textDiv.style.background = "rgba(255, 255, 255, .7)";
+    textDiv.style.padding = "2px";
+    textDiv.style.borderRadius = "4px";
+    this.textDiv = textDiv;
+    return textDiv;
+  }
+  createTextFragment() {
+    const f = document.createDocumentFragment();
+    this.options.text.split("\r\n").forEach((item) => {
+      const div = document.createElement("div");
+      div.style.whiteSpace = "nowrap";
+      div.textContent = item;
+      f.appendChild(div);
+    });
+    return f;
   }
   initIcon() {
     var _a, _b;
@@ -774,9 +794,9 @@ var Poi = class extends Object3D4 {
   }
   dispose() {
     this.unRegistryEvent();
-    this.overlay.dispose();
-    this.span = null;
+    this.textDiv = null;
     this.img = void 0;
+    this.overlay.dispose();
   }
 };
 
@@ -818,23 +838,29 @@ var GraphicLayer = class extends Layer {
    * @param raycaster 
    */
   getGraphicByRaycaster(raycaster) {
-    let position = null;
-    const graphics = this.children.filter((item) => {
+    const initData = { distance: 1e4, graphic: null, position: null };
+    const data = this.children.reduce((res, item) => {
       if (item instanceof Graphic) {
         const pos = item.raycast(raycaster);
         if (pos) {
-          if (position) {
-            if (pos.z > position.z) {
-              position = pos;
-            }
-          } else {
-            position = pos;
+          const { distance } = pos;
+          if (distance < res.distance) {
+            return {
+              distance: res.distance,
+              position: res.position,
+              graphic: item
+            };
           }
         }
-        return !!pos;
+        return res;
+      } else {
+        return res;
       }
-    });
-    return { graphics, position };
+    }, initData);
+    if (data === initData) {
+      return { graphics: [], position: null };
+    }
+    return { graphics: [data.graphic], position: data.position };
   }
 };
 
@@ -1059,6 +1085,12 @@ var Floor = class extends Object3D7 {
       }
     });
   }
+  get hasElement() {
+    return !!(this.grounds.size || this.graphicLayer.children.length);
+  }
+  getCenter() {
+    return new Box34().setFromObject(this.groundUpper).getCenter(new Vector35());
+  }
   addShadow() {
     const box = new Box34().setFromObject(this.groundUpper);
     const center2 = box.getCenter(new Vector35());
@@ -1668,7 +1700,7 @@ var Context = class extends EventDispatcher5 {
       camera.top = h / 2;
       camera.bottom = -h / 2;
       camera.updateProjectionMatrix();
-      renderer.setSize(window.innerWidth, window.innerHeight);
+      renderer.setSize(w, h);
     });
     __publicField(this, "onClick", (e) => {
       const { graphics, position } = this.getGraphicsByDeviceXy(e.offsetX, e.offsetY);
@@ -1742,14 +1774,13 @@ var Context = class extends EventDispatcher5 {
     });
   }
   switchFloor(floor) {
-    var _a;
     if (this.currentFloor) {
       this.scene.remove(this.currentFloor);
       this.currentFloor.dispose();
     }
     this.currentFloor = floor;
     this.scene.add(floor);
-    const position = (_a = floor.graphicLayer) == null ? void 0 : _a.getCenter();
+    const position = floor.getCenter();
     if (position) {
       this.lights.position.x = position.x;
       this.lights.position.y = position.y;
@@ -1889,7 +1920,7 @@ var Context = class extends EventDispatcher5 {
     return this.setZoom(scale * this.camera.zoom, center2, duration);
   }
   fitCameraToGround(padding = [20, 20, 20, 20], duration = 500) {
-    if (this.currentFloor) {
+    if (this.currentFloor && this.currentFloor.hasElement) {
       return this.fitCameraToObject(this.currentFloor.groundUpper, padding, duration);
     } else {
       return Promise.resolve(false);
@@ -2101,19 +2132,21 @@ var BMap = class extends EventDispatcher6 {
     return { curFloor, graphics };
   }
   switchFloor(floor) {
-    const curFloorData = this.floorDataMap.get(floor);
-    if (curFloorData) {
-      const createdFloor = this.createFloor(curFloorData);
-      if (createdFloor) {
-        this.context.switchFloor(createdFloor.curFloor);
-        this.context.fitCameraToGround(void 0, 0);
-        this.basicZoom = this.context.camera.zoom;
+    return __async(this, null, function* () {
+      const curFloorData = this.floorDataMap.get(floor);
+      if (curFloorData) {
+        const createdFloor = this.createFloor(curFloorData);
+        if (createdFloor) {
+          this.context.switchFloor(createdFloor.curFloor);
+          yield this.context.fitCameraToGround(void 0, 0);
+          this.basicZoom = this.context.camera.zoom;
+        } else {
+          console.warn("[switchFloor error] [" + floor + "] \u697C\u5C42\u6CA1\u6709\u6570\u636E");
+        }
       } else {
-        console.warn("[switchFloor error] [" + floor + "] \u697C\u5C42\u6CA1\u6709\u6570\u636E");
+        console.warn("[switchFloor error] \u6CA1\u6709\u8FD9\u4E2A\u697C\u5C42\uFF0C\u8BF7\u5148\u8C03\u7528load\u65B9\u6CD5\u52A0\u8F7D\u697C\u5C42");
       }
-    } 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;
@@ -2134,8 +2167,11 @@ var BMap = class extends EventDispatcher6 {
   createGraphicPoi(graphic, options) {
     if (this.context.currentFloor) {
       const poi = this.context.currentFloor.addPoi(options);
-      poi.position.copy(graphic.getCenter());
+      const position = graphic.getCenter();
+      position.z += graphic.options.height / 2;
+      poi.position.copy(position);
       poi.position.z = poi.position.z + graphic.options.height / 2;
+      return poi;
     }
     return null;
   }