@kq_npm/client3d_webgl_vue 4.5.43 → 4.5.44

package/terrainoperation/index.js

@@ -298,29 +298,31 @@ class TerrainOperationViewModel {
     if (this._globaOptions.viewer.terrainProvider.availability) {
       if (this._globaOptions.viewer.terrainProvider && !this._globaOptions.viewer.terrainProvider._heightmapStructure) {
         this.clear();
-        this._drawManager.startDraw("polygon", { clampToGround: true }, (feature, { shape }) => {
-          if (!shape.groupName || shape.groupName !== "TerrainOperationDraw") return;
-          if (shape) {
-            that._globaOptions.positions = shape._controlPoints;
-            if (that._terrainStyle === 1) {
-              that._positions.push(shape._controlPoints);
-              if (that._terrainexcavationext) {
-                that.setTerrainExcavationAddPolygon();
-              } else {
-                that.createTerrainExcavation(() => {
+        if(this._drawManager) {
+          this._drawManager.startDraw("polygon", { clampToGround: true }, (feature, { shape }) => {
+            if (!shape.groupName || shape.groupName !== "TerrainOperationDraw") return;
+            if (shape) {
+              that._globaOptions.positions = shape._controlPoints;
+              if (that._terrainStyle === 1) {
+                that._positions.push(shape._controlPoints);
+                if (that._terrainexcavationext) {
                   that.setTerrainExcavationAddPolygon();
-                });
-              }
-            } else if (that._terrainStyle === 2) {
-              if (that._terrainmodification) {
-                that.setTerrainModification();
-              } else {
-                that.createTerrainModification();
+                } else {
+                  that.createTerrainExcavation(() => {
+                    that.setTerrainExcavationAddPolygon();
+                  });
+                }
+              } else if (that._terrainStyle === 2) {
+                if (that._terrainmodification) {
+                  that.setTerrainModification();
+                } else {
+                  that.createTerrainModification();
+                }
               }
             }
-          }
-          that._drawManager && that._drawManager.clearDrawGroup("TerrainOperationDraw");
-        }, "TerrainOperationDraw");
+            that._drawManager.clearDrawGroup("TerrainOperationDraw");
+          }, "TerrainOperationDraw");
+        }
       } else {
         (0,message/* default */.A)({
           message: this._language["stkTerrainAnalysisTips"],
@@ -363,7 +365,8 @@ class TerrainOperationViewModel {
   }
   //清除全部结果
   clear() {
-    this._drawManager.stopDraw();
+    this._drawManager?.clearDrawGroup("TerrainOperationDraw");
+    this._drawManager?.stopDraw();
     // 销毁地形开挖
     if (this._terrainexcavationext) {
       this._terrainexcavationext.destroy();

package/terrainprofileanalysis/index.js

@@ -334,12 +334,12 @@ class TerrainProfileAnalysisViewModel {
     if (this._viewer.terrainProvider.availability) {
       if (this._viewer.terrainProvider && !this._viewer.terrainProvider._heightmapStructure) {
         this.clear();
-        this._drawManager.startDraw("polyline", { clampToGround: true }, (feature, { shape }) => {
+        this._drawManager?.startDraw("polyline", { clampToGround: true }, (feature, { shape }) => {
           if (!shape.groupName || shape.groupName !== "TerrainProfileAnalysisDraw") return;
           if (shape) {
             that._terrainSlopeAnalyse.positions = shape._controlPoints;
           }
-          that._drawManager && that._drawManager.clearDrawGroup("TerrainProfileAnalysisDraw");
+          that._drawManager.clearDrawGroup("TerrainProfileAnalysisDraw");
         }, "TerrainProfileAnalysisDraw");
       } else {
         (0,message/* default */.A)({
@@ -356,6 +356,7 @@ class TerrainProfileAnalysisViewModel {
   }
   //清除
   clear() {
+    this._drawManager?.clearDrawGroup("TerrainProfileAnalysisDraw");
     this._drawManager && this._drawManager.stopDraw();
     this._terrainSlopeAnalyse && this._terrainSlopeAnalyse.clear();
     for (let index = 0; index < this.divPointArr.length; index++) {

package/weathereffect/index.js

@@ -164,7 +164,7 @@ class WeatherEffectViewModel {
   _options = null; //天气特效存储参数对象
   _rainImage = const_image_.RAIN_URL; //雨图片url地址
   _snowImage = const_image_.SNOW_URL; //雪图片url地址
-
+  _language = null;
   constructor(scenceView) {
     scenceView._viewer.clock.shouldAnimate = true;
     scenceView._viewer.clock.multiplier = 0.6;
@@ -172,6 +172,7 @@ class WeatherEffectViewModel {
     this._scene = scenceView._viewer.scene;
     this._drawManager = scenceView._drawManager;
     _gravityScratch = new Cesium.Cartesian3();
+    this._language = scenceView._language;
   }
 
   applyGravity(particle, dt) {
@@ -194,7 +195,7 @@ class WeatherEffectViewModel {
     }
     if (options.gravity) this.setGravity(options.gravity);
     this._options = options;
-    this._drawManager.startDraw("marker", { image: null }, (feature, { shape }) => {
+    this._drawManager?.startDraw("marker", { image: null }, (feature, { shape }) => {
       if (!shape.groupName || shape.groupName !== "WeatherEffectDraw") return;
       if (shape && shape.type === "marker") {
         let position = shape.position;
@@ -230,14 +231,14 @@ class WeatherEffectViewModel {
           }
         }
       }
-      that._drawManager && that._drawManager.clearDrawGroup("WeatherEffectDraw");
+      that._drawManager?.clearDrawGroup("WeatherEffectDraw");
     }, "WeatherEffectDraw");
   }
 
   //清除天气特效
   clear() {
-    this._drawManager.stopDraw();
-    this._drawManager && this._drawManager.clearDrawGroup("WeatherEffectDraw");
+    this._drawManager?.stopDraw();
+    this._drawManager?.clearDrawGroup("WeatherEffectDraw");
     this._particleSystem && this._scene.primitives.remove(this._particleSystem);
     this._particleSystem = null;
   }