@jorgmoritz/gis-manager 0.1.37 → 0.1.39

package/dist/index.d.cts

@@ -1376,6 +1376,11 @@ declare class PolygonEditor {
             height?: number;
         }>;
     }): Cesium.Entity | null;
+    /**
+     * 辅助方法：使用地形采样创建标签
+     * 先尝试获取地形高度，如果失败则使用 heightReference
+     */
+    private createLabelWithTerrainHeight;
     /**
      * 辅助方法：从实体中提取经纬度高度数组
      * @param entity 多边形实体

package/dist/index.d.ts

@@ -1376,6 +1376,11 @@ declare class PolygonEditor {
             height?: number;
         }>;
     }): Cesium.Entity | null;
+    /**
+     * 辅助方法：使用地形采样创建标签
+     * 先尝试获取地形高度，如果失败则使用 heightReference
+     */
+    private createLabelWithTerrainHeight;
     /**
      * 辅助方法：从实体中提取经纬度高度数组
      * @param entity 多边形实体

package/dist/index.js

@@ -11,7 +11,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
 // package.json
 var package_default = {
   name: "@jorgmoritz/gis-manager",
-  version: "0.1.36"};
+  version: "0.1.38"};
 
 // src/utils/version.ts
 var version = package_default.version;
@@ -1593,7 +1593,7 @@ var CameraFOVController = class {
       this.minFOV = opts.minFOV;
       this.maxFOV = opts.maxFOV;
     }
-    this.currentFOV = opts.initialFOV ?? this.focalLengthToFOVDirect(56);
+    this.currentFOV = opts.initialFOV ?? this.focalLengthToFOVDirect(1);
     this.useGlobalEventBus = opts.useGlobalEventBus ?? true;
     this.createUI();
     this.setupExternalFOVListener();
@@ -1943,7 +1943,7 @@ var CameraFOVController = class {
 
 // src/core/path-manager/PathPreview.ts
 var PathPreview = class {
-  // 当前 FOV 值
+  // 折叠按钮
   constructor(CesiumNS, mainViewer, opts = {}) {
     this.CesiumNS = CesiumNS;
     this.mainViewer = mainViewer;
@@ -1959,6 +1959,10 @@ var PathPreview = class {
     __publicField(this, "fovController");
     // FOV 控制器
     __publicField(this, "currentFOV");
+    // 当前 FOV 值
+    __publicField(this, "collapsed", false);
+    // 折叠状态
+    __publicField(this, "toggleBtn");
     /** 已加载的 3D Tiles 实例（预览窗口独立的） */
     __publicField(this, "tilesets", /* @__PURE__ */ new Map());
     this.currentFOV = opts.fov ?? 50;
@@ -1973,9 +1977,9 @@ var PathPreview = class {
       host = document.createElement("div");
       host.style.position = "absolute";
       host.style.right = "10px";
-      host.style.bottom = "10px";
-      host.style.width = "480px";
-      host.style.height = "320px";
+      host.style.bottom = "80px";
+      host.style.width = "320px";
+      host.style.height = "200px";
       host.style.border = "1px solid rgba(255, 255, 255, 1)";
       host.style.borderRadius = "6px";
       host.style.overflow = "hidden";
@@ -1985,6 +1989,7 @@ var PathPreview = class {
         parent?.appendChild(host);
       } catch {
       }
+      this.createToggleButton(host);
     }
     this.containerEl = host;
     const v = new C.Viewer(host, {
@@ -2019,6 +2024,157 @@ var PathPreview = class {
     this.syncFromMainViewer();
     this.disableUserInteraction();
   }
+  /**
+   * 创建折叠按钮
+   */
+  createToggleButton(container) {
+    if (typeof document === "undefined") return;
+    this.toggleBtn = document.createElement("div");
+    this.toggleBtn.style.cssText = `
+      position: absolute;
+      top: 6px;
+      left: 6px;
+      width: 24px;
+      height: 24px;
+      background: rgba(0, 0, 0, 0.6);
+      border: 1px solid rgba(255, 255, 255, 0.5);
+      border-radius: 4px;
+      cursor: pointer;
+      z-index: 20;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      transition: all 0.2s;
+      pointer-events: auto;
+    `;
+    this.toggleBtn.innerHTML = `
+      <svg width="12" height="12" viewBox="0 0 12 12" fill="white" style="transition: transform 0.2s;">
+        <path d="M4 2 L8 6 L4 10" stroke="white" stroke-width="2" fill="none" stroke-linecap="round" stroke-linejoin="round"/>
+      </svg>
+    `;
+    this.toggleBtn.addEventListener("mouseenter", () => {
+      if (this.toggleBtn) {
+        this.toggleBtn.style.background = "rgba(47, 119, 251, 0.8)";
+      }
+    });
+    this.toggleBtn.addEventListener("mouseleave", () => {
+      if (this.toggleBtn) {
+        this.toggleBtn.style.background = "rgba(0, 0, 0, 0.6)";
+      }
+    });
+    this.toggleBtn.addEventListener("click", (e) => {
+      e.stopPropagation();
+      this.toggle();
+    });
+    container.appendChild(this.toggleBtn);
+  }
+  /**
+   * 切换折叠状态
+   */
+  toggle() {
+    if (this.collapsed) {
+      this.expand();
+    } else {
+      this.collapse();
+    }
+  }
+  /**
+   * 折叠预览窗口
+   */
+  collapse() {
+    if (this.collapsed || !this.containerEl) return;
+    this.collapsed = true;
+    this.containerEl.dataset.originalWidth = this.containerEl.style.width;
+    this.containerEl.dataset.originalHeight = this.containerEl.style.height;
+    this.containerEl.style.width = "36px";
+    this.containerEl.style.height = "36px";
+    this.containerEl.style.overflow = "hidden";
+    if (this.overlayViewer) {
+      const viewerContainer = this.overlayViewer.container;
+      if (viewerContainer) {
+        viewerContainer.style.display = "none";
+      }
+    }
+    this.hideFOVController();
+    if (this.toggleBtn) {
+      this.toggleBtn.style.cssText = `
+        position: absolute;
+        top: 2px;
+        left: 2px;
+        right: 2px;
+        bottom: 2px;
+        width: auto;
+        height: auto;
+        background: rgba(47, 119, 251, 0.9);
+        border: 1px solid rgba(255, 255, 255, 0.8);
+        border-radius: 4px;
+        cursor: pointer;
+        z-index: 20;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        transition: all 0.2s;
+        pointer-events: auto;
+        box-shadow: 0 2px 8px rgba(0, 0, 0, 0.3);
+      `;
+      this.toggleBtn.innerHTML = `
+        <svg width="16" height="16" viewBox="0 0 12 12" fill="white">
+          <path d="M8 2 L4 6 L8 10" stroke="white" stroke-width="2" fill="none" stroke-linecap="round" stroke-linejoin="round"/>
+        </svg>
+      `;
+    }
+    this.containerEl.style.display = "block";
+  }
+  /**
+   * 展开预览窗口
+   */
+  expand() {
+    if (!this.collapsed || !this.containerEl) return;
+    this.collapsed = false;
+    this.containerEl.style.width = this.containerEl.dataset.originalWidth || "320px";
+    this.containerEl.style.height = this.containerEl.dataset.originalHeight || "200px";
+    if (this.overlayViewer) {
+      const viewerContainer = this.overlayViewer.container;
+      if (viewerContainer) {
+        viewerContainer.style.display = "block";
+      }
+    }
+    this.showFOVController();
+    if (this.toggleBtn) {
+      this.toggleBtn.style.cssText = `
+        position: absolute;
+        top: 6px;
+        left: 6px;
+        width: 24px;
+        height: 24px;
+        background: rgba(0, 0, 0, 0.6);
+        border: 1px solid rgba(255, 255, 255, 0.5);
+        border-radius: 4px;
+        cursor: pointer;
+        z-index: 20;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        transition: all 0.2s;
+        pointer-events: auto;
+      `;
+      this.toggleBtn.innerHTML = `
+        <svg width="12" height="12" viewBox="0 0 12 12" fill="white">
+          <path d="M4 2 L8 6 L4 10" stroke="white" stroke-width="2" fill="none" stroke-linecap="round" stroke-linejoin="round"/>
+        </svg>
+      `;
+    }
+    try {
+      this.overlayViewer?.scene?.requestRender?.();
+    } catch {
+    }
+  }
+  /**
+   * 获取折叠状态
+   */
+  isCollapsed() {
+    return this.collapsed;
+  }
   /**
    * 从主 viewer 同步配置
    * 共享 Provider（安全）而非 DataSource
@@ -2405,6 +2561,11 @@ var PathPreview = class {
     }
     this.fovController = void 0;
     this.footprintEntity = void 0;
+    try {
+      this.toggleBtn?.remove();
+    } catch {
+    }
+    this.toggleBtn = void 0;
     try {
       this.tilesets.forEach((tileset) => {
         try {
@@ -2841,7 +3002,7 @@ var AirplaneCursor = class {
     this.step = opts.stepMeters ?? 2;
     this.angleStep = opts.angleStepDeg ?? 1;
     this.fastFactor = opts.fastFactor ?? 5;
-    this.currentFOV = opts.fovDeg ?? 50;
+    this.currentFOV = opts.fovDeg ?? 172;
     this.ensureEntity(opts.color ?? C.Color.CYAN.withAlpha(0.9));
     this.attachKeyboard(opts);
     this.setupFOVListener();
@@ -3119,7 +3280,8 @@ var AirplaneCursor = class {
           this.viewer.dataSources.add(layer);
         }
         this.frustum = new FrustumPyramid(this.CesiumNS, layer, {
-          fov: this.opts.fovDeg ?? 40,
+          fov: this.opts.fovDeg ?? 172,
+          // 默认 1mm 焦距对应的 FOV
           length: 80,
           color: this.opts.color,
           fillAlpha: 0.25,
@@ -8314,7 +8476,9 @@ var PolygonEditor = class {
         polygon: {
           hierarchy: positions,
           material: faceColor,
-          outline: false
+          outline: false,
+          // 🔧 修复：设置 heightReference 使多边形贴合地形
+          heightReference: C.HeightReference.CLAMP_TO_GROUND
         }
       });
       const ring = positions.slice();
@@ -8327,15 +8491,51 @@ var PolygonEditor = class {
           width: 1,
           material: lineColor,
           clampToGround: true
+          // 轮廓线已经设置了 clampToGround
         },
         properties: { _ownerId: id, _type: "polygon-outline" }
       });
       this.applyDashedOutlineStyle(outlineEntity, lineColor, 3, 10);
       const displayText = name.includes("_") ? name.split("_")[1] : name;
+      const firstPoint = points[0];
+      this.createLabelWithTerrainHeight(
+        layer,
+        id,
+        displayText,
+        firstPoint.lon,
+        firstPoint.lat,
+        lineColor
+      );
+      return entity;
+    } catch (err) {
+      console.error(`[PolygonEditor] \u521B\u5EFA\u591A\u8FB9\u5F62\u5931\u8D25:`, err);
+      return null;
+    }
+  }
+  /**
+   * 辅助方法：使用地形采样创建标签
+   * 先尝试获取地形高度，如果失败则使用 heightReference
+   */
+  async createLabelWithTerrainHeight(layer, ownerId, displayText, lon, lat, lineColor) {
+    const C = this.CesiumNS;
+    try {
+      let terrainHeight = 0;
+      const terrainProvider = this.viewer.terrainProvider;
+      if (terrainProvider && typeof C.sampleTerrainMostDetailed === "function") {
+        try {
+          const positions = [C.Cartographic.fromDegrees(lon, lat)];
+          const updatedPositions = await C.sampleTerrainMostDetailed(terrainProvider, positions);
+          if (updatedPositions && updatedPositions[0] && updatedPositions[0].height !== void 0) {
+            terrainHeight = updatedPositions[0].height;
+          }
+        } catch (e) {
+        }
+      }
+      const labelPosition = C.Cartesian3.fromDegrees(lon, lat, terrainHeight + 1);
       layer.entities.add({
-        id: `${id}-label`,
+        id: `${ownerId}-label`,
         name: "Polygon Label",
-        position: positions[0],
+        position: labelPosition,
         label: {
           text: displayText,
           font: "bold 16px Microsoft YaHei, SimHei, sans-serif",
@@ -8345,14 +8545,14 @@ var PolygonEditor = class {
           style: C.LabelStyle.FILL_AND_OUTLINE,
           verticalOrigin: C.VerticalOrigin.BOTTOM,
           pixelOffset: new C.Cartesian2(0, -10),
-          disableDepthTestDistance: Number.POSITIVE_INFINITY
+          disableDepthTestDistance: Number.POSITIVE_INFINITY,
+          // 仍然设置 heightReference 作为备用
+          heightReference: C.HeightReference.CLAMP_TO_GROUND
         },
-        properties: { _ownerId: id, _type: "polygon-label" }
+        properties: { _ownerId: ownerId, _type: "polygon-label" }
       });
-      return entity;
-    } catch (err) {
-      console.error(`[PolygonEditor] \u521B\u5EFA\u591A\u8FB9\u5F62\u5931\u8D25:`, err);
-      return null;
+    } catch (e) {
+      console.warn(`[PolygonEditor] \u521B\u5EFA\u6807\u7B7E\u5931\u8D25:`, e);
     }
   }
   /**