@poor-knight/cesium-utils 0.4.1 → 0.4.2

package/dist/cesium-utils.js

@@ -5721,13 +5721,13 @@ function createRoundedRectImage({
   strokeWidth: o = 2,
   // 描边宽度
   textColor: d = "#FFFFFF",
-  fontFamily: u = "Segoe UI, Helvetica, Arial, sans-serif",
+  fontFamily: u = "微软雅黑, Segoe UI, Helvetica, Arial, sans-serif",
   fontWeight: l = "normal",
   fontSize: c = 12,
   padding: h = 6,
   radius: a = 5
 } = {}) {
-  const m = Math.max(0, s.length * c * 0.6 + h * 2), y = c * 1.6, g = 1, p = Math.ceil(o / 2) + 1, v = m + p * 2, b = y + p * 2, _ = document.createElement("canvas");
+  const m = Math.max(0, s.length * c * 0.6 + h * 2), y = c * 1.6, g = 2, p = Math.ceil(o / 2) + 1, v = m + p * 2, b = y + p * 2, _ = document.createElement("canvas");
   _.width = Math.round(v * g), _.height = Math.round(b * g), _.style.width = `${v}px`, _.style.height = `${b}px`;
   const x = _.getContext("2d");
   if (!x) throw new Error("无法获取2D绘图上下文");
@@ -5738,7 +5738,13 @@ function createRoundedRectImage({
   let A = c;
   for (x.fillStyle = d, x.textAlign = "center", x.textBaseline = "middle", x.font = `${l} ${A}px ${u}`; x.measureText(s).width > k && A > 10; )
     A -= 1, x.font = `${l} ${A}px ${u}`;
-  return x.fillText(s, v / 2, b / 2), _;
+  return x.fillText(s, v / 2, b / 2 + 1), _;
+}
+function hookClusterEvent(s) {
+  s.clustering.clusterEvent.addEventListener((r, o) => {
+    const d = r[0], u = d.billboard, l = d.label, c = d.point;
+    o.label.show = !1, o.point.show = !1, u && (o.billboard = Cesium.clone(u)), l && (o.label = Cesium.clone(l)), c ? o.point = Cesium.clone(c) : (o.billboard.show = !0, o.billboard.image = Cesium.buildModuleUrl("Widgets/Images/clusterIcon.png"));
+  });
 }
 class ShipLayer extends EventEmitter {
   constructor(r, o, d) {
@@ -5753,7 +5759,7 @@ class ShipLayer extends EventEmitter {
     j(this, "shadowEntityMap", /* @__PURE__ */ new WeakMap());
     /**显隐entity，回调返回显示隐藏的状态,不传Fn时默认显示所有 */
     j(this, "hookFilterEntityFn");
-    this.key = r, this.zIndex = o, this.db = new Cesium.CustomDataSource(r), this.labelDataSource.clustering.enabled = ((u = d == null ? void 0 : d.clustering) == null ? void 0 : u.enabled) ?? !0, this.labelDataSource.clustering.pixelRange = ((l = d == null ? void 0 : d.clustering) == null ? void 0 : l.pixelRange) ?? 15, this.labelDataSource.clustering.minimumClusterSize = ((c = d == null ? void 0 : d.clustering) == null ? void 0 : c.minimumClusterSize) ?? 2;
+    this.key = r, this.zIndex = o, this.db = new Cesium.CustomDataSource(r), this.labelDataSource.clustering.enabled = ((u = d == null ? void 0 : d.clustering) == null ? void 0 : u.enabled) ?? !0, this.labelDataSource.clustering.pixelRange = ((l = d == null ? void 0 : d.clustering) == null ? void 0 : l.pixelRange) ?? 15, this.labelDataSource.clustering.minimumClusterSize = ((c = d == null ? void 0 : d.clustering) == null ? void 0 : c.minimumClusterSize) ?? 2, hookClusterEvent(this.labelDataSource);
   }
   show(r) {
     this.isMounted || (r.dataSources.add(this.db), r.dataSources.add(this.labelDataSource), this._viewer = r, this.isMounted = !0), this.db.show = !0;
@@ -5907,6 +5913,8 @@ class ShipLayer extends EventEmitter {
     const o = (h = r.properties) == null ? void 0 : h.getValue(), d = o != null && o.updateTime ? new Date(o.updateTime) : /* @__PURE__ */ new Date(), u = Cesium.JulianDate.fromDate(d), l = ((m = (a = r.properties) == null ? void 0 : a.getValue()) == null ? void 0 : m.name) ?? ((y = r.properties) != null && y.getValue().mmsi ? "mmsi:" + ((g = r.properties) == null ? void 0 : g.getValue().mmsi) : "未知"), c = createRoundedRectImage({ text: l });
     r.billboard = new Cesium.BillboardGraphics({
       image: new Cesium.ConstantProperty(c),
+      width: new Cesium.ConstantProperty(Number(c.style.width.replace("px", ""))),
+      height: new Cesium.ConstantProperty(Number(c.style.height.replace("px", ""))),
       scale: new Cesium.ConstantProperty(1),
       // 根据需要微调偏移，让文本位于正中心
       pixelOffset: new Cesium.ConstantProperty(new Cesium.Cartesian2(0, -20)),