@kq_npm/client3d_webgl_vue 4.5.43 → 4.5.44

package/shadowanalysis/index.js

@@ -398,6 +398,7 @@ class ShadowAnalysisViewModel {
 
   // 清除全部结果
   clear() {
+    this._globaOptions._drawManager?.clearDrawGroup("ShadowAnalysisDraw");
     this._globaOptions._drawManager && this._globaOptions._drawManager.stopDraw();
     if (this._shadowAnalysis) {
       this._globaOptions.viewer.scene.primitives.remove(this._shadowAnalysis);

package/sightlineanalysis/index.js

@@ -553,11 +553,11 @@ class SightlineAnalysisViewModel {
   _billboards = []; // 点位图标billboards集合
   _language = null;
 
-  constructor(scenceView, options, language) {
+  constructor(scenceView, options) {
     this._viewer = scenceView._viewer;
     this._viewer.scene.postProcessStages._fxaa.enabled = true;
     this._viewer.scene.globe.depthTestAgainstTerrain = true; //开启深度检测
-    this._language = language;
+    this._language = scenceView._language;
     options.viewer = this._viewer;
     if (options.visibleColor) {
       options.visibleColor = Cesium.Color.fromCssColorString(options.visibleColor);
@@ -615,7 +615,7 @@ class SightlineAnalysisViewModel {
                 </div>`;
       html = html.replace('{X}', longitude).replace('{Y}', latitude).replace('{Z}', height);
       if (this._language) {
-        html = html.replace('X', this._language.value.longitude).replace('Y', this._language.value.latitude).replace('Z', this._language.value.elevation);
+        html = html.replace('X', this._language.longitude).replace('Y', this._language.latitude).replace('Z', this._language.elevation);
       }
 
       var divpoint = new Cesium.Kq3dHtmlTag(this._viewer, {
@@ -682,6 +682,7 @@ class SightlineAnalysisViewModel {
   addSeePoint() {
     let that = this;
     this._addType = 1;
+    if(!this._drawManager) return;
     this._drawManager.startDraw("point", { image: const_image_.OBSERVATION_POINT }, (feature, { shape }) => {
       if (!shape.groupName || shape.groupName !== "SightlineAnalysisDraw") return;
       if (shape && shape.type === "marker") {
@@ -706,6 +707,7 @@ class SightlineAnalysisViewModel {
     let that = this;
     if (!this._sightlineAnalysis._seePoint) return;
     this._addType = 2;
+    if(!this._drawManager) return;
     this._drawManager.startDraw("point", { image: const_image_.TARGET_POINT }, (feature, { shape }) => {
       if (!shape.groupName || shape.groupName !== "SightlineAnalysisDraw") return;
       if (shape && shape.type === "marker") {
@@ -721,7 +723,7 @@ class SightlineAnalysisViewModel {
           that.highlightObstacles(result.id);
         }
       }
-      that._drawManager && that._drawManager.clearDrawGroup("SightlineAnalysisDraw");
+      that._drawManager.clearDrawGroup("SightlineAnalysisDraw");
     }, "SightlineAnalysisDraw", true);
   }
 
@@ -746,7 +748,8 @@ class SightlineAnalysisViewModel {
   }
   //清除全部
   clearAll() {
-    this._drawManager.stopDraw();
+    this._drawManager?.clearDrawGroup("SightlineAnalysisDraw");
+    this._drawManager?.stopDraw();
     this.clearDisplay();
     this.clearHighlights();
     this.clearBillboards();
@@ -921,7 +924,7 @@ headerTempTitle.value = language.value.sightlineAnalysis;
         obstacleColor: formItem.obstacleColor,
         isLabel: formItem.isLabel
       };
-      viewModel = new SightlineAnalysisViewModel(scenceView, options, language);
+      viewModel = new SightlineAnalysisViewModel(scenceView, options);
     }
   });
 });

package/slopeanalysis/index.js

@@ -267,7 +267,7 @@ class SlopeAnalysisViewModel {
       slopeAnalysis: viewModel.slopeAnalysis,
     };
     this._globaOptions.viewer.scene.globe.depthTestAgainstTerrain = true; //开启深度检测
-    // this._globaOptions.viewer.scene.globe.enableLighting = true;
+    this._globaOptions.viewer.scene.globe.enableLighting = true;
     this._globaOptions._drawManager = scenceView._drawManager;
     // that._slopeAnalysis = new Cesium.Kq3dSlope({
     //   viewer: that._globaOptions.viewer,
@@ -474,12 +474,14 @@ class SlopeAnalysisViewModel {
   }
   // 清除全部结果
   clear() {
+    this._globaOptions._drawManager?.clearDrawGroup("SlopeAnalysisDraw");
     this._globaOptions._drawManager && this._globaOptions._drawManager.stopDraw();
     this._slopeAnalysis && this._slopeAnalysis.destroy();
     this._slopeAnalysis = null;
   }
   // 销毁
   destroy() {
+    this._globaOptions.viewer.scene.globe.enableLighting = false;
     this._slopeAnalysis && this._slopeAnalysis.destroy();
     this._slopeAnalysis = null;
   }

package/slopeaspectanalysis/index.js

@@ -248,6 +248,8 @@ class SlopeAspectAnalysisViewModel {
   ];
   _scenceView = null;
   _restrictedArea = null;
+  // 开启光阴
+  _showEnableLighting = false;
   constructor(scenceView, viewModel) {
     this._language = scenceView._language;
     this._globaOptions.viewer = scenceView._viewer;
@@ -269,11 +271,9 @@ class SlopeAspectAnalysisViewModel {
       slopeColorAlpha: viewModel.slopeColorAlpha,
       colorImage: this.getImagePath(viewModel.colorImage),
     };
+    this._showEnableLighting = this._globaOptions.viewer.scene.globe.enableLighting;
     this._globaOptions.viewer.scene.globe.depthTestAgainstTerrain = true; //开启深度检测
-    // this._globaOptions.viewer.scene.globe.enableLighting = true;
-    this._globaOptions.viewer.scene.logarithmicDepthBuffer = true;
-    this._globaOptions.viewer.scene.pickTranslucentDepth = true;
-    this._globaOptions.viewer.scene._environmentState.renderTranslucentDepthForPick = true;
+    this._globaOptions.viewer.scene.globe.enableLighting = true;
 
     this._globaOptions._drawManager = scenceView._drawManager;
     // 坡度对象
@@ -304,6 +304,9 @@ class SlopeAspectAnalysisViewModel {
     }
     return imagePath;
   }
+  setCursor(style) {
+    this._globaOptions.viewer.canvas.style.cursor = style;
+  }
   // 开始分析
   start() {
     var that = this;
@@ -311,7 +314,9 @@ class SlopeAspectAnalysisViewModel {
     if (this._globaOptions.viewModel.viewer.terrainProvider.availability) {
       if (this._globaOptions.viewModel.viewer.terrainProvider && !this._globaOptions.viewModel.viewer.terrainProvider._heightmapStructure) {
         if (this._globaOptions && this._globaOptions.analysisMethod == 2) {
-          if(this._calculationSlopeAspect){
+          this._globaOptions.viewer.scene.globe.depthTestAgainstTerrain = true; //开启深度检测
+          this.setCursor("crosshair");
+          if(this._calculationSlopeAspect) {
             this._calculationSlopeAspect?.startCalculation();
           }else {
             this._calculationSlopeAspect = new Cesium.Kq3dCalculationSlopeAspect(this._globaOptions.calculationOption);
@@ -518,6 +523,7 @@ class SlopeAspectAnalysisViewModel {
     this._globaOptions.calculationOption["controlPointBorder"] = newValue;
   }
   stopCalculation(){
+    this.setCursor("default");
     this._calculationSlopeAspect?.stopCalculation?.();
   }
   removeCalculation() {
@@ -539,9 +545,10 @@ class SlopeAspectAnalysisViewModel {
   }
   // 销毁
   destroy() {
-    this._slopeAnalysis && this._slopeAnalysis.destroy();
+    that._globaOptions.viewer.scene.globe.enableLighting = this._showEnableLighting;
+    this._slopeAnalysis?.destroy?.();
     this._slopeAnalysis = null;
-    this._aspectAnalysis && this._aspectAnalysis.clear();
+    this._aspectAnalysis?.destroy?.() || this._aspectAnalysis?.clear?.();
     this._aspectAnalysis = null;
     this.destroyCalculation();
   }