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

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();
@@ -199,7 +199,7 @@ class L {
   }
   // 其余公共方法（如有需要可在子类中覆盖）
 }
-function j(c) {
+function I(c) {
   try {
     const t = c._drawOptions?.selected;
     if (!t) return;
@@ -253,16 +253,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 +276,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 +293,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 +354,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,7 +474,7 @@ 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, w = 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) {
@@ -531,7 +531,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 +616,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);
@@ -684,10 +690,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(
@@ -742,7 +754,7 @@ 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);
+    const h = H(i, this.scene.globe.ellipsoid);
     if (h > 0) {
       const u = J(i), m = n.Cartographic.fromCartesian(u), w = n.Cartesian3.fromRadians(
         m.longitude,
@@ -755,7 +767,7 @@ class K extends L {
         m.latitude,
         (m.height || 0) + this.offsetHeight
       ));
-      const p = `面积: ${z(h)}`, f = this.createTotalLengthBillboardImage(p), b = this.entities.add({
+      const p = `面积: ${R(h)}`, f = this.createTotalLengthBillboardImage(p), b = this.entities.add({
         position: g,
         billboard: {
           image: f,
@@ -778,7 +790,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 +837,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,7 +856,7 @@ 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) => {
@@ -854,7 +866,7 @@ class _ extends L {
         w.latitude,
         w.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({
@@ -892,7 +904,7 @@ class _ extends L {
         m.latitude,
         this.offsetHeight
       ));
-      const p = `面积: ${z(l)}`, f = this.createTotalLengthBillboardImage(p), b = this.entities.add({
+      const p = `面积: ${R(l)}`, f = this.createTotalLengthBillboardImage(p), b = this.entities.add({
         position: g,
         billboard: {
           image: f,
@@ -1077,7 +1089,7 @@ 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({
+      const f = `面积: ${R(d)}`, b = this.createTotalLengthBillboardImage(f), C = this.entities.add({
         position: s,
         billboard: {
           image: b,
@@ -1158,6 +1170,10 @@ class D {
   // 双击判断
   // 最近一次鼠标移动位置，用于在右键删点后立即重绘预览
   lastPreviewPosition = null;
+  // 绘制步骤提示（跟随鼠标的提示 Label）
+  drawHintEntity = null;
+  drawHintText = "";
+  drawHintLastPosition = null;
   // 静态：当前处于绘制状态的 DrawHelper，用于跨实例互斥
   static activeDrawingHelper = null;
   // 绘制类实例
@@ -1219,7 +1235,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 +1246,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 +1254,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 +1375,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 +1389,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 +1405,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 +1444,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 +1477,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 +1512,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 +1520,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 {
@@ -2366,12 +2480,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 +2498,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 +2510,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 文件")), [];
@@ -2977,14 +3091,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 +3869,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,8 +3974,8 @@ 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 {
     }
@@ -3973,8 +4087,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(b), P = Y(b);
+      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}`);
     }
   }
   /**
@@ -4906,7 +5020,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 +5185,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;
@@ -5431,7 +5545,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 +5562,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 +5576,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