@jorgmoritz/gis-manager 0.1.33 → 0.1.35

package/dist/index.d.cts

@@ -2114,8 +2114,14 @@ interface PathSafetyCheckOptions {
     pointCloudSafetyDistance?: number;
     /** 航点间最小距离（米），相邻航点之间的最小距离，默认 0（不检测） */
     minWaypointDistance?: number;
-    /** 采样间隔（米），每隔多少米采样一次，默认 5 */
+    /** 采样间隔（米），每隔多少米采样一次，默认 10 */
     sampleInterval?: number;
+    /**
+     * 快速模式：减少射线检测数量以提升速度，默认 true
+     * - true: 8方向检测（速度快）
+     * - false: 16方向检测（精度高）
+     */
+    fastMode?: boolean;
 }
 /**
  * 航线安全检测器
@@ -2125,6 +2131,11 @@ declare class PathSafetyChecker {
     private CesiumNS;
     private viewer;
     constructor(CesiumNS: typeof Cesium, viewer: Cesium.Viewer);
+    /**
+     * 检测场景中是否有3D点云数据（Cesium3DTileset）
+     * @returns 是否存在点云数据
+     */
+    hasPointCloudData(): boolean;
     /**
      * 检测整条路径的安全性
      * @param positions 航点位置数组

package/dist/index.d.ts

@@ -2114,8 +2114,14 @@ interface PathSafetyCheckOptions {
     pointCloudSafetyDistance?: number;
     /** 航点间最小距离（米），相邻航点之间的最小距离，默认 0（不检测） */
     minWaypointDistance?: number;
-    /** 采样间隔（米），每隔多少米采样一次，默认 5 */
+    /** 采样间隔（米），每隔多少米采样一次，默认 10 */
     sampleInterval?: number;
+    /**
+     * 快速模式：减少射线检测数量以提升速度，默认 true
+     * - true: 8方向检测（速度快）
+     * - false: 16方向检测（精度高）
+     */
+    fastMode?: boolean;
 }
 /**
  * 航线安全检测器
@@ -2125,6 +2131,11 @@ declare class PathSafetyChecker {
     private CesiumNS;
     private viewer;
     constructor(CesiumNS: typeof Cesium, viewer: Cesium.Viewer);
+    /**
+     * 检测场景中是否有3D点云数据（Cesium3DTileset）
+     * @returns 是否存在点云数据
+     */
+    hasPointCloudData(): boolean;
     /**
      * 检测整条路径的安全性
      * @param positions 航点位置数组

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.33"};
+  version: "0.1.35"};
 
 // src/utils/version.ts
 var version = package_default.version;
@@ -2814,6 +2814,8 @@ var AirplaneCursor = class {
     __publicField(this, "angleStep");
     /** 加速倍率（按住 Shift 生效） */
     __publicField(this, "fastFactor");
+    /** 最小高度（米） */
+    __publicField(this, "minHeight");
     /** 外部传入的行为配置与回调 */
     __publicField(this, "opts");
     // 使用内联的 _FrustumPyramid
@@ -2841,6 +2843,7 @@ var AirplaneCursor = class {
     this.step = opts.stepMeters ?? 2;
     this.angleStep = opts.angleStepDeg ?? 1;
     this.fastFactor = opts.fastFactor ?? 5;
+    this.minHeight = opts.minHeight ?? 0;
     this.currentFOV = opts.fovDeg ?? 50;
     this.ensureEntity(opts.color ?? C.Color.CYAN.withAlpha(0.9));
     this.attachKeyboard(opts);
@@ -3064,8 +3067,12 @@ var AirplaneCursor = class {
         moved = true;
       }
       if (this.keysPressed.has("z")) {
-        setPos(addVec(pose.position, C.Cartesian3.multiplyByScalar(u3, -step, new C.Cartesian3())));
-        moved = true;
+        const newPos = addVec(pose.position, C.Cartesian3.multiplyByScalar(u3, -step, new C.Cartesian3()));
+        const newCarto = C.Cartographic.fromCartesian(newPos);
+        if (newCarto && newCarto.height >= this.minHeight) {
+          setPos(newPos);
+          moved = true;
+        }
       }
       if (this.keysPressed.has("q")) {
         pose.heading = clampDeg(pose.heading - ang);
@@ -3938,6 +3945,7 @@ var VertexDragHandler = class {
     __publicField(this, "CesiumNS");
     __publicField(this, "viewer");
     __publicField(this, "hiddenClimbIndex");
+    __publicField(this, "minHeight");
     __publicField(this, "callbacks");
     __publicField(this, "dragState", null);
     __publicField(this, "canvas");
@@ -3946,6 +3954,7 @@ var VertexDragHandler = class {
     this.CesiumNS = options.CesiumNS;
     this.viewer = options.viewer;
     this.hiddenClimbIndex = options.hiddenClimbIndex;
+    this.minHeight = options.minHeight ?? 0;
     this.callbacks = callbacks;
     this.canvas = this.viewer.scene.canvas;
     this.setupKeyboardListeners();
@@ -4121,7 +4130,7 @@ var VertexDragHandler = class {
       const cameraHeight = this.viewer.camera.positionCartographic.height;
       const scaleFactor = Math.max(cameraHeight / 1e3, 0.5);
       const heightDelta = -deltaY * scaleFactor;
-      const newHeight = Math.max(0, this.dragState.startHeight + heightDelta);
+      const newHeight = Math.max(this.minHeight, this.dragState.startHeight + heightDelta);
       const newPosition = C.Cartesian3.fromDegrees(
         this.dragState.startLonLat.lon,
         this.dragState.startLonLat.lat,
@@ -4228,7 +4237,8 @@ var PathEditingEventHandler = class {
       {
         CesiumNS: this.CesiumNS,
         viewer: this.viewer,
-        hiddenClimbIndex: this.hiddenClimbIndex
+        hiddenClimbIndex: this.hiddenClimbIndex,
+        minHeight: options.minHeight
       },
       {
         onDragStart: (index) => {
@@ -5279,7 +5289,9 @@ function startPathEditing(CesiumNS, viewer, entityOrId, options) {
           }
         },
         // frustumLengthFactor: options?.preview?.lengthFactor ?? 0.3,
-        fovDeg: options?.preview?.fov ?? 50
+        fovDeg: options?.preview?.fov ?? 50,
+        minHeight: options?.minHeight
+        // 传递最小高度限制
       });
       if (options?.preview?.enabled !== false && airplaneCursor) {
         preview = new PathPreview(CesiumNS, viewer, {
@@ -5323,7 +5335,8 @@ function startPathEditing(CesiumNS, viewer, entityOrId, options) {
     {
       CesiumNS,
       viewer,
-      hiddenClimbIndex
+      hiddenClimbIndex,
+      minHeight: options?.minHeight
     },
     {
       onVertexSelect: (index) => setActiveIndex(index),
@@ -10926,6 +10939,21 @@ var PathSafetyChecker = class {
     this.CesiumNS = CesiumNS;
     this.viewer = viewer;
   }
+  /**
+   * 检测场景中是否有3D点云数据（Cesium3DTileset）
+   * @returns 是否存在点云数据
+   */
+  hasPointCloudData() {
+    const primitives = this.viewer.scene.primitives;
+    for (let i = 0; i < primitives.length; i++) {
+      const primitive = primitives.get(i);
+      if (primitive && (primitive.constructor?.name === "Cesium3DTileset" || primitive._url !== void 0 || // 我们自己加载的带 _url 标记
+      primitive.tileset !== void 0)) {
+        return true;
+      }
+    }
+    return false;
+  }
   /**
    * 检测整条路径的安全性
    * @param positions 航点位置数组
@@ -10936,17 +10964,21 @@ var PathSafetyChecker = class {
     const terrainSafetyDistance = options?.terrainSafetyDistance ?? defaultDistance;
     const pointCloudSafetyDistance = options?.pointCloudSafetyDistance ?? defaultDistance;
     const minWaypointDistance = options?.minWaypointDistance ?? 0;
-    const sampleInterval = options?.sampleInterval ?? 5;
+    const sampleInterval = options?.sampleInterval ?? 10;
+    const fastMode = options?.fastMode ?? true;
     const results = [];
     const startSegment = 1 ;
+    const hasPointCloud = this.hasPointCloudData();
+    const effectivePointCloudSafetyDistance = hasPointCloud ? pointCloudSafetyDistance : 0;
     console.log("=".repeat(60));
     console.log("[PathSafetyChecker] \u5F00\u59CB\u5B89\u5168\u68C0\u6D4B");
     console.log(`  \u5730\u5F62\u5B89\u5168\u8DDD\u79BB: ${terrainSafetyDistance}m`);
-    console.log(`  \u70B9\u4E91\u5B89\u5168\u8DDD\u79BB: ${pointCloudSafetyDistance}m`);
+    console.log(`  \u70B9\u4E91\u5B89\u5168\u8DDD\u79BB: ${pointCloudSafetyDistance}m${!hasPointCloud ? " (\u573A\u666F\u65E0\u70B9\u4E91\u6570\u636E\uFF0C\u8DF3\u8FC7\u68C0\u6D4B)" : ""}`);
     if (minWaypointDistance > 0) {
       console.log(`  \u822A\u70B9\u95F4\u6700\u5C0F\u8DDD\u79BB: ${minWaypointDistance}m`);
     }
     console.log(`  \u91C7\u6837\u95F4\u9694: ${sampleInterval}m`);
+    console.log(`  \u68C0\u6D4B\u6A21\u5F0F: ${fastMode ? "\u5FEB\u901F(8\u65B9\u5411)" : "\u7CBE\u786E(16\u65B9\u5411)"}`);
     console.log(`  \u822A\u70B9\u603B\u6570: ${positions.length}`);
     console.log(`  \u68C0\u6D4B\u822A\u6BB5: ${startSegment} ~ ${positions.length - 2}`);
     console.log("=".repeat(60));
@@ -10962,9 +10994,11 @@ var PathSafetyChecker = class {
         i,
         i + 1,
         terrainSafetyDistance,
-        pointCloudSafetyDistance,
+        effectivePointCloudSafetyDistance,
+        // 使用有效的点云安全距离（无点云时为0，跳过检测）
         minWaypointDistance,
-        sampleInterval
+        sampleInterval,
+        fastMode
       );
       results.push(segmentResult);
       const terrainStatus = segmentResult.minTerrainDistance < 0 ? "\u2753" : segmentResult.isTerrainSafe ? "\u2705" : "\u26A0\uFE0F";
@@ -11018,7 +11052,7 @@ var PathSafetyChecker = class {
    * 检测单个航段的安全性
    * 支持多方向检测（上下左右前后6方向）和按间隔采样
    */
-  checkSegment(from, to, fromIndex, toIndex, terrainSafetyDistance, pointCloudSafetyDistance, minWaypointDistance, sampleInterval) {
+  checkSegment(from, to, fromIndex, toIndex, terrainSafetyDistance, pointCloudSafetyDistance, minWaypointDistance, sampleInterval, fastMode = true) {
     const C = this.CesiumNS;
     const scene = this.viewer.scene;
     const dangerPoints = [];
@@ -11066,7 +11100,7 @@ var PathSafetyChecker = class {
         }
         const up2 = C.Cartesian3.cross(right, forward, new C.Cartesian3());
         C.Cartesian3.normalize(up2, up2);
-        const numDirections = 16;
+        const numDirections = fastMode ? 8 : 16;
         for (let d = 0; d < numDirections; d++) {
           const angle = d / numDirections * Math.PI * 2;
           const outwardDir = new C.Cartesian3();
@@ -11080,40 +11114,37 @@ var PathSafetyChecker = class {
           C.Cartesian3.add(samplePoint, surfacePoint, surfacePoint);
           const inwardDir = C.Cartesian3.negate(outwardDir, new C.Cartesian3());
           const ray = new C.Ray(surfacePoint, inwardDir);
-          const intersections = scene.drillPickFromRay(ray, 10);
-          for (const intersection of intersections || []) {
-            if (!intersection?.position) continue;
-            const primitive = intersection.object?.primitive;
-            const primitiveName = primitive?.constructor?.name || "";
-            if (primitiveName === "Polyline" || primitiveName === "PointPrimitive" || primitiveName === "PointPrimitiveCollection" || primitiveName === "Billboard" || primitiveName === "Label" || primitiveName === "Cylinder" || primitiveName === "Ellipse" || primitiveName === "Model" || primitiveName === "ModelExperimental" || primitiveName === "Globe" || primitiveName === "GlobeSurfaceTile") {
-              continue;
-            }
-            if (primitiveName === "Primitive" && primitive?.appearance) {
-              const appearanceName = primitive.appearance?.constructor?.name || "";
-              if (appearanceName === "PerInstanceColorAppearance" || appearanceName === "MaterialAppearance" || appearanceName === "EllipsoidSurfaceAppearance") {
-                continue;
-              }
-            }
-            const is3DTiles = primitive?.tileset !== void 0 || primitive?._tileset !== void 0 || intersection.object?.content?.tileset !== void 0;
-            if (!is3DTiles && primitiveName !== "Cesium3DTilePointFeature") {
+          const intersection = scene.pickFromRay(ray);
+          if (!intersection?.position) continue;
+          const primitive = intersection.object?.primitive;
+          const primitiveName = primitive?.constructor?.name || "";
+          if (primitiveName === "Polyline" || primitiveName === "PointPrimitive" || primitiveName === "PointPrimitiveCollection" || primitiveName === "Billboard" || primitiveName === "Label" || primitiveName === "Cylinder" || primitiveName === "Ellipse" || primitiveName === "Model" || primitiveName === "ModelExperimental" || primitiveName === "Globe" || primitiveName === "GlobeSurfaceTile") {
+            continue;
+          }
+          if (primitiveName === "Primitive" && primitive?.appearance) {
+            const appearanceName = primitive.appearance?.constructor?.name || "";
+            if (appearanceName === "PerInstanceColorAppearance" || appearanceName === "MaterialAppearance" || appearanceName === "EllipsoidSurfaceAppearance") {
               continue;
             }
-            if (i === 0 && d === 0) {
-              console.log("[\u8C03\u8BD5] \u68C0\u6D4B\u5230\u70B9\u4E91\u5BF9\u8C61:", primitiveName);
-              console.log("[\u8C03\u8BD5] primitive:", primitive);
-            }
-            const distFromCenter = C.Cartesian3.distance(samplePoint, intersection.position);
-            minPointCloudDistance = Math.min(minPointCloudDistance, distFromCenter);
-            if (distFromCenter < pointCloudSafetyDistance) {
-              const alreadyAdded = dangerPoints.some(
-                (p) => C.Cartesian3.distance(p, samplePoint) < 0.1
-              );
-              if (!alreadyAdded) {
-                dangerPoints.push(C.Cartesian3.clone(samplePoint));
-                console.log(`[\u5371\u9669] \u91C7\u6837\u70B9 ${i}, \u65B9\u5411 ${d}: \u70B9\u4E91(${primitiveName})\u5728\u5706\u67F1\u4F53\u5185\uFF0C\u8DDD\u4E2D\u5FC3 ${distFromCenter.toFixed(1)}m`);
-              }
+          }
+          const is3DTiles = primitive?.tileset !== void 0 || primitive?._tileset !== void 0 || intersection.object?.content?.tileset !== void 0;
+          if (!is3DTiles && primitiveName !== "Cesium3DTilePointFeature") {
+            continue;
+          }
+          if (i === 0 && d === 0) {
+            console.log("[\u8C03\u8BD5] \u68C0\u6D4B\u5230\u70B9\u4E91\u5BF9\u8C61:", primitiveName);
+            console.log("[\u8C03\u8BD5] primitive:", primitive);
+          }
+          const distFromCenter = C.Cartesian3.distance(samplePoint, intersection.position);
+          minPointCloudDistance = Math.min(minPointCloudDistance, distFromCenter);
+          if (distFromCenter < pointCloudSafetyDistance) {
+            const alreadyAdded = dangerPoints.some(
+              (p) => C.Cartesian3.distance(p, samplePoint) < 0.1
+            );
+            if (!alreadyAdded) {
+              dangerPoints.push(C.Cartesian3.clone(samplePoint));
+              console.log(`[\u5371\u9669] \u91C7\u6837\u70B9 ${i}, \u65B9\u5411 ${d}: \u70B9\u4E91(${primitiveName})\u5728\u5706\u67F1\u4F53\u5185\uFF0C\u8DDD\u4E2D\u5FC3 ${distFromCenter.toFixed(1)}m`);
             }
-            break;
           }
         }
       } catch (e) {