@xingm/vmap-cesium-toolbar 0.0.2-alpha.11 → 0.0.2-alpha.13

package/dist/index.js

@@ -91,14 +91,14 @@ class L {
    * 应用/切换选中样式（统一逻辑，供调度器和子类共用）
    */
   applySelectedStyleToEntity(e) {
-    j(e);
+    I(e);
   }
   /**
    * 恢复原始样式（兼容旧接口，内部仍走统一逻辑）
    */
   restoreOriginalStyleForEntity(e) {
     const t = e;
-    t._isSelected && j(t);
+    t._isSelected && I(t);
   }
   constructor(e, t = {}) {
     this.viewer = e, this.scene = e.scene, this.entities = e.entities, this.callbacks = t, this.updateOffsetHeight();
@@ -151,13 +151,29 @@ class L {
    * 添加一个点到临时位置数组并创建点实体
    */
   addPoint(e) {
-    this.tempPositions.push(e.clone());
-    const t = n.Cartographic.fromCartesian(e), i = n.Cartesian3.fromRadians(
-      t.longitude,
-      t.latitude,
-      (t.height || 0) + this.offsetHeight
-    ), r = this.entities.add({
-      position: i,
+    if (!e || !Number.isFinite(e.x) || !Number.isFinite(e.y) || !Number.isFinite(e.z))
+      return;
+    let t;
+    try {
+      t = e.clone();
+    } catch {
+      return;
+    }
+    let i;
+    try {
+      i = n.Cartographic.fromCartesian(t);
+    } catch {
+      return;
+    }
+    if (!Number.isFinite(i.longitude) || !Number.isFinite(i.latitude))
+      return;
+    this.tempPositions.push(t);
+    const r = n.Cartesian3.fromRadians(
+      i.longitude,
+      i.latitude,
+      (i.height || 0) + this.offsetHeight
+    ), o = this.entities.add({
+      position: r,
       point: {
         pixelSize: 8,
         color: n.Color.RED,
@@ -168,7 +184,7 @@ class L {
         disableDepthTestDistance: Number.POSITIVE_INFINITY
       }
     });
-    this.tempEntities.push(r);
+    this.tempEntities.push(o);
   }
   /**
    * 创建总长/面积标签图片
@@ -199,7 +215,7 @@ class L {
   }
   // 其余公共方法（如有需要可在子类中覆盖）
 }
-function j(c) {
+function I(c) {
   try {
     const t = c._drawOptions?.selected;
     if (!t) return;
@@ -253,16 +269,16 @@ function j(c) {
     console.warn("toggleSelectedStyle failed", e);
   }
 }
-function P(c) {
+function M(c) {
   return !!c && Number.isFinite(c.x) && Number.isFinite(c.y) && Number.isFinite(c.z);
 }
-function I(c) {
+function j(c) {
   return !isFinite(c) || isNaN(c) ? "0.00 m" : c >= 1e3 ? `${(c / 1e3).toFixed(2)} km` : `${c.toFixed(2)} m`;
 }
-function z(c) {
+function R(c) {
   return !isFinite(c) || isNaN(c) ? "0.00 m²" : c >= 1 ? `${c.toFixed(2)} km²` : `${(c * 1e6).toFixed(2)} m²`;
 }
-function H(c, e) {
+function W(c, e) {
   const t = n.Cartographic.fromCartesian(c), i = n.Cartographic.fromCartesian(e), r = Math.min(t.longitude, i.longitude), o = Math.max(t.longitude, i.longitude), s = Math.min(t.latitude, i.latitude), a = Math.max(t.latitude, i.latitude);
   return new n.Rectangle(r, s, o, a);
 }
@@ -276,14 +292,14 @@ function q(c) {
   );
   return o * s / 1e6;
 }
-function R(c, e = n.Ellipsoid.WGS84) {
-  const t = c.filter((o) => P(o));
+function H(c, e = n.Ellipsoid.WGS84) {
+  const t = c.filter((o) => M(o));
   if (t.length < 3) return 0;
   let i = 0;
   const r = t.length;
   for (let o = 0; o < r; o++) {
     const s = t[o], a = t[(o + 1) % r];
-    if (!P(s) || !P(a))
+    if (!M(s) || !M(a))
       return 0;
     const l = e.cartesianToCartographic(s), h = e.cartesianToCartographic(a);
     if (!l || !h || !Number.isFinite(l.longitude) || !Number.isFinite(l.latitude) || !Number.isFinite(h.longitude) || !Number.isFinite(h.latitude))
@@ -293,7 +309,7 @@ function R(c, e = n.Ellipsoid.WGS84) {
   return i = Math.abs(i * 6378137 * 6378137 / 2), i / 1e6;
 }
 function J(c) {
-  const e = c.filter((o) => P(o));
+  const e = c.filter((o) => M(o));
   if (e.length === 0) return n.Cartesian3.ZERO;
   let t = 0, i = 0, r = 0;
   for (let o = 0; o < e.length; o++)
@@ -354,7 +370,7 @@ class V extends L {
   finishDrawing() {
     if (this.tempPositions.length < 2)
       return this.restoreRequestRenderModeIfNeeded(), null;
-    const e = this.tempPositions.filter((l) => P(l));
+    const e = this.tempPositions.filter((l) => M(l));
     if (e.length < 2)
       return this.restoreRequestRenderModeIfNeeded(), null;
     const t = e.map((l) => {
@@ -474,15 +490,15 @@ class V extends L {
           h.latitude,
           (h.height || 0) + this.offsetHeight
         ));
-        const m = r % 2 === 0 ? -25 : 25, w = I(a);
+        const m = r % 2 === 0 ? -25 : 25, b = j(a);
         if (r < this.currentSegmentLabels.length && this.currentSegmentLabels[r].billboard) {
           const g = this.currentSegmentLabels[r];
-          if (g.position = new n.ConstantPositionProperty(u), g.billboard.pixelOffset = new n.ConstantProperty(new n.Cartesian2(0, m)), g._groundPosition = d, g._segmentText !== w) {
-            const f = this.createSegmentLengthBillboardImage(w);
-            g.billboard.image = new n.ConstantProperty(f), g._segmentText = w;
+          if (g.position = new n.ConstantPositionProperty(u), g.billboard.pixelOffset = new n.ConstantProperty(new n.Cartesian2(0, m)), g._groundPosition = d, g._segmentText !== b) {
+            const f = this.createSegmentLengthBillboardImage(b);
+            g.billboard.image = new n.ConstantProperty(f), g._segmentText = b;
           }
         } else {
-          const g = this.createSegmentLengthBillboardImage(w), p = this.entities.add({
+          const g = this.createSegmentLengthBillboardImage(b), w = this.entities.add({
             position: u,
             billboard: {
               image: g,
@@ -496,7 +512,7 @@ class V extends L {
               disableDepthTestDistance: new n.ConstantProperty(Number.POSITIVE_INFINITY)
             }
           });
-          p._segmentText = w, p._groundPosition = d, this.currentSegmentLabels.push(p), this.tempLabelEntities.push(p);
+          w._segmentText = b, w._groundPosition = d, this.currentSegmentLabels.push(w), this.tempLabelEntities.push(w);
         }
       } else if (r < this.currentSegmentLabels.length) {
         const l = this.currentSegmentLabels[r];
@@ -531,7 +547,7 @@ class V extends L {
         i.latitude,
         (i.height || 0) + this.offsetHeight
       ));
-      const a = `总长: ${I(e)}`, l = this.createTotalLengthBillboardImage(a);
+      const a = `总长: ${j(e)}`, l = this.createTotalLengthBillboardImage(a);
       if (this.currentTotalLabel && this.currentTotalLabel.billboard)
         this.currentTotalLabel.position = new n.ConstantPositionProperty(o), this.currentTotalLabel.billboard.image = new n.ConstantProperty(l), this.currentTotalLabel._groundPosition = r;
       else {
@@ -616,9 +632,15 @@ class K extends L {
   updateDrawingEntity(e) {
     if (this.scene.mode === n.SceneMode.SCENE3D && !this.scene.globe.tilesLoaded)
       return;
-    const i = this.tempPositions.filter((o) => P(o)), r = e && P(e) && i.length >= 2 ? [...i, e] : i;
+    const i = this.tempPositions.filter((o) => M(o)), r = e && M(e) && i.length >= 2 ? [...i, e] : i;
     if (r.length >= 3) {
-      const o = r.map((g) => n.Cartographic.fromCartesian(g)).filter((g) => g && Number.isFinite(g.longitude) && Number.isFinite(g.latitude));
+      const o = r.map((g) => {
+        try {
+          return n.Cartographic.fromCartesian(g);
+        } catch {
+          return null;
+        }
+      }).filter((g) => g && Number.isFinite(g.longitude) && Number.isFinite(g.latitude));
       if (o.length < 3) {
         if (this.currentPolygonEntity) {
           this.entities.remove(this.currentPolygonEntity);
@@ -633,21 +655,21 @@ class K extends L {
         return;
       }
       const s = o.map((g) => {
-        const p = g.height || 0, f = this.offsetHeight > 0 ? this.offsetHeight : 0.1;
+        const w = g.height || 0, f = this.offsetHeight > 0 ? this.offsetHeight : 0.1;
         return n.Cartesian3.fromRadians(
           g.longitude,
           g.latitude,
-          p + f
+          w + f
         );
       }), a = n.HeightReference.NONE, l = this.drawOptions?.fillColor ? this.resolveColor(this.drawOptions.fillColor) : n.Color.LIGHTGREEN.withAlpha(0.3), h = this.drawOptions?.strokeColor ? this.resolveColor(this.drawOptions.strokeColor) : this.drawOptions?.outlineColor ? this.resolveColor(this.drawOptions.outlineColor) : n.Color.LIGHTGREEN, d = this.drawOptions?.strokeWidth ?? this.drawOptions?.outlineWidth ?? 2, u = this.tempEntities.filter((g) => !!g?.polygon), m = this.tempEntities.filter((g) => {
-        const p = g;
-        return !!p?.polyline && !p?.point && !p?.polygon;
+        const w = g;
+        return !!w?.polyline && !w?.point && !w?.polygon;
       });
       (u.length > 1 || m.length > 1) && ([...u, ...m].forEach((g) => {
         this.entities.remove(g);
       }), this.tempEntities = this.tempEntities.filter((g) => {
-        const p = g;
-        return p?.point ? !0 : !(p?.polygon || p?.polyline && !p?.polygon);
+        const w = g;
+        return w?.point ? !0 : !(w?.polygon || w?.polyline && !w?.polygon);
       }), this.currentPolygonEntity = null, this.currentBorderEntity = null), this.currentPolygonEntity && this.tempEntities.indexOf(this.currentPolygonEntity) === -1 && (this.currentPolygonEntity = null), this.currentBorderEntity && this.tempEntities.indexOf(this.currentBorderEntity) === -1 && (this.currentBorderEntity = null), this.currentPolygonEntity ? (this.currentPolygonEntity.polygon.hierarchy = new n.ConstantProperty(
         new n.PolygonHierarchy(s)
       ), this.currentPolygonEntity.polygon.heightReference = new n.ConstantProperty(a), this.currentPolygonEntity.polygon.material = new n.ColorMaterialProperty(l), this.currentPolygonEntity.polygon.outline = new n.ConstantProperty(!1)) : (this.currentPolygonEntity = this.entities.add({
@@ -658,10 +680,10 @@ class K extends L {
           heightReference: a
         }
       }), this.tempEntities.push(this.currentPolygonEntity));
-      const w = s.slice();
-      w.length >= 2 && w.push(s[0]), this.currentBorderEntity && this.currentBorderEntity.polyline ? (this.currentBorderEntity.polyline.positions = new n.ConstantProperty(w), this.currentBorderEntity.polyline.width = new n.ConstantProperty(d), this.currentBorderEntity.polyline.material = new n.ColorMaterialProperty(h), this.currentBorderEntity.polyline.clampToGround = new n.ConstantProperty(!1)) : (this.currentBorderEntity = this.entities.add({
+      const b = s.slice();
+      b.length >= 2 && b.push(s[0]), this.currentBorderEntity && this.currentBorderEntity.polyline ? (this.currentBorderEntity.polyline.positions = new n.ConstantProperty(b), this.currentBorderEntity.polyline.width = new n.ConstantProperty(d), this.currentBorderEntity.polyline.material = new n.ColorMaterialProperty(h), this.currentBorderEntity.polyline.clampToGround = new n.ConstantProperty(!1)) : (this.currentBorderEntity = this.entities.add({
         polyline: {
-          positions: new n.ConstantProperty(w),
+          positions: new n.ConstantProperty(b),
           width: d,
           material: new n.ColorMaterialProperty(h),
           clampToGround: !1
@@ -684,10 +706,16 @@ class K extends L {
    * 完成绘制
    */
   finishDrawing() {
-    const e = this.tempPositions.filter((u) => P(u));
+    const e = this.tempPositions.filter((u) => M(u));
     if (e.length < 3)
       return this.restoreRequestRenderModeIfNeeded(), null;
-    const t = e.map((u) => n.Cartographic.fromCartesian(u)).filter((u) => u && Number.isFinite(u.longitude) && Number.isFinite(u.latitude));
+    const t = e.map((u) => {
+      try {
+        return n.Cartographic.fromCartesian(u);
+      } catch {
+        return null;
+      }
+    }).filter((u) => u && Number.isFinite(u.longitude) && Number.isFinite(u.latitude));
     if (t.length < 3)
       return this.restoreRequestRenderModeIfNeeded(), null;
     const i = t.map(
@@ -696,8 +724,8 @@ class K extends L {
     let r = null, o = null;
     const s = this.drawOptions?.fillColor ? this.resolveColor(this.drawOptions.fillColor) : n.Color.LIGHTGREEN.withAlpha(0.3), a = this.drawOptions?.strokeColor ? this.resolveColor(this.drawOptions.strokeColor) : this.drawOptions?.outlineColor ? this.resolveColor(this.drawOptions.outlineColor) : n.Color.LIGHTGREEN, l = this.drawOptions?.strokeWidth ?? this.drawOptions?.outlineWidth ?? 2;
     if (this.offsetHeight > 0) {
-      const u = i.map((w) => {
-        const g = n.Cartographic.fromCartesian(w);
+      const u = i.map((b) => {
+        const g = n.Cartographic.fromCartesian(b);
         return n.Cartesian3.fromRadians(
           g.longitude,
           g.latitude,
@@ -742,20 +770,20 @@ class K extends L {
         }
       }), r._groundPositions = i, r && (r._drawOptions = this.drawOptions, r._drawType = this.getDrawType(), this.drawOptions?.onClick && (r._onClick = this.drawOptions.onClick), o && (r._borderEntity = o));
     }
-    const h = R(i, this.scene.globe.ellipsoid);
-    if (h > 0) {
-      const u = J(i), m = n.Cartographic.fromCartesian(u), w = n.Cartesian3.fromRadians(
+    const h = H(i, this.scene.globe.ellipsoid);
+    if (h > 0 && this.drawOptions?.showAreaLabel !== !1) {
+      const u = J(i), m = n.Cartographic.fromCartesian(u), b = n.Cartesian3.fromRadians(
         m.longitude,
         m.latitude,
         m.height || 0
       );
-      let g = w;
+      let g = b;
       this.offsetHeight > 0 && (g = n.Cartesian3.fromRadians(
         m.longitude,
         m.latitude,
         (m.height || 0) + this.offsetHeight
       ));
-      const p = `面积: ${z(h)}`, f = this.createTotalLengthBillboardImage(p), b = this.entities.add({
+      const w = `面积: ${R(h)}`, f = this.createTotalLengthBillboardImage(w), p = this.entities.add({
         position: g,
         billboard: {
           image: f,
@@ -769,7 +797,9 @@ class K extends L {
           disableDepthTestDistance: new n.ConstantProperty(Number.POSITIVE_INFINITY)
         }
       });
-      b._groundPosition = w, this.tempLabelEntities.push(b);
+      p._groundPosition = b, p._ownerEntityId = r.id;
+      const C = r;
+      C._labelEntities = [...C._labelEntities || [], p], this.tempLabelEntities.push(p);
     }
     this.tempEntities.forEach((u) => {
       u && this.entities.remove(u);
@@ -778,7 +808,7 @@ class K extends L {
       entity: r,
       type: "polygon",
       positions: i,
-      areaKm2: R(i, this.scene.globe.ellipsoid)
+      areaKm2: H(i, this.scene.globe.ellipsoid)
     };
     return this.callbacks.onMeasureComplete && this.callbacks.onMeasureComplete(d), this.restoreRequestRenderModeIfNeeded(), this.callbacks.onDrawEnd && this.callbacks.onDrawEnd(r, d), d;
   }
@@ -825,7 +855,7 @@ class _ extends L {
       }
       return;
     }
-    const i = H(t[0], t[1]), r = n.HeightReference.NONE, o = this.drawOptions?.fillColor ? this.resolveColor(this.drawOptions.fillColor) : n.Color.GREEN, s = this.drawOptions?.strokeColor ? this.resolveColor(this.drawOptions.strokeColor) : this.drawOptions?.outlineColor ? this.resolveColor(this.drawOptions.outlineColor) : n.Color.DARKGREEN, a = this.drawOptions?.strokeWidth ?? this.drawOptions?.outlineWidth ?? 1;
+    const i = W(t[0], t[1]), r = n.HeightReference.NONE, o = this.drawOptions?.fillColor ? this.resolveColor(this.drawOptions.fillColor) : n.Color.GREEN, s = this.drawOptions?.strokeColor ? this.resolveColor(this.drawOptions.strokeColor) : this.drawOptions?.outlineColor ? this.resolveColor(this.drawOptions.outlineColor) : n.Color.DARKGREEN, a = this.drawOptions?.strokeWidth ?? this.drawOptions?.outlineWidth ?? 1;
     this.currentRectangleEntity && !this.entities.contains(this.currentRectangleEntity) && (this.currentRectangleEntity = null), this.currentRectangleEntity ? (this.currentRectangleEntity.rectangle.coordinates = new n.ConstantProperty(i), this.currentRectangleEntity.rectangle.heightReference = new n.ConstantProperty(r), this.currentRectangleEntity.rectangle.extrudedHeight = this.offsetHeight > 0 ? new n.ConstantProperty(this.offsetHeight) : void 0, this.currentRectangleEntity.rectangle.material = new n.ColorMaterialProperty(o.withAlpha(0.5)), this.currentRectangleEntity.rectangle.outlineColor = new n.ConstantProperty(s), this.currentRectangleEntity.rectangle.outlineWidth = new n.ConstantProperty(a)) : (this.currentRectangleEntity = this.entities.add({
       rectangle: {
         coordinates: i,
@@ -844,17 +874,17 @@ class _ extends L {
   finishDrawing() {
     if (this.tempPositions.length < 2)
       return this.restoreRequestRenderModeIfNeeded(), null;
-    const e = this.tempPositions.filter((m) => P(m));
+    const e = this.tempPositions.filter((m) => M(m));
     if (e.length < 2)
       return this.restoreRequestRenderModeIfNeeded(), null;
     const t = e.map((m) => {
-      const w = n.Cartographic.fromCartesian(m);
+      const b = n.Cartographic.fromCartesian(m);
       return n.Cartesian3.fromRadians(
-        w.longitude,
-        w.latitude,
-        w.height || 0
+        b.longitude,
+        b.latitude,
+        b.height || 0
       );
-    }), i = H(t[0], t[1]);
+    }), i = W(t[0], t[1]);
     let r = null;
     const o = this.drawOptions?.fillColor ? this.resolveColor(this.drawOptions.fillColor) : n.Color.GREEN, s = this.drawOptions?.strokeColor ? this.resolveColor(this.drawOptions.strokeColor) : this.drawOptions?.outlineColor ? this.resolveColor(this.drawOptions.outlineColor) : n.Color.DARKGREEN, a = this.drawOptions?.strokeWidth ?? this.drawOptions?.outlineWidth ?? 1;
     this.offsetHeight > 0 ? (r = this.entities.add({
@@ -880,19 +910,19 @@ class _ extends L {
       }
     }), r._groundRectangle = i), r && (r._drawOptions = this.drawOptions, r._drawType = this.getDrawType(), this.drawOptions?.onClick && (r._onClick = this.drawOptions.onClick));
     const l = q(i);
-    if (l > 0) {
-      const m = n.Rectangle.center(i), w = n.Cartesian3.fromRadians(
+    if (l > 0 && this.drawOptions?.showAreaLabel !== !1) {
+      const m = n.Rectangle.center(i), b = n.Cartesian3.fromRadians(
         m.longitude,
         m.latitude,
         0
       );
-      let g = w;
+      let g = b;
       this.offsetHeight > 0 && (g = n.Cartesian3.fromRadians(
         m.longitude,
         m.latitude,
         this.offsetHeight
       ));
-      const p = `面积: ${z(l)}`, f = this.createTotalLengthBillboardImage(p), b = this.entities.add({
+      const w = `面积: ${R(l)}`, f = this.createTotalLengthBillboardImage(w), p = this.entities.add({
         position: g,
         billboard: {
           image: f,
@@ -906,15 +936,17 @@ class _ extends L {
           disableDepthTestDistance: new n.ConstantProperty(Number.POSITIVE_INFINITY)
         }
       });
-      b._groundPosition = w, this.tempLabelEntities.push(b);
+      p._groundPosition = b, p._ownerEntityId = r.id;
+      const C = r;
+      C._labelEntities = [...C._labelEntities || [], p], this.tempLabelEntities.push(p);
     }
     this.tempEntities.forEach((m) => {
       m && this.entities.remove(m);
     }), this.tempEntities = [], this.tempPositions = [], this.currentRectangleEntity = null, this.originalDepthTestAgainstTerrain !== null && (this.scene.globe.depthTestAgainstTerrain = this.originalDepthTestAgainstTerrain, this.originalDepthTestAgainstTerrain = null);
     const h = n.Rectangle.subsample(i, this.scene.globe.ellipsoid), d = (() => {
       if (h.length > 1) {
-        const m = h[0], w = h[h.length - 1];
-        if (n.Cartesian3.equalsEpsilon(m, w, n.Math.EPSILON9))
+        const m = h[0], b = h[h.length - 1];
+        if (n.Cartesian3.equalsEpsilon(m, b, n.Math.EPSILON9))
           return h.slice(0, h.length - 1);
       }
       return h;
@@ -992,7 +1024,7 @@ class $ extends L {
         heightReference: n.HeightReference.NONE
       }
     }), this.tempEntities.push(this.currentCircleEntity)), d > 1) {
-      const u = n.Cartographic.fromCartesian(s), m = u.height || 0, w = 0.1, g = i, p = this.generateCirclePositions(u, g, m + w), f = [...p, p[0]];
+      const u = n.Cartographic.fromCartesian(s), m = u.height || 0, b = 0.1, g = i, w = this.generateCirclePositions(u, g, m + b), f = [...w, w[0]];
       this.currentBorderEntity && this.currentBorderEntity.polyline ? (this.currentBorderEntity.polyline.positions = new n.ConstantProperty(f), this.currentBorderEntity.polyline.material = new n.ColorMaterialProperty(h), this.currentBorderEntity.polyline.width = new n.ConstantProperty(d), this.currentBorderEntity.polyline.clampToGround = new n.ConstantProperty(!1)) : (this.currentBorderEntity = this.entities.add({
         polyline: {
           positions: f,
@@ -1025,8 +1057,8 @@ class $ extends L {
     else if (this.currentCircleEntity) {
       const f = this.currentCircleEntity.ellipse;
       if (f) {
-        const b = f.semiMajorAxis?.getValue(n.JulianDate.now());
-        r = typeof b == "number" ? b : 0;
+        const p = f.semiMajorAxis?.getValue(n.JulianDate.now());
+        r = typeof p == "number" ? p : 0;
       }
     }
     if (r < 1)
@@ -1050,7 +1082,7 @@ class $ extends L {
           heightReference: n.HeightReference.NONE
         }
       });
-      const f = n.Cartographic.fromCartesian(s), b = f.height || 0, C = 0.1, v = r, y = this.generateCirclePositions(f, v, b + C), x = [...y, y[0]], G = this.entities.add({
+      const f = n.Cartographic.fromCartesian(s), p = f.height || 0, C = 0.1, v = r, y = this.generateCirclePositions(f, v, p + C), x = [...y, y[0]], G = this.entities.add({
         name: "绘制的圆-边框",
         polyline: {
           positions: x,
@@ -1076,11 +1108,11 @@ class $ extends L {
       });
     o._groundPosition = i, o._radius = r, o && (o._drawOptions = this.drawOptions, o._drawType = this.getDrawType(), this.drawOptions?.onClick && (o._onClick = this.drawOptions.onClick));
     const d = Math.PI * r * r / 1e6;
-    if (d > 0) {
-      const f = `面积: ${z(d)}`, b = this.createTotalLengthBillboardImage(f), C = this.entities.add({
+    if (d > 0 && this.drawOptions?.showAreaLabel !== !1) {
+      const f = `面积: ${R(d)}`, p = this.createTotalLengthBillboardImage(f), C = this.entities.add({
         position: s,
         billboard: {
-          image: b,
+          image: p,
           pixelOffset: new n.ConstantProperty(new n.Cartesian2(0, -25)),
           heightReference: new n.ConstantProperty(
             this.offsetHeight > 0 ? n.HeightReference.RELATIVE_TO_GROUND : n.HeightReference.NONE
@@ -1091,9 +1123,11 @@ class $ extends L {
           disableDepthTestDistance: new n.ConstantProperty(Number.POSITIVE_INFINITY)
         }
       });
-      C._groundPosition = i, this.tempLabelEntities.push(C);
+      C._groundPosition = i, C._ownerEntityId = o.id;
+      const v = o;
+      v._labelEntities = [...v._labelEntities || [], C], this.tempLabelEntities.push(C);
     }
-    this.tempEntities.forEach((f, b) => {
+    this.tempEntities.forEach((f, p) => {
       f && this.entities.remove(f);
     }), this.tempEntities = [], this.tempPositions = [], this.currentCircleEntity = null, this.currentBorderEntity = null, this.centerPosition = null, this.originalDepthTestAgainstTerrain !== null && (this.scene.globe.depthTestAgainstTerrain = this.originalDepthTestAgainstTerrain, this.originalDepthTestAgainstTerrain = null);
     const u = r / this.scene.globe.ellipsoid.maximumRadius, m = new n.Rectangle(
@@ -1101,20 +1135,20 @@ class $ extends L {
       t.latitude - u,
       t.longitude + u,
       t.latitude + u
-    ), w = n.Rectangle.subsample(m, this.scene.globe.ellipsoid), g = (() => {
-      if (w.length > 1) {
-        const f = w[0], b = w[w.length - 1];
-        if (n.Cartesian3.equalsEpsilon(f, b, n.Math.EPSILON9))
-          return w.slice(0, w.length - 1);
+    ), b = n.Rectangle.subsample(m, this.scene.globe.ellipsoid), g = (() => {
+      if (b.length > 1) {
+        const f = b[0], p = b[b.length - 1];
+        if (n.Cartesian3.equalsEpsilon(f, p, n.Math.EPSILON9))
+          return b.slice(0, b.length - 1);
       }
-      return w;
-    })(), p = {
+      return b;
+    })(), w = {
       entity: o,
       type: "circle",
       positions: g,
       areaKm2: d
     };
-    return this.callbacks.onMeasureComplete && this.callbacks.onMeasureComplete(p), this.restoreRequestRenderModeIfNeeded(), this.callbacks.onDrawEnd && this.callbacks.onDrawEnd(o, p), p;
+    return this.callbacks.onMeasureComplete && this.callbacks.onMeasureComplete(w), this.restoreRequestRenderModeIfNeeded(), this.callbacks.onDrawEnd && this.callbacks.onDrawEnd(o, w), w;
   }
   /**
    * 获取绘制类型
@@ -1128,7 +1162,7 @@ class $ extends L {
   generateCirclePositions(e, t, i, r = 128) {
     const s = e.latitude, a = e.longitude, l = t / 6378137, h = [];
     for (let d = 0; d < r; d++) {
-      const u = d / r * n.Math.TWO_PI, m = Math.sin(s), w = Math.cos(s), g = Math.sin(l), p = Math.cos(l), f = Math.sin(u), b = Math.cos(u), C = Math.asin(m * p + w * g * b), v = a + Math.atan2(f * g * w, p - m * Math.sin(C));
+      const u = d / r * n.Math.TWO_PI, m = Math.sin(s), b = Math.cos(s), g = Math.sin(l), w = Math.cos(l), f = Math.sin(u), p = Math.cos(u), C = Math.asin(m * w + b * g * p), v = a + Math.atan2(f * g * b, w - m * Math.sin(C));
       h.push(n.Cartesian3.fromRadians(v, C, i));
     }
     return h;
@@ -1158,6 +1192,10 @@ class D {
   // 双击判断
   // 最近一次鼠标移动位置，用于在右键删点后立即重绘预览
   lastPreviewPosition = null;
+  // 绘制步骤提示（跟随鼠标的提示 Label）
+  drawHintEntity = null;
+  drawHintText = "";
+  drawHintLastPosition = null;
   // 静态：当前处于绘制状态的 DrawHelper，用于跨实例互斥
   static activeDrawingHelper = null;
   // 绘制类实例
@@ -1219,7 +1257,7 @@ class D {
         } catch (d) {
           console.warn("entity onClick handler error", d);
         }
-        s._drawOptions?.selected && j(s);
+        s._drawOptions?.selected && I(s);
       }, n.ScreenSpaceEventType.LEFT_CLICK);
     } catch (i) {
       console.warn("entity click handler init failed", i);
@@ -1230,7 +1268,7 @@ class D {
    */
   handleSceneModeChanged() {
     const e = this.offsetHeight;
-    this.updateOffsetHeight(), e !== this.offsetHeight && this.updateFinishedEntitiesForModeChange();
+    this.updateOffsetHeight(), e !== this.offsetHeight && this.updateFinishedEntitiesForModeChange(), this.isDrawing && this.drawHintLastPosition && this.updateDrawHintPosition(this.drawHintLastPosition);
   }
   /**
    * 根据场景模式更新偏移高度
@@ -1238,6 +1276,97 @@ class D {
   updateOffsetHeight() {
     this.scene.mode === n.SceneMode.SCENE3D ? this.offsetHeight = 1 : this.offsetHeight = 0;
   }
+  /**
+   * 计算提示文本（随绘制模式 + 点数量变化）
+   */
+  getDrawHintText() {
+    if (!this.isDrawing || !this.drawMode)
+      return "";
+    const e = this.tempPositions.length;
+    switch (this.drawMode) {
+      case "circle":
+        return e === 0 ? "单击确定圆心" : e === 1 ? "移动鼠标确定半径，单击确定半径点，双击完成，右键撤销" : "双击完成，右键撤销";
+      case "rectangle":
+        return e === 0 ? "单击确定起点" : e === 1 ? "移动鼠标确定终点，单击确定终点，双击完成，右键撤销" : "双击完成，右键撤销";
+      case "polygon":
+        return e === 0 ? "单击开始绘制" : "单击继续添加点，双击完成，右键删除最后一点";
+      case "line":
+        return e === 0 ? "单击开始绘制" : "单击继续添加点，双击完成，右键删除最后一点";
+      default:
+        return "";
+    }
+  }
+  /**
+   * 将提示位置转换为显示位置（按当前模式做轻微抬高，避免被地形遮挡）
+   */
+  toHintDisplayPosition(e) {
+    try {
+      const t = n.Cartographic.fromCartesian(e), i = t.height || 0, r = this.offsetHeight > 0 ? this.offsetHeight : 0.1;
+      return n.Cartesian3.fromRadians(
+        t.longitude,
+        t.latitude,
+        i + r
+      );
+    } catch {
+      return e;
+    }
+  }
+  /**
+   * 创建或更新提示实体的位置与文本
+   */
+  updateDrawHintPosition(e) {
+    if (!this.isDrawing) return;
+    const t = this.getDrawHintText();
+    if (!t) {
+      this.clearDrawHint();
+      return;
+    }
+    this.drawHintText = t, this.drawHintLastPosition = e.clone();
+    const i = this.toHintDisplayPosition(e);
+    this.drawHintEntity ? (this.drawHintEntity.position = new n.ConstantPositionProperty(i), this.drawHintEntity.label && (this.drawHintEntity.label.text = new n.ConstantProperty(this.drawHintText))) : this.drawHintEntity = this.entities.add({
+      position: new n.ConstantPositionProperty(i),
+      label: {
+        text: this.drawHintText,
+        font: "14px 'Microsoft YaHei', 'PingFang SC', sans-serif",
+        showBackground: !0,
+        backgroundColor: n.Color.BLACK.withAlpha(0.75),
+        fillColor: n.Color.WHITE,
+        outlineColor: n.Color.BLACK,
+        outlineWidth: 2,
+        style: n.LabelStyle.FILL_AND_OUTLINE,
+        pixelOffset: new n.Cartesian2(12, -18),
+        horizontalOrigin: n.HorizontalOrigin.LEFT,
+        verticalOrigin: n.VerticalOrigin.TOP,
+        disableDepthTestDistance: Number.POSITIVE_INFINITY,
+        heightReference: n.HeightReference.NONE,
+        scaleByDistance: new n.NearFarScalar(150, 1, 15e6, 0.6)
+      }
+    });
+  }
+  /**
+   * 更新提示文本（不改变位置；通常在点数变化时调用）
+   */
+  refreshDrawHintTextOnly() {
+    const e = this.getDrawHintText();
+    if (this.drawHintText = e, !e) {
+      this.clearDrawHint();
+      return;
+    }
+    this.drawHintEntity?.label && (this.drawHintEntity.label.text = new n.ConstantProperty(e));
+  }
+  /**
+   * 清除绘制提示实体
+   */
+  clearDrawHint() {
+    if (this.drawHintEntity) {
+      try {
+        this.entities.remove(this.drawHintEntity);
+      } catch {
+      }
+      this.drawHintEntity = null;
+    }
+    this.drawHintText = "", this.drawHintLastPosition = null;
+  }
   /**
    * 开始绘制线条
    */
@@ -1268,7 +1397,7 @@ class D {
    */
   startDrawing(e, t) {
     const i = D.activeDrawingHelper;
-    switch (i && i !== this && i.cancelDrawing(), this.endDrawingInternal(!1), this.drawMode = e, this.isDrawing = !0, this.lastPreviewPosition = null, D.activeDrawingHelper = this, this.tempPositions = [], this.tempEntities = [], this._doubleClickPending = !1, e) {
+    switch (i && i !== this && i.cancelDrawing(), this.endDrawingInternal(!1), this.clearDrawHint(), this.drawMode = e, this.isDrawing = !0, this.lastPreviewPosition = null, D.activeDrawingHelper = this, this.tempPositions = [], this.tempEntities = [], this._doubleClickPending = !1, e) {
       case "line":
         this.currentDrawer = this.drawLine;
         break;
@@ -1282,7 +1411,7 @@ class D {
         this.currentDrawer = this.drawCircle;
         break;
     }
-    this.currentDrawer && this.currentDrawer.startDrawing(t), this.activateDrawingHandlers();
+    this.currentDrawer && this.currentDrawer.startDrawing(t), this.refreshDrawHintTextOnly(), this.activateDrawingHandlers();
   }
   /**
    * 激活屏幕空间事件处理器
@@ -1298,16 +1427,16 @@ class D {
           return;
         }
         const i = this.pickGlobePosition(t.position);
-        i && this.addPoint(i);
+        i && (this.updateDrawHintPosition(i), this.addPoint(i));
       },
       n.ScreenSpaceEventType.LEFT_CLICK
     ), this.screenSpaceEventHandler.setInputAction(() => {
       !this.isDrawing || this.tempPositions.length === 0 || this.removeLastPoint();
     }, n.ScreenSpaceEventType.RIGHT_CLICK), this.screenSpaceEventHandler.setInputAction(
       (t) => {
-        if (!this.isDrawing || this.tempPositions.length === 0) return;
+        if (!this.isDrawing) return;
         const i = this.pickGlobePosition(t.endPosition);
-        i && this.updatePreview(i);
+        i && (this.updateDrawHintPosition(i), this.tempPositions.length > 0 && this.updatePreview(i));
       },
       n.ScreenSpaceEventType.MOUSE_MOVE
     );
@@ -1337,24 +1466,31 @@ class D {
    * @returns 世界坐标 Cartesian3 或 null
    */
   pickGlobePosition(e) {
-    const t = this.viewer.camera.getPickRay(e);
-    if (t && this.scene.mode === n.SceneMode.SCENE3D && this.scene.globe.tilesLoaded) {
-      const r = this.scene.globe.pick(t, this.scene);
-      if (n.defined(r) && Number.isFinite(r.x) && Number.isFinite(r.y) && Number.isFinite(r.z))
-        return r;
+    const t = e;
+    if (!t || !Number.isFinite(t.x) || !Number.isFinite(t.y))
+      return null;
+    try {
+      const i = this.viewer.camera.getPickRay(e);
+      if (i && this.scene.mode === n.SceneMode.SCENE3D && this.scene.globe.tilesLoaded) {
+        const o = this.scene.globe.pick(i, this.scene);
+        if (n.defined(o) && Number.isFinite(o.x) && Number.isFinite(o.y) && Number.isFinite(o.z))
+          return o.clone();
+      }
+      const r = this.viewer.camera.pickEllipsoid(
+        e,
+        this.scene.globe.ellipsoid
+      );
+      return r && Number.isFinite(r.x) && Number.isFinite(r.y) && Number.isFinite(r.z) ? r.clone() : null;
+    } catch {
+      return null;
     }
-    const i = this.viewer.camera.pickEllipsoid(
-      e,
-      this.scene.globe.ellipsoid
-    );
-    return i && Number.isFinite(i.x) && Number.isFinite(i.y) && Number.isFinite(i.z) ? i : null;
   }
   /**
    * 添加一个点到临时位置数组并创建点实体
    * @param position 世界坐标
    */
   addPoint(e) {
-    this.drawMode === "polygon" && this.scene.mode === n.SceneMode.SCENE3D && !this.scene.globe.tilesLoaded || this.currentDrawer && (this.currentDrawer.addPointForHelper(e), this.tempPositions = this.currentDrawer.getTempPositions(), this.tempEntities = this.currentDrawer.getTempEntities(), this.updateDrawingEntity());
+    this.drawMode === "polygon" && this.scene.mode === n.SceneMode.SCENE3D && !this.scene.globe.tilesLoaded || this.currentDrawer && (this.currentDrawer.addPointForHelper(e), this.tempPositions = this.currentDrawer.getTempPositions(), this.tempEntities = this.currentDrawer.getTempEntities(), this.updateDrawingEntity(), this.refreshDrawHintTextOnly());
   }
   /**
    * 删除最后一个添加的点及其相关的临时实体
@@ -1363,7 +1499,7 @@ class D {
     if (!this.currentDrawer)
       return;
     const e = this.currentDrawer.getTempPositions();
-    !e || e.length === 0 || (this.currentDrawer.removeLastPointAndRedraw(), this.tempPositions = this.currentDrawer.getTempPositions(), this.tempEntities = this.currentDrawer.getTempEntities(), this.tempLabelEntities = this.currentDrawer.getTempLabelEntities(), this.lastPreviewPosition && this.isDrawing && this.updateDrawingEntity(this.lastPreviewPosition));
+    !e || e.length === 0 || (this.currentDrawer.removeLastPointAndRedraw(), this.tempPositions = this.currentDrawer.getTempPositions(), this.tempEntities = this.currentDrawer.getTempEntities(), this.tempLabelEntities = this.currentDrawer.getTempLabelEntities(), this.lastPreviewPosition && this.isDrawing && this.updateDrawingEntity(this.lastPreviewPosition), this.refreshDrawHintTextOnly());
   }
   /**
    * 更新预览线/面
@@ -1398,7 +1534,7 @@ class D {
     }
     e && e.entity && this.finishedEntities.push(e.entity), this.tempPositions = this.currentDrawer.getTempPositions(), this.tempEntities = this.currentDrawer.getTempEntities(), this.tempLabelEntities = this.currentDrawer.getTempLabelEntities(), this.finishedPointEntities = this.currentDrawer.getFinishedPointEntities(), this.tempLabelEntities.forEach((t) => {
       this.finishedLabelEntities.push(t);
-    }), this.tempLabelEntities = [], this.drawMode = null, this.isDrawing = !1, this.lastPreviewPosition = null, this.currentDrawer = null, this.deactivateDrawingHandlers(), D.activeDrawingHelper === this && (D.activeDrawingHelper = null);
+    }), this.tempLabelEntities = [], this.drawMode = null, this.isDrawing = !1, this.lastPreviewPosition = null, this.currentDrawer = null, this.deactivateDrawingHandlers(), this.clearDrawHint(), D.activeDrawingHelper === this && (D.activeDrawingHelper = null);
   }
   /**
    * 内部方法：重置绘图状态和清理临时数据
@@ -1406,7 +1542,7 @@ class D {
    */
   endDrawingInternal(e) {
     if (this.currentDrawer && (this.currentDrawer.clearTempEntitiesForHelper(), this.tempPositions = this.currentDrawer.getTempPositions(), this.tempEntities = this.currentDrawer.getTempEntities(), this.tempLabelEntities = this.currentDrawer.getTempLabelEntities()), this.tempEntities = [], this.tempLabelEntities = [], this.tempPositions = [], e) {
-      this.drawMode = null, this.isDrawing = !1, this.lastPreviewPosition = null, this.currentDrawer = null, this.deactivateDrawingHandlers(), this.originalDepthTestAgainstTerrain !== null && (this.scene.globe.depthTestAgainstTerrain = this.originalDepthTestAgainstTerrain, this.originalDepthTestAgainstTerrain = null);
+      this.drawMode = null, this.isDrawing = !1, this.lastPreviewPosition = null, this.currentDrawer = null, this.deactivateDrawingHandlers(), this.clearDrawHint(), this.originalDepthTestAgainstTerrain !== null && (this.scene.globe.depthTestAgainstTerrain = this.originalDepthTestAgainstTerrain, this.originalDepthTestAgainstTerrain = null);
       try {
         this.currentDrawer && this.currentDrawer.restoreRequestRenderModeIfNeeded && this.currentDrawer.restoreRequestRenderModeIfNeeded();
       } catch {
@@ -1476,10 +1612,36 @@ class D {
   removeEntity(e) {
     const t = this.finishedEntities.indexOf(e);
     if (t > -1) {
-      const i = e._borderEntity;
-      i && this.entities.remove(i), this.entities.remove(e), this.finishedEntities.splice(t, 1), this.onEntityRemovedCallback && this.onEntityRemovedCallback(e);
+      const i = e, r = i._labelEntities;
+      if (r && r.length > 0)
+        r.forEach((s) => {
+          try {
+            s && this.entities.remove(s);
+          } catch {
+          }
+        }), this.finishedLabelEntities = this.finishedLabelEntities.filter((s) => !r.includes(s)), i._labelEntities = [];
+      else {
+        const s = e.id;
+        if (s) {
+          const a = this.finishedLabelEntities.filter((l) => l?._ownerEntityId === s);
+          a.forEach((l) => {
+            try {
+              this.entities.remove(l);
+            } catch {
+            }
+          }), a.length > 0 && (this.finishedLabelEntities = this.finishedLabelEntities.filter((l) => l?._ownerEntityId !== s));
+        }
+      }
+      const o = e._borderEntity;
+      o && this.entities.remove(o), this.entities.remove(e), this.finishedEntities.splice(t, 1), this.onEntityRemovedCallback && this.onEntityRemovedCallback(e);
     }
   }
+  /**
+   * 获取某个绘制实体关联的标签实体（例如面积标签）
+   */
+  getEntityLabelEntities(e) {
+    return [...e?._labelEntities || []];
+  }
   /**
    * 获取所有已完成的实体
    * @returns 实体数组
@@ -1771,22 +1933,22 @@ class te {
       const g = t.globe.pick(h, t);
       n.defined(g) && (l = n.Cartographic.fromCartesian(g));
     }
-    const d = i.positionCartographic.height, u = i.heading, m = i.pitch, w = i.roll;
+    const d = i.positionCartographic.height, u = i.heading, m = i.pitch, b = i.roll;
     if (t.mode = o, this.onSceneModeChanged && this.onSceneModeChanged(), l) {
-      const g = l.longitude, p = l.latitude;
+      const g = l.longitude, w = l.latitude;
       o === n.SceneMode.SCENE2D ? i.setView({
-        destination: n.Cartesian3.fromRadians(g, p, d),
+        destination: n.Cartesian3.fromRadians(g, w, d),
         orientation: {
           heading: 0,
           pitch: -Math.PI / 2,
           roll: 0
         }
       }) : i.setView({
-        destination: n.Cartesian3.fromRadians(g, p, d),
+        destination: n.Cartesian3.fromRadians(g, w, d),
         orientation: {
           heading: u,
           pitch: m,
-          roll: w
+          roll: b
         }
       });
     }
@@ -1943,13 +2105,13 @@ class ae {
     `, r.appendChild(o), r.appendChild(s), this.toolbarElement.insertBefore(r, e), this.searchContainer = r;
     const a = r.getBoundingClientRect(), l = window.innerHeight;
     if (a.bottom > l) {
-      const f = a.bottom - l, b = parseFloat(r.style.top || "0"), C = Math.max(0, b - f);
+      const f = a.bottom - l, p = parseFloat(r.style.top || "0"), C = Math.max(0, p - f);
       r.style.top = `${C}px`;
     }
     const h = r.getBoundingClientRect();
     if (h.top < 0) {
-      const f = -h.top, b = parseFloat(r.style.top || "0");
-      r.style.top = `${b + f}px`;
+      const f = -h.top, p = parseFloat(r.style.top || "0");
+      r.style.top = `${p + f}px`;
     }
     let d;
     o.addEventListener("input", () => {
@@ -1966,42 +2128,42 @@ class ae {
       d = setTimeout(async () => {
         if (this.searchCallback?.onSearch)
           try {
-            const b = await this.searchCallback.onSearch(f);
-            this.displaySearchResults(b, s);
-          } catch (b) {
-            console.error("搜索失败:", b), s.innerHTML = '<div style="padding: 8px; color: #666;">搜索失败</div>';
+            const p = await this.searchCallback.onSearch(f);
+            this.displaySearchResults(p, s);
+          } catch (p) {
+            console.error("搜索失败:", p), s.innerHTML = '<div style="padding: 8px; color: #666;">搜索失败</div>';
           }
         else
           try {
-            const b = await this.performDefaultSearch(f);
-            this.displaySearchResults(b, s);
-          } catch (b) {
-            console.error("默认搜索失败:", b), s.innerHTML = '<div style="padding: 8px; color: #666;">搜索失败</div>';
+            const p = await this.performDefaultSearch(f);
+            this.displaySearchResults(p, s);
+          } catch (p) {
+            console.error("默认搜索失败:", p), s.innerHTML = '<div style="padding: 8px; color: #666;">搜索失败</div>';
           }
       }, 300);
     });
     let u;
     const m = (f) => {
-      const b = f.relatedTarget;
-      if (b && (b.closest(".cesium-toolbar-button") !== null || b.closest(".cesium-map-toolbar") !== null)) {
-        clearTimeout(u), this.closeSearchContainer(), r.removeEventListener("mouseleave", m), r.removeEventListener("mouseenter", w), o.removeEventListener("blur", g);
+      const p = f.relatedTarget;
+      if (p && (p.closest(".cesium-toolbar-button") !== null || p.closest(".cesium-map-toolbar") !== null)) {
+        clearTimeout(u), this.closeSearchContainer(), r.removeEventListener("mouseleave", m), r.removeEventListener("mouseenter", b), o.removeEventListener("blur", g);
         return;
       }
       u = setTimeout(() => {
         const v = r.matches(":hover"), y = e.matches(":hover"), x = this.toolbarElement.matches(":hover"), G = document.activeElement === o;
-        !v && !y && !x && !G && (this.closeSearchContainer(), r.removeEventListener("mouseleave", m), r.removeEventListener("mouseenter", w), o.removeEventListener("blur", g));
+        !v && !y && !x && !G && (this.closeSearchContainer(), r.removeEventListener("mouseleave", m), r.removeEventListener("mouseenter", b), o.removeEventListener("blur", g));
       }, 150);
-    }, w = () => {
+    }, b = () => {
       clearTimeout(u);
     }, g = () => {
       setTimeout(() => {
-        const f = r.matches(":hover"), b = e.matches(":hover"), C = this.toolbarElement.matches(":hover");
-        document.activeElement !== o && !f && !b && !C && (this.closeSearchContainer(), r.removeEventListener("mouseleave", m), r.removeEventListener("mouseenter", w), o.removeEventListener("blur", g));
+        const f = r.matches(":hover"), p = e.matches(":hover"), C = this.toolbarElement.matches(":hover");
+        document.activeElement !== o && !f && !p && !C && (this.closeSearchContainer(), r.removeEventListener("mouseleave", m), r.removeEventListener("mouseenter", b), o.removeEventListener("blur", g));
       }, 200);
-    }, p = (f) => {
-      f.key === "Escape" && (this.closeSearchContainer(), r.removeEventListener("mouseleave", m), r.removeEventListener("mouseenter", w), o.removeEventListener("blur", g), document.removeEventListener("keydown", p));
+    }, w = (f) => {
+      f.key === "Escape" && (this.closeSearchContainer(), r.removeEventListener("mouseleave", m), r.removeEventListener("mouseenter", b), o.removeEventListener("blur", g), document.removeEventListener("keydown", w));
     };
-    r.addEventListener("mouseleave", m), r.addEventListener("mouseenter", w), o.addEventListener("blur", g), document.addEventListener("keydown", p), setTimeout(() => {
+    r.addEventListener("mouseleave", m), r.addEventListener("mouseenter", b), o.addEventListener("blur", g), document.addEventListener("keydown", w), setTimeout(() => {
       o.focus();
     }, 100);
   }
@@ -2366,12 +2528,12 @@ class le {
     }
   }
 }
-const W = {
+const z = {
   basePath: "/geojson",
   silent: !1
 };
 async function ce(c = {}) {
-  const { basePath: e } = { ...W, ...c };
+  const { basePath: e } = { ...z, ...c };
   try {
     const t = await fetch(`${e}/file-list.json`);
     if (t.ok) {
@@ -2384,7 +2546,7 @@ async function ce(c = {}) {
   return [];
 }
 async function he(c, e = {}) {
-  const { basePath: t, silent: i } = { ...W, ...e };
+  const { basePath: t, silent: i } = { ...z, ...e };
   try {
     const r = `${t}/${c}.geojson`, o = await fetch(r);
     if (!o.ok)
@@ -2396,7 +2558,7 @@ async function he(c, e = {}) {
   }
 }
 async function de(c, e = {}) {
-  const { silent: t } = { ...W, ...e };
+  const { silent: t } = { ...z, ...e };
   let i = c;
   if ((!i || i.length === 0) && (i = await ce(e)), !i || i.length === 0)
     return t || (console.warn("未提供 GeoJSON 文件列表，无法加载数据"), console.warn("请使用 loadAllAirportNoFlyZones(fileList) 提供文件列表，"), console.warn("或在 public/geojson 目录下创建 file-list.json 文件")), [];
@@ -2455,13 +2617,13 @@ class ue {
           try {
             const a = this.viewer.scene.mode === n.SceneMode.SCENE3D, l = o.extrudedHeight, h = o.height, d = typeof l == "number" ? l : l?.getValue(n.JulianDate.now()), u = typeof h == "number" ? h : h?.getValue(n.JulianDate.now()), m = d ?? u ?? 0;
             if (a && m > 0) {
-              const w = r.map((p) => {
-                const f = n.Cartographic.fromCartesian(p);
+              const b = r.map((w) => {
+                const f = n.Cartographic.fromCartesian(w);
                 return n.Cartesian3.fromRadians(f.longitude, f.latitude, m);
               }), g = this.viewer.entities.add({
                 name: `${t.name}_top_outline`,
                 polyline: {
-                  positions: w,
+                  positions: b,
                   width: 2,
                   material: n.Color.RED,
                   clampToGround: !1
@@ -2977,14 +3139,14 @@ class be {
             if (this.measurementCallback?.onDistanceComplete)
               this.measurementCallback.onDistanceComplete(t, i);
             else {
-              const r = I(i);
+              const r = j(i);
               console.log(`测距完成，总距离: ${r}`);
             }
           }
         } else if (e.polygon) {
           const t = e.polygon.hierarchy?.getValue(n.JulianDate.now());
           if (t && this.measurementCallback?.onAreaComplete) {
-            const i = R(t.positions, this.viewer.scene.globe.ellipsoid);
+            const i = H(t.positions, this.viewer.scene.globe.ellipsoid);
             this.measurementCallback.onAreaComplete(t.positions, i);
           }
         }
@@ -3755,12 +3917,12 @@ class De {
     return t ? (t._onClick = void 0, this.entities.remove(t)) : !1;
   }
 }
-const Me = 1e3, T = "_infoWindowData";
-class Pe {
+const Pe = 1e3, T = "_infoWindowData";
+class Me {
   viewer;
   container;
   entityMap = /* @__PURE__ */ new Map();
-  currentTopZIndex = Me;
+  currentTopZIndex = Pe;
   defaultUpdateInterval = 0;
   // ms, 默认 0 = 每帧更新
   isCameraMoving = !1;
@@ -3860,41 +4022,41 @@ class Pe {
       if (typeof r.anchorPixel == "number" && y)
         a = y.x, l = y.y - r.anchorPixel;
       else {
-        const x = n.Cartographic.fromCartesian(o), G = n.Math.toDegrees(x.longitude), A = n.Math.toDegrees(x.latitude), Y = n.Cartesian3.fromDegrees(G, A, x.height + h), E = this.getContainerPixelPosition(Y), M = this.getContainerPixelPosition(o);
-        E && M ? (a = E.x, l = E.y) : M && (a = M.x, l = M.y);
+        const x = n.Cartographic.fromCartesian(o), G = n.Math.toDegrees(x.longitude), A = n.Math.toDegrees(x.latitude), Y = n.Cartesian3.fromDegrees(G, A, x.height + h), E = this.getContainerPixelPosition(Y), P = this.getContainerPixelPosition(o);
+        E && P ? (a = E.x, l = E.y) : P && (a = P.x, l = P.y);
       }
     } catch {
     }
     r.pixelOffset && (a += r.pixelOffset.x, l -= r.pixelOffset.y);
-    const u = this.container.getBoundingClientRect(), m = u.width, w = u.height;
+    const u = this.container.getBoundingClientRect(), m = u.width, b = u.height;
     i.style.visibility = "hidden", i.style.display = "block";
-    const g = i.getBoundingClientRect(), p = g.width, f = g.height;
+    const g = i.getBoundingClientRect(), w = g.width, f = g.height;
     i.style.visibility = "", i.style.display = "none";
-    const b = r.positionOffset ?? "top";
+    const p = r.positionOffset ?? "top";
     let C = "translate(-50%, -100%)";
-    b === "top" ? (l = l - d, C = "translate(-50%, -100%)") : b === "bottom" ? (l = s.y + d, a = s.x, C = "translate(-50%, 0%)") : b === "left" ? (a = s.x - d, l = s.y, C = "translate(-100%, -50%)") : b === "right" ? (a = s.x + d, l = s.y, C = "translate(0%, -50%)") : b === "top-left" ? (a = s.x - d, l = s.y - d, C = "translate(-100%, -100%)") : b === "top-right" ? (a = s.x + d, l = s.y - d, C = "translate(0%, -100%)") : b === "bottom-left" ? (a = s.x - d, l = s.y + d, C = "translate(-100%, 0%)") : b === "bottom-right" ? (a = s.x + d, l = s.y + d, C = "translate(0%, 0%)") : b === "left-top" ? (a = s.x - d, l = s.y - d, C = "translate(-100%, 0%)") : b === "left-bottom" ? (a = s.x - d, l = s.y + d, C = "translate(-100%, -100%)") : b === "right-top" ? (a = s.x + d, l = s.y - d, C = "translate(0%, 0%)") : b === "right-bottom" && (a = s.x + d, l = s.y + d, C = "translate(0%, -100%)");
+    p === "top" ? (l = l - d, C = "translate(-50%, -100%)") : p === "bottom" ? (l = s.y + d, a = s.x, C = "translate(-50%, 0%)") : p === "left" ? (a = s.x - d, l = s.y, C = "translate(-100%, -50%)") : p === "right" ? (a = s.x + d, l = s.y, C = "translate(0%, -50%)") : p === "top-left" ? (a = s.x - d, l = s.y - d, C = "translate(-100%, -100%)") : p === "top-right" ? (a = s.x + d, l = s.y - d, C = "translate(0%, -100%)") : p === "bottom-left" ? (a = s.x - d, l = s.y + d, C = "translate(-100%, 0%)") : p === "bottom-right" ? (a = s.x + d, l = s.y + d, C = "translate(0%, 0%)") : p === "left-top" ? (a = s.x - d, l = s.y - d, C = "translate(-100%, 0%)") : p === "left-bottom" ? (a = s.x - d, l = s.y + d, C = "translate(-100%, -100%)") : p === "right-top" ? (a = s.x + d, l = s.y - d, C = "translate(0%, 0%)") : p === "right-bottom" && (a = s.x + d, l = s.y + d, C = "translate(0%, -100%)");
     const v = 10;
     if (this.isCameraMoving || ((G) => {
-      G.left < v && (a += v - G.left), G.right > m - v && (a -= G.right - (m - v)), G.top < v && (l += v - G.top), G.bottom > w - v && (l -= G.bottom - (w - v));
+      G.left < v && (a += v - G.left), G.right > m - v && (a -= G.right - (m - v)), G.top < v && (l += v - G.top), G.bottom > b - v && (l -= G.bottom - (b - v));
     })((() => {
-      switch (b) {
+      switch (p) {
         case "top":
           return {
-            left: a - p / 2,
-            right: a + p / 2,
+            left: a - w / 2,
+            right: a + w / 2,
             top: l - f,
             bottom: l
           };
         case "bottom":
           return {
-            left: a - p / 2,
-            right: a + p / 2,
+            left: a - w / 2,
+            right: a + w / 2,
             top: l,
             bottom: l + f
           };
         case "left":
           return {
-            left: a - p,
+            left: a - w,
             right: a,
             top: l - f / 2,
             bottom: l + f / 2
@@ -3902,13 +4064,13 @@ class Pe {
         case "right":
           return {
             left: a,
-            right: a + p,
+            right: a + w,
             top: l - f / 2,
             bottom: l + f / 2
           };
         case "top-left":
           return {
-            left: a - p,
+            left: a - w,
             right: a,
             top: l - f,
             bottom: l
@@ -3916,13 +4078,13 @@ class Pe {
         case "top-right":
           return {
             left: a,
-            right: a + p,
+            right: a + w,
             top: l - f,
             bottom: l
           };
         case "bottom-left":
           return {
-            left: a - p,
+            left: a - w,
             right: a,
             top: l,
             bottom: l + f
@@ -3930,20 +4092,20 @@ class Pe {
         case "bottom-right":
           return {
             left: a,
-            right: a + p,
+            right: a + w,
             top: l,
             bottom: l + f
           };
         case "left-top":
           return {
-            left: a - p,
+            left: a - w,
             right: a,
             top: l,
             bottom: l + f
           };
         case "left-bottom":
           return {
-            left: a - p,
+            left: a - w,
             right: a,
             top: l - f,
             bottom: l
@@ -3951,21 +4113,21 @@ class Pe {
         case "right-top":
           return {
             left: a,
-            right: a + p,
+            right: a + w,
             top: l,
             bottom: l + f
           };
         case "right-bottom":
           return {
             left: a,
-            right: a + p,
+            right: a + w,
             top: l - f,
             bottom: l
           };
         default:
           return {
-            left: a - p / 2,
-            right: a + p / 2,
+            left: a - w / 2,
+            right: a + w / 2,
             top: l - f,
             bottom: l
           };
@@ -3973,8 +4135,8 @@ class Pe {
     })()), i.style.left = `${a}px`, i.style.top = `${l}px`, i.style.transform = C, i.style.display = "block", t.arrowEl && r.showArrow) {
       const y = t.arrowEl, x = (r.arrowSize ?? 8) + "px", G = i.style.background || r.backgroundColor || "#ffffff";
       y.style.borderLeft = "0", y.style.borderRight = "0", y.style.borderTop = "0", y.style.borderBottom = "0", y.style.left = "", y.style.right = "", y.style.top = "", y.style.bottom = "", y.style.transform = "";
-      const A = (O) => O.startsWith("top") ? "top" : O.startsWith("bottom") ? "bottom" : O.startsWith("left") ? "left" : O.startsWith("right") ? "right" : "top", Y = (O) => O.includes("left") ? 25 : O.includes("right") ? 75 : 50, E = A(b), M = Y(b);
-      E === "top" ? (y.style.left = `${M}%`, y.style.bottom = `-${x}`, y.style.transform = "translateX(-50%)", y.style.borderLeft = `${x} solid transparent`, y.style.borderRight = `${x} solid transparent`, y.style.borderTop = `${x} solid ${G}`) : E === "bottom" ? (y.style.left = `${M}%`, y.style.top = `-${x}`, y.style.transform = "translateX(-50%)", y.style.borderLeft = `${x} solid transparent`, y.style.borderRight = `${x} solid transparent`, y.style.borderBottom = `${x} solid ${G}`) : E === "left" ? (y.style.right = `-${x}`, y.style.top = `${M}%`, y.style.transform = "translateY(-50%)", y.style.borderTop = `${x} solid transparent`, y.style.borderBottom = `${x} solid transparent`, y.style.borderLeft = `${x} solid ${G}`) : (y.style.left = `-${x}`, y.style.top = `${M}%`, y.style.transform = "translateY(-50%)", y.style.borderTop = `${x} solid transparent`, y.style.borderBottom = `${x} solid transparent`, y.style.borderRight = `${x} solid ${G}`);
+      const A = (O) => O.startsWith("top") ? "top" : O.startsWith("bottom") ? "bottom" : O.startsWith("left") ? "left" : O.startsWith("right") ? "right" : "top", Y = (O) => O.includes("left") ? 25 : O.includes("right") ? 75 : 50, E = A(p), P = Y(p);
+      E === "top" ? (y.style.left = `${P}%`, y.style.bottom = `-${x}`, y.style.transform = "translateX(-50%)", y.style.borderLeft = `${x} solid transparent`, y.style.borderRight = `${x} solid transparent`, y.style.borderTop = `${x} solid ${G}`) : E === "bottom" ? (y.style.left = `${P}%`, y.style.top = `-${x}`, y.style.transform = "translateX(-50%)", y.style.borderLeft = `${x} solid transparent`, y.style.borderRight = `${x} solid transparent`, y.style.borderBottom = `${x} solid ${G}`) : E === "left" ? (y.style.right = `-${x}`, y.style.top = `${P}%`, y.style.transform = "translateY(-50%)", y.style.borderTop = `${x} solid transparent`, y.style.borderBottom = `${x} solid transparent`, y.style.borderLeft = `${x} solid ${G}`) : (y.style.left = `-${x}`, y.style.top = `${P}%`, y.style.transform = "translateY(-50%)", y.style.borderTop = `${x} solid transparent`, y.style.borderBottom = `${x} solid transparent`, y.style.borderRight = `${x} solid ${G}`);
     }
   }
   /**
@@ -4239,8 +4401,8 @@ class Te {
     if (i < 3) return e.slice();
     const o = this.polygonArea2D(e) > 0, s = [];
     for (let h = 0; h < i; h++) {
-      const d = e[h], u = e[(h + 1) % i], m = u.x - d.x, w = u.y - d.y, g = Math.hypot(m, w) || 1, p = m / g, f = w / g, b = o ? -f : f, C = o ? p : -p;
-      s.push(new n.Cartesian2(-b, -C));
+      const d = e[h], u = e[(h + 1) % i], m = u.x - d.x, b = u.y - d.y, g = Math.hypot(m, b) || 1, w = m / g, f = b / g, p = o ? -f : f, C = o ? w : -w;
+      s.push(new n.Cartesian2(-p, -C));
     }
     const a = [];
     for (let h = 0; h < i; h++) {
@@ -4249,13 +4411,13 @@ class Te {
     }
     const l = [];
     for (let h = 0; h < i; h++) {
-      const d = (h - 1 + i) % i, u = s[d], m = a[d], w = s[h], g = a[h], p = u.x * w.y - w.x * u.y;
-      if (Math.abs(p) < 1e-8) {
+      const d = (h - 1 + i) % i, u = s[d], m = a[d], b = s[h], g = a[h], w = u.x * b.y - b.x * u.y;
+      if (Math.abs(w) < 1e-8) {
         const f = e[h];
-        l.push(new n.Cartesian2(f.x + w.x * t, f.y + w.y * t));
+        l.push(new n.Cartesian2(f.x + b.x * t, f.y + b.y * t));
       } else {
-        const f = (m * w.y - g * u.y) / p, b = (u.x * g - w.x * m) / p;
-        l.push(new n.Cartesian2(f, b));
+        const f = (m * b.y - g * u.y) / w, p = (u.x * g - b.x * m) / w;
+        l.push(new n.Cartesian2(f, p));
       }
     }
     return l;
@@ -4425,11 +4587,11 @@ class Ee {
         }
       });
       if (e.onClick) {
-        const g = u, p = m;
-        g._onClick = e.onClick, p._onClick = e.onClick;
+        const g = u, w = m;
+        g._onClick = e.onClick, w._onClick = e.onClick;
       }
-      const w = u;
-      return w._innerEntity = m, w._isRing = !0, w._ringThickness = r, w._outerRectangle = e.coordinates, u;
+      const b = u;
+      return b._innerEntity = m, b._isRing = !0, b._ringThickness = r, b._outerRectangle = e.coordinates, u;
     }
     const o = this.entities.add({
       id: t,
@@ -4534,7 +4696,7 @@ class Oe {
   add(e) {
     const t = this.convertPosition(e.position), i = e.id || `circle_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`, r = this.resolveMaterial(e.material), o = e.outlineWidth && e.outlineWidth > 1 ? e.outlineWidth : 0;
     if (o > 0) {
-      const s = n.Cartographic.fromCartesian(t), a = s?.height ?? 0, l = 0.01, h = e.radius, d = Math.max(0, e.radius - o), u = this.generateCirclePositions(s, h, a + l), m = this.generateCirclePositions(s, d, a), w = this.entities.add({
+      const s = n.Cartographic.fromCartesian(t), a = s?.height ?? 0, l = 0.01, h = e.radius, d = Math.max(0, e.radius - o), u = this.generateCirclePositions(s, h, a + l), m = this.generateCirclePositions(s, d, a), b = this.entities.add({
         // 使用带洞的多边形，只渲染环带区域，不填充中心
         polygon: {
           hierarchy: new n.PolygonHierarchy(u, [new n.PolygonHierarchy(m)]),
@@ -4555,11 +4717,11 @@ class Oe {
         }
       });
       if (e.onClick) {
-        const f = w, b = g;
-        f._onClick = e.onClick, b._onClick = e.onClick;
+        const f = b, p = g;
+        f._onClick = e.onClick, p._onClick = e.onClick;
       }
-      const p = w;
-      return p._innerEntity = g, p._isRing = !0, p._ringThickness = o, p._fillMaterial = r, p._ringHeightEpsilon = l, p._centerCartographic = s, p._outerRadius = h, p._innerRadius = d, w;
+      const w = b;
+      return w._innerEntity = g, w._isRing = !0, w._ringThickness = o, w._fillMaterial = r, w._ringHeightEpsilon = l, w._centerCartographic = s, w._outerRadius = h, w._innerRadius = d, b;
     } else {
       const s = this.entities.add({
         id: i,
@@ -4589,7 +4751,7 @@ class Oe {
   generateCirclePositions(e, t, i, r = 128) {
     const s = e.latitude, a = e.longitude, l = t / 6378137, h = [];
     for (let d = 0; d < r; d++) {
-      const u = d / r * n.Math.TWO_PI, m = Math.sin(s), w = Math.cos(s), g = Math.sin(l), p = Math.cos(l), f = Math.sin(u), b = Math.cos(u), C = Math.asin(m * p + w * g * b), v = a + Math.atan2(f * g * w, p - m * Math.sin(C));
+      const u = d / r * n.Math.TWO_PI, m = Math.sin(s), b = Math.cos(s), g = Math.sin(l), w = Math.cos(l), f = Math.sin(u), p = Math.cos(u), C = Math.asin(m * w + b * g * p), v = a + Math.atan2(f * g * b, w - m * Math.sin(C));
       h.push(n.Cartesian3.fromRadians(v, C, i));
     }
     return h;
@@ -4745,7 +4907,7 @@ class Le {
   generateCirclePositions(e, t, i, r = 128) {
     const s = e.latitude, a = e.longitude, l = t / 6378137, h = [];
     for (let d = 0; d < r; d++) {
-      const u = d / r * n.Math.TWO_PI, m = Math.sin(s), w = Math.cos(s), g = Math.sin(l), p = Math.cos(l), f = Math.sin(u), b = Math.cos(u), C = Math.asin(m * p + w * g * b), v = a + Math.atan2(f * g * w, p - m * Math.sin(C));
+      const u = d / r * n.Math.TWO_PI, m = Math.sin(s), b = Math.cos(s), g = Math.sin(l), w = Math.cos(l), f = Math.sin(u), p = Math.cos(u), C = Math.asin(m * w + b * g * p), v = a + Math.atan2(f * g * b, w - m * Math.sin(C));
       h.push(n.Cartesian3.fromRadians(v, C, i));
     }
     return h.length > 0 && h.push(h[0]), h;
@@ -4762,7 +4924,7 @@ class Le {
       dashLength: e.dashLength,
       dashPattern: e.dashPattern,
       gapColor: e.gapColor
-    }), w = e.lineWidth ?? this.getInnerWidth(i), g = this.entities.add({
+    }), b = e.lineWidth ?? this.getInnerWidth(i), g = this.entities.add({
       id: t,
       polyline: {
         positions: d,
@@ -4772,16 +4934,16 @@ class Le {
         // clampToGround=true 时生效：保证外层在下
         zIndex: 0
       }
-    }), p = s ? this.addInnerEntity({
+    }), w = s ? this.addInnerEntity({
       outerId: t,
       ringPositions: d,
-      innerWidth: w,
+      innerWidth: b,
       lineMaterial: m,
       clampToGround: o
     }) : void 0, f = g;
-    if (f._overlayType = "ring", f._centerCartographic = l, f._outerRadius = e.radius, f._ringSegments = r, f._ringGlowPower = n.Math.clamp(e.glowPower ?? 0.25, 0, 1), f._ringLineColor = e.lineColor ?? n.Color.WHITE, f._ringLineStyle = e.lineStyle ?? "solid", f._ringLineMaterialMode = e.lineMaterialMode ?? "stripe", f._ringStripeRepeat = e.stripeRepeat, f._ringDashLength = e.dashLength, f._ringDashPattern = e.dashPattern, f._ringGapColor = e.gapColor, f._ringShowInnerLine = s, f._innerEntity = p, e.onClick && (f._onClick = e.onClick, p)) {
-      const b = p;
-      b._onClick = () => e.onClick?.(g);
+    if (f._overlayType = "ring", f._centerCartographic = l, f._outerRadius = e.radius, f._ringSegments = r, f._ringGlowPower = n.Math.clamp(e.glowPower ?? 0.25, 0, 1), f._ringLineColor = e.lineColor ?? n.Color.WHITE, f._ringLineStyle = e.lineStyle ?? "solid", f._ringLineMaterialMode = e.lineMaterialMode ?? "stripe", f._ringStripeRepeat = e.stripeRepeat, f._ringDashLength = e.dashLength, f._ringDashPattern = e.dashPattern, f._ringGapColor = e.gapColor, f._ringShowInnerLine = s, f._innerEntity = w, e.onClick && (f._onClick = e.onClick, w)) {
+      const p = w;
+      p._onClick = () => e.onClick?.(g);
     }
     return g;
   }
@@ -4815,7 +4977,7 @@ class Le {
       else if (!i._innerEntity) {
         const u = this.rebuildRingPositions(e, i, { clampToGround: t.clampToGround, segments: t.segments });
         if (u) {
-          const m = t.clampToGround ?? e.polyline?.clampToGround?.getValue?.(n.JulianDate.now?.()) ?? e.polyline?.clampToGround, w = typeof m == "boolean" ? m : !0, g = e.polyline.width?.getValue?.(n.JulianDate.now?.()) ?? e.polyline.width ?? t.glowWidth ?? t.width ?? 8, p = typeof g == "number" ? g : t.glowWidth ?? t.width ?? 8, f = t.lineWidth ?? this.getInnerWidth(p), b = this.resolveLineMaterial({
+          const m = t.clampToGround ?? e.polyline?.clampToGround?.getValue?.(n.JulianDate.now?.()) ?? e.polyline?.clampToGround, b = typeof m == "boolean" ? m : !0, g = e.polyline.width?.getValue?.(n.JulianDate.now?.()) ?? e.polyline.width ?? t.glowWidth ?? t.width ?? 8, w = typeof g == "number" ? g : t.glowWidth ?? t.width ?? 8, f = t.lineWidth ?? this.getInnerWidth(w), p = this.resolveLineMaterial({
             lineColor: t.lineColor ?? i._ringLineColor,
             lineStyle: t.lineStyle ?? i._ringLineStyle,
             lineMaterialMode: t.lineMaterialMode ?? i._ringLineMaterialMode,
@@ -4827,8 +4989,8 @@ class Le {
             outerId: String(e.id),
             ringPositions: u,
             innerWidth: f,
-            lineMaterial: b,
-            clampToGround: w
+            lineMaterial: p,
+            clampToGround: b
           });
           if (i._innerEntity = C, i._onClick) {
             const v = C;
@@ -4849,21 +5011,21 @@ class Le {
       e.polyline.material = this.resolveGlowMaterial(t.color ?? n.Color.CYAN, u), i._ringGlowPower = n.Math.clamp(u, 0, 1);
     }
     if ((t.lineColor !== void 0 || t.lineStyle !== void 0 || t.lineMaterialMode !== void 0 || t.stripeRepeat !== void 0 || t.dashLength !== void 0 || t.dashPattern !== void 0 || t.gapColor !== void 0) && i._innerEntity?.polyline) {
-      const u = t.lineColor ?? i._ringLineColor, m = t.lineStyle ?? i._ringLineStyle, w = t.lineMaterialMode ?? i._ringLineMaterialMode, g = t.stripeRepeat ?? i._ringStripeRepeat, p = t.dashLength ?? i._ringDashLength, f = t.dashPattern ?? i._ringDashPattern, b = t.gapColor ?? i._ringGapColor;
+      const u = t.lineColor ?? i._ringLineColor, m = t.lineStyle ?? i._ringLineStyle, b = t.lineMaterialMode ?? i._ringLineMaterialMode, g = t.stripeRepeat ?? i._ringStripeRepeat, w = t.dashLength ?? i._ringDashLength, f = t.dashPattern ?? i._ringDashPattern, p = t.gapColor ?? i._ringGapColor;
       i._innerEntity.polyline.material = this.resolveLineMaterial({
         lineColor: u,
         lineStyle: m,
-        lineMaterialMode: w,
+        lineMaterialMode: b,
         stripeRepeat: g,
-        dashLength: p,
+        dashLength: w,
         dashPattern: f,
-        gapColor: b
-      }), i._ringLineColor = u, i._ringLineStyle = m, i._ringLineMaterialMode = w, i._ringStripeRepeat = g, i._ringDashLength = p, i._ringDashPattern = f, i._ringGapColor = b;
+        gapColor: p
+      }), i._ringLineColor = u, i._ringLineStyle = m, i._ringLineMaterialMode = b, i._ringStripeRepeat = g, i._ringDashLength = w, i._ringDashPattern = f, i._ringGapColor = p;
     }
     const s = i._centerCartographic, a = i._outerRadius, l = t.segments ?? i._ringSegments, h = t.segments !== void 0 && t.segments !== i._ringSegments, d = t.clampToGround !== void 0;
     if (t.clampToGround !== void 0 && (e.polyline.clampToGround = new n.ConstantProperty(t.clampToGround), i._innerEntity?.polyline && (i._innerEntity.polyline.clampToGround = new n.ConstantProperty(t.clampToGround))), (h || d) && s && a !== void 0) {
-      const m = t.clampToGround ?? !0 ? 0 : s.height ?? 0, w = this.generateCirclePositions(s, a, m, l ?? 128);
-      e.polyline.positions = new n.ConstantProperty(w), i._innerEntity?.polyline && (i._innerEntity.polyline.positions = new n.ConstantProperty(w)), i._ringSegments = l ?? 128;
+      const m = t.clampToGround ?? !0 ? 0 : s.height ?? 0, b = this.generateCirclePositions(s, a, m, l ?? 128);
+      e.polyline.positions = new n.ConstantProperty(b), i._innerEntity?.polyline && (i._innerEntity.polyline.positions = new n.ConstantProperty(b)), i._ringSegments = l ?? 128;
     }
   }
   /**
@@ -4906,7 +5068,7 @@ class Ae {
   circle;
   ring;
   constructor(e) {
-    this.viewer = e, this.entities = e.entities, this.initInfoWindowContainer(), this.setupEntityClickHandler(), this.marker = new xe(e), this.label = new ve(e), this.icon = new Ge(e), this.svg = new De(e), this.infoWindow = new Pe(e, this.infoWindowContainer), this.polyline = new Ne(e), this.polygon = new Te(e), this.rectangle = new Ee(e), this.circle = new Oe(e), this.ring = new Le(e);
+    this.viewer = e, this.entities = e.entities, this.initInfoWindowContainer(), this.setupEntityClickHandler(), this.marker = new xe(e), this.label = new ve(e), this.icon = new Ge(e), this.svg = new De(e), this.infoWindow = new Me(e, this.infoWindowContainer), this.polyline = new Ne(e), this.polygon = new Te(e), this.rectangle = new Ee(e), this.circle = new Oe(e), this.ring = new Le(e);
   }
   /**
    * 初始化信息窗口容器
@@ -5071,7 +5233,7 @@ class Ae {
     this.removeAllOverlays(), this.infoWindowContainer && this.infoWindowContainer.parentNode && this.infoWindowContainer.parentNode.removeChild(this.infoWindowContainer), this.overlayMap.clear();
   }
 }
-class je {
+class Ie {
   viewer;
   imageryLayer = null;
   rectangle = null;
@@ -5388,27 +5550,27 @@ class je {
     let h = this.options.minValue, d = this.options.maxValue;
     if (!l) {
       h = Number.POSITIVE_INFINITY, d = Number.NEGATIVE_INFINITY;
-      for (const b of e)
-        Number.isFinite(b.value) && (b.value < h && (h = b.value), b.value > d && (d = b.value));
+      for (const p of e)
+        Number.isFinite(p.value) && (p.value < h && (h = p.value), p.value > d && (d = p.value));
       (!Number.isFinite(h) || !Number.isFinite(d) || h === d) && (h = 0, d = 1), i.persistMinMax && (this.options.minValue = h, this.options.maxValue = d);
     }
-    const u = n.Math.toDegrees(t.west), m = n.Math.toDegrees(t.east), w = n.Math.toDegrees(t.south), g = n.Math.toDegrees(t.north);
-    for (const b of e) {
-      if (!Number.isFinite(b.lon) || !Number.isFinite(b.lat)) continue;
-      const C = (b.value - h) / (d - h || 1);
+    const u = n.Math.toDegrees(t.west), m = n.Math.toDegrees(t.east), b = n.Math.toDegrees(t.south), g = n.Math.toDegrees(t.north);
+    for (const p of e) {
+      if (!Number.isFinite(p.lon) || !Number.isFinite(p.lat)) continue;
+      const C = (p.value - h) / (d - h || 1);
       if (C <= 0) continue;
-      const v = (b.lon - u) / (m - u || 1) * r, y = (1 - (b.lat - w) / (g - w || 1)) * o, x = a.createRadialGradient(v, y, 0, v, y, s);
+      const v = (p.lon - u) / (m - u || 1) * r, y = (1 - (p.lat - b) / (g - b || 1)) * o, x = a.createRadialGradient(v, y, 0, v, y, s);
       x.addColorStop(0, "rgba(0,0,0,1)"), x.addColorStop(1, "rgba(0,0,0,0)"), a.fillStyle = x, a.globalAlpha = C, a.beginPath(), a.arc(v, y, s, 0, Math.PI * 2), a.fill();
     }
     a.globalAlpha = 1;
-    const p = a.getImageData(0, 0, r, o), f = p.data;
-    for (let b = 0; b < f.length; b += 4) {
-      const C = f[b + 3];
+    const w = a.getImageData(0, 0, r, o), f = w.data;
+    for (let p = 0; p < f.length; p += 4) {
+      const C = f[p + 3];
       if (C === 0) continue;
       const y = Math.min(255, Math.max(0, C)) * 4;
-      f[b] = this.gradientLUT[y], f[b + 1] = this.gradientLUT[y + 1], f[b + 2] = this.gradientLUT[y + 2], f[b + 3] = Math.round(C * this.options.opacity);
+      f[p] = this.gradientLUT[y], f[p + 1] = this.gradientLUT[y + 1], f[p + 2] = this.gradientLUT[y + 2], f[p + 3] = Math.round(C * this.options.opacity);
     }
-    a.putImageData(p, 0, 0), this.updateImageryLayer(t);
+    a.putImageData(w, 0, 0), this.updateImageryLayer(t);
   }
   /**
    * 将当前 canvas 映射为 Cesium 影像图层
@@ -5431,7 +5593,7 @@ class je {
     this.imageryLayer = this.viewer.imageryLayers.addImageryProvider(i), this.imageryLayer.alpha = this.options.opacity, this.imageryLayer.show = !0;
   }
 }
-const Ie = {
+const je = {
   CesiumMapToolbar: be,
   DrawHelper: D,
   CesiumOverlayService: Ae,
@@ -5448,10 +5610,10 @@ export {
   V as DrawLine,
   K as DrawPolygon,
   _ as DrawRectangle,
-  je as HeatmapLayer,
+  Ie as HeatmapLayer,
   Oe as MapCircle,
   Ge as MapIcon,
-  Pe as MapInfoWindow,
+  Me as MapInfoWindow,
   ve as MapLabel,
   le as MapLayersService,
   xe as MapMarker,
@@ -5462,10 +5624,10 @@ export {
   De as MapSVG,
   ue as NotFlyZonesService,
   ae as SearchService,
-  Ie as default,
+  je as default,
   N as defaultButtonSorts,
   we as defaultButtons,
   S as initCesium,
-  j as toggleSelectedStyle
+  I as toggleSelectedStyle
 };
 //# sourceMappingURL=index.es.js.map