zywlgis 0.5.41 → 0.5.43

package/dist/ZYWLGIS.es.js

@@ -134765,7 +134765,10 @@ class k {
     let i = e.map(async (r) => {
       if (t === Cesium.ClassificationType.BOTH || t === Cesium.ClassificationType.CESIUM_3D_TILE) {
         let s = this.transformCartographic(r);
-        return s.height = A.scene.sampleHeight(s), this.transformCartesian3(s);
+        return A.scene.sampleHeight(s) === void 0 ? s = (await this.calculateTerrainHeight(
+          A,
+          r
+        )).position : s.height = A.scene.sampleHeight(s), this.transformCartesian3(s);
       } else return t === Cesium.ClassificationType.TERRAIN ? (await this.calculateTerrainHeight(
         A,
         r
@@ -161058,7 +161061,7 @@ function MoA(...n) {
   return new IoA(...n);
 }
 MoA.localizePositions = IoA.localizePositions;
-const WqA = "0.5.41", _qA = {
+const WqA = "0.5.43", _qA = {
   version: WqA
 }, hU = {
   POINTERMOVE: "pointermove",
@@ -165842,12 +165845,14 @@ class QWA {
           geometryInstances: w,
           appearance: u,
           show: this.visible_,
-          asynchronous: !1
+          asynchronous: !1,
+          releaseGeometryInstances: !1
         }) : c = new Cesium.Primitive({
           geometryInstances: w,
           appearance: u,
           show: this.visible_,
-          asynchronous: !1
+          asynchronous: !1,
+          releaseGeometryInstances: !1
         });
         const Q = new Cesium.PolylineMaterialAppearance({
           material: new Cesium.Material({
@@ -165873,7 +165878,8 @@ class QWA {
             geometryInstances: v,
             appearance: Q,
             show: this.visible_,
-            asynchronous: !1
+            asynchronous: !1,
+            releaseGeometryInstances: !1
           });
         } else {
           const v = new Cesium.GeometryInstance({
@@ -165887,7 +165893,8 @@ class QWA {
             geometryInstances: v,
             appearance: Q,
             show: this.visible_,
-            asynchronous: !1
+            asynchronous: !1,
+            releaseGeometryInstances: !1
           });
         }
         this.geometryInstance_ && g.remove(this.geometryInstance_), c && (this.geometryInstance_ = g.add(c)), this.geometryOutlineInstance_ && g.remove(this.geometryOutlineInstance_), h && (this.geometryOutlineInstance_ = g.add(
@@ -166354,6 +166361,10 @@ class fWA {
   stopTime_ = void 0;
   velocityOrientationProperty_ = void 0;
   initLoadModel_ = !0;
+  isJudgmentVisual_ = !1;
+  // 是否启用视锥判断（控制是否启用视锥判断）
+  boundingSphere_ = void 0;
+  // 视锥判断的包围球
   /**
    * 构造函数
    * @param {string} containerID - 地图容器ID
@@ -166391,7 +166402,7 @@ class fWA {
       this.clear();
       return;
     }
-    this.visible_ = this.data_?.visible ?? !0, this.isClampToGround_ = this.data_?.isClampToGround ?? !1, this.isHighlight_ = this.data_?.isHighlight ?? !1, this.isInterpolation_ = this.data_?.isInterpolation ?? !1;
+    this.isJudgmentVisual_ = this.data_?.isJudgmentVisual ?? !1, this.visible_ = this.data_?.visible ?? !0, this.isClampToGround_ = this.data_?.isClampToGround ?? !1, this.isHighlight_ = this.data_?.isHighlight ?? !1, this.isInterpolation_ = this.data_?.isInterpolation ?? !1;
     const A = k.getMapEngineInstance(this.containerID_);
     let e = [], t = !1, i = !1;
     const r = this.data_.coordinates;
@@ -166407,13 +166418,38 @@ class fWA {
       this.reDrawCenterLabel(o.position), this.reDrawCenterHTML(o.position);
     } else
       this.reDrawCenterLabel(s.position), this.reDrawCenterHTML(s.position);
-    if (t || this.clearCustomLabel(), i || this.clearCustomHTML(), !(!t && !i))
-      if (this.isClampToGround_) {
-        const o = await k.getTerrainHeights(A, r);
-        this.reDrawCustomLabel(o.positions), this.reDrawCustomHTML(o.positions);
-      } else
-        this.reDrawCustomLabel(e), this.reDrawCustomHTML(e);
+    if (t || this.clearCustomLabel(), i || this.clearCustomHTML(), !t && !i) {
+      this.judgmentVisual();
+      return;
+    }
+    if (this.isClampToGround_) {
+      const o = await k.getTerrainHeights(A, r);
+      this.reDrawCustomLabel(o.positions), this.reDrawCustomHTML(o.positions);
+    } else
+      this.reDrawCustomLabel(e), this.reDrawCustomHTML(e);
+    this.judgmentVisual();
   }
+  judgmentVisual = () => {
+    if (!(!this.isJudgmentVisual_ || !this.visible_) && window.cameraCullingVolume) {
+      this.boundingSphere_ || (this.boundingSphere_ = Cesium.BoundingSphere.fromPoints(
+        this.geometryInstance_?.geometryInstances?.geometry?._positions
+      ));
+      const A = window.cameraCullingVolume.computeVisibility(
+        this.boundingSphere_
+      );
+      let e = !0;
+      if (A === Cesium.Intersect.OUTSIDE && (e = !1), this.geometryInstance_ && (this.geometryInstance_.show = e), this.modelInstance_) {
+        const t = PA.cloneDeep(this.modelInstance_.data_);
+        t.visible = e, t?.frustum?.visible && (t.frustum.visible = e), this.modelInstance_.DataProcessing(t);
+      }
+      if (this.centerLabelInstance_ && (this.centerLabelInstance_.show = e), this.centerHTMLInstance_ && (e ? this.centerHTMLInstance_.presentationMode_ === 1 || this.centerHTMLInstance_.presentationMode_ === 2 && this.centerHTMLInstance_.isHighlight ? this.centerHTMLInstance_.show() : this.centerHTMLInstance_.hide() : this.centerHTMLInstance_.hide()), Array.isArray(this.customLabelInstances_))
+        for (const t of this.customLabelInstances_)
+          t.primitive.show = e;
+      if (Array.isArray(this.customHTMLInstances_))
+        for (const t of this.customHTMLInstances_)
+          e && (t.presentationMode_ === 1 || t.presentationMode_ === 2 && t.isHighlight) ? t.show() : t.hide();
+    }
+  };
   /**
    * 创建虚线几何图元
    * @param {Cesium.Viewer} cesiumViewer - Cesium视图实例
@@ -166449,8 +166485,8 @@ class fWA {
         }
       }
     });
-    var o, a;
-    this.isClampToGround_ ? (o = A.scene.groundPrimitives, a = new Cesium.GroundPolylinePrimitive({
+    var o;
+    this.isClampToGround_ ? o = new Cesium.GroundPolylinePrimitive({
       geometryInstances: new Cesium.GeometryInstance({
         id: t,
         geometry: new Cesium.GroundPolylineGeometry({
@@ -166462,8 +166498,9 @@ class fWA {
         material: s
       }),
       show: this.visible_,
-      asynchronous: !1
-    })) : (o = A.scene.primitives, a = new Cesium.Primitive({
+      asynchronous: !1,
+      releaseGeometryInstances: !1
+    }) : o = new Cesium.Primitive({
       geometryInstances: new Cesium.GeometryInstance({
         id: t,
         geometry: new Cesium.PolylineGeometry({
@@ -166475,8 +166512,11 @@ class fWA {
         material: s
       }),
       show: this.visible_,
-      asynchronous: !1
-    })), this.geometryInstance_ && o.remove(this.geometryInstance_), this.geometryInstance_ = o.add(a);
+      asynchronous: !1,
+      releaseGeometryInstances: !1
+    });
+    const a = A.scene.primitives;
+    this.geometryInstance_ && a.remove(this.geometryInstance_), this.geometryInstance_ = a.add(o);
   }
   /**
    * 创建模型动画
@@ -166773,8 +166813,7 @@ class fWA {
     this.clearGeometry(), this.clearModel(), this.clearCenterLabel(), this.clearCenterHTML(), this.clearCustomLabel(), this.clearCustomHTML();
   };
   clearGeometry = () => {
-    let A = k.getMapEngineInstance(this.containerID_);
-    this.geometryInstance_ && A && A?.scene && A?.scene?.primitives && (this.isClampToGround_ ? A.scene.groundPrimitives.remove(this.geometryInstance_) : A.scene.primitives.remove(this.geometryInstance_)), this.geometryInstance_ = void 0;
+    this.geometryInstance_ && k.getMapEngineInstance(this.containerID_).scene.primitives.remove(this.geometryInstance_), this.geometryInstance_ = void 0;
   };
   clearModel = () => {
     this.modelInstance_ && this.modelInstance_.clear(), this.modelInstance_ = void 0, this.sampledPosition_ && (this.sampledPosition_ = void 0);
@@ -167501,6 +167540,7 @@ class CWA {
         appearance: c,
         show: this.visible_,
         asynchronous: !1,
+        releaseGeometryInstances: !1,
         classificationType: Cesium.ClassificationType.TERRAIN
       }), P = new Cesium.GroundPolylinePrimitive({
         geometryInstances: new Cesium.GeometryInstance({
@@ -167513,6 +167553,7 @@ class CWA {
         appearance: h,
         show: this.visible_,
         asynchronous: !1,
+        releaseGeometryInstances: !1,
         classificationType: Cesium.ClassificationType.TERRAIN
       })) : (D = new Cesium.Primitive({
         geometryInstances: new Cesium.GeometryInstance({
@@ -167525,7 +167566,8 @@ class CWA {
         }),
         appearance: c,
         show: this.visible_,
-        asynchronous: !1
+        asynchronous: !1,
+        releaseGeometryInstances: !1
       }), P = new Cesium.Primitive({
         geometryInstances: new Cesium.GeometryInstance({
           id: i,
@@ -167536,7 +167578,8 @@ class CWA {
         }),
         appearance: h,
         show: this.visible_,
-        asynchronous: !1
+        asynchronous: !1,
+        releaseGeometryInstances: !1
       })), this.geometryInstance_ && l.remove(this.geometryInstance_), this.geometryInstance_ = l.add(D), this.geometryOutlineInstance_ && l.remove(this.geometryOutlineInstance_), this.geometryOutlineInstance_ = l.add(P);
     } else {
       this.clearGeometry();
@@ -171815,12 +171858,14 @@ class BWA {
           appearance: h,
           show: this.visible_,
           asynchronous: !1,
+          releaseGeometryInstances: !1,
           classificationType: this.isClampTo3DTILE_ ? Cesium.ClassificationType.BOTH : Cesium.ClassificationType.TERRAIN
         }) : D = new Cesium.Primitive({
           geometryInstances: g,
           appearance: h,
           show: this.visible_,
-          asynchronous: !1
+          asynchronous: !1,
+          releaseGeometryInstances: !1
         });
         const u = new Cesium.PolylineMaterialAppearance({
           material: new Cesium.Material({
@@ -171847,6 +171892,7 @@ class BWA {
             appearance: u,
             show: this.visible_,
             asynchronous: !1,
+            releaseGeometryInstances: !1,
             classificationType: this.isClampTo3DTILE_ ? Cesium.ClassificationType.BOTH : Cesium.ClassificationType.TERRAIN
           });
         } else {
@@ -171861,7 +171907,8 @@ class BWA {
             geometryInstances: w,
             appearance: u,
             show: this.visible_,
-            asynchronous: !1
+            asynchronous: !1,
+            releaseGeometryInstances: !1
           });
         }
         this.geometryInstance_ && c.remove(this.geometryInstance_), D && (this.geometryInstance_ = c.add(D)), this.geometryOutlineInstance_ && c.remove(this.geometryOutlineInstance_), P && (this.geometryOutlineInstance_ = c.add(
@@ -177444,12 +177491,14 @@ class xWA {
           appearance: v,
           show: this.visible_,
           asynchronous: !1,
+          releaseGeometryInstances: !1,
           classificationType: this.isClampTo3DTILE_ ? Cesium.ClassificationType.BOTH : Cesium.ClassificationType.TERRAIN
         }) : u = new Cesium.Primitive({
           geometryInstances: E,
           appearance: v,
           show: this.visible_,
-          asynchronous: !1
+          asynchronous: !1,
+          releaseGeometryInstances: !1
         }), this.isClampToGround_ || this.isClampTo3DTILE_) {
           const p = new Cesium.GeometryInstance({
             id: i,
@@ -177463,6 +177512,7 @@ class xWA {
             appearance: this.polylineAppearance,
             show: this.visible_,
             asynchronous: !1,
+            releaseGeometryInstances: !1,
             classificationType: this.isClampTo3DTILE_ ? Cesium.ClassificationType.BOTH : Cesium.ClassificationType.TERRAIN
           });
         } else {
@@ -177477,7 +177527,8 @@ class xWA {
             geometryInstances: p,
             appearance: this.polylineAppearance,
             show: this.visible_,
-            asynchronous: !1
+            asynchronous: !1,
+            releaseGeometryInstances: !1
           });
         }
         this.geometryInstance_ && Q.remove(this.geometryInstance_), u && (this.geometryInstance_ = Q.add(u)), this.geometryOutlineInstance_ && Q.remove(this.geometryOutlineInstance_), w && (this.geometryOutlineInstance_ = Q.add(
@@ -195898,25 +195949,25 @@ const xte = (n, A) => {
         e.directionWC,
         e.upWC
       )), !window.isStartMapModeChange) {
-        const l = A.canvas, D = e.pickEllipsoid(
-          new Cesium.Cartesian2(l.width / 2, l.height / 2)
-        ), P = k.transformCoordinate(D);
-        P && (this.MapEngine_Temp.center = {
-          longitude: P.longitude,
-          latitude: P.latitude
+        const D = A.canvas, P = e.pickEllipsoid(
+          new Cesium.Cartesian2(D.width / 2, D.height / 2)
+        ), c = k.transformCoordinate(P);
+        c && (this.MapEngine_Temp.center = {
+          longitude: c.longitude,
+          latitude: c.latitude
         });
       }
       !this.isLoadInitMapTerrainHeight && window.mousePosition && k.getTerrainHeight(n, window.mousePosition).then(
-        (l) => {
-          window.mousePosition = l.position, this.isLoadInitMapTerrainHeight = !0, this.initializeMap || (this.setMapEngineStateBar(), this.refreshZoom());
+        (D) => {
+          window.mousePosition = D.position, this.isLoadInitMapTerrainHeight = !0, this.initializeMap || (this.setMapEngineStateBar(), this.refreshZoom());
         }
       ), this.MapEngine_Temp.camera = {
         heading: parseInt(Cesium.Math.toDegrees(e.heading)),
         pitch: parseInt(Cesium.Math.toDegrees(e.pitch))
       }, window.isOpenSyncZoomLensCamera || (this.syncZoom(k.getZoom(this.containerID)), this.setMapEngineStateBar(), this.refreshZoom());
-      const t = k.getAnnotations(), i = k.getModels(), r = k.getPipeLines(), s = k.getCustomNoFlyZones(), o = k.getAirRoutes(), a = k.getNoFlys();
-      for (const l of [...t.values(), ...i.values(), ...r.values(), ...s.values(), ...o.values(), ...a.values()])
-        l.hasOwnProperty("judgmentVisual") && l?.isJudgmentVisual_ && l.judgmentVisual();
+      const t = k.getAnnotations(), i = k.getModels(), r = k.getPipeLines(), s = k.getCustomNoFlyZones(), o = k.getAirRoutes(), a = k.getNoFlys(), l = k.getFlightPaths();
+      for (const D of [...t.values(), ...i.values(), ...r.values(), ...s.values(), ...o.values(), ...a.values(), ...l.values()])
+        D.hasOwnProperty("judgmentVisual") && D?.isJudgmentVisual_ && D.judgmentVisual();
     },
     cesiumScenePostRender(n) {
       this.stats && this.stats.update();
@@ -196937,7 +196988,7 @@ const xte = (n, A) => {
           }
         ).then((a) => {
           console.log("新增完成");
-        }), console.log(`新增了${n}数据>>>>>>>>>>`, o));
+        }), console.log(`新增了${n}数据>>>>>>>>>>`, o), alert("加载完成"));
       });
     },
     async setZYWLAnnotations(n, A) {