@kq_npm/client3d_webgl_vue 0.5.5-beta → 0.5.6-beta

package/index.js

@@ -982,10 +982,14 @@ var webmapservice_namespaceObject = require("@kq_npm/client_common_vue/_utils/we
 var webmapservice_default = /*#__PURE__*/__webpack_require__.n(webmapservice_namespaceObject);
 ;// CONCATENATED MODULE: external "@kq_npm/client_common_vue/_utils/util"
 var util_namespaceObject = require("@kq_npm/client_common_vue/_utils/util");
+;// CONCATENATED MODULE: external "@kq_npm/client_common_vue/_types/global-event"
+var global_event_namespaceObject = require("@kq_npm/client_common_vue/_types/global-event");
+var global_event_default = /*#__PURE__*/__webpack_require__.n(global_event_namespaceObject);
 ;// CONCATENATED MODULE: ./src/webgl/scenceview/LayerManager.js
 
 
 
+
  //图层管理类
 
 class LayerManager {
@@ -1738,7 +1742,7 @@ class LayerManager {
    */
 
 
-  setLayerVisibleStateByIds(ids, visible, eventTarget) {
+  setLayerVisibleStateByIds(ids, visible, eventTarget = null) {
     if (!(ids && ids.length > 0)) return;
     let layer;
 
@@ -1784,6 +1788,10 @@ class LayerManager {
         }
       }
     }
+
+    this._scenceView.fire("resetLayerDatas", {
+      eventTarget
+    });
   } //通过guid获取ImageryLayer图层添加的index
 
 
@@ -2204,9 +2212,13 @@ class LayerManager {
 
         this._layerTreeData.forEach(item => {
           uncheckNode(item, guid);
-        });
+        }); //this._scenceView.fire("resetLayerDatas");
 
-        this._scenceView.fire("resetLayerDatas");
+
+        global_event_default().fire("setTreeChecked", {
+          keys: [guid],
+          show: false
+        });
       }
     }
 
@@ -2350,9 +2362,6 @@ function delTreeDataByGuid(data, guid) {
     }
   }
 }
-;// CONCATENATED MODULE: external "@kq_npm/client_common_vue/_types/global-event"
-var global_event_namespaceObject = require("@kq_npm/client_common_vue/_types/global-event");
-var global_event_default = /*#__PURE__*/__webpack_require__.n(global_event_namespaceObject);
 ;// CONCATENATED MODULE: ./src/webgl/scenceview/ScenceViewViewModel.js
 
 //ScenceView逻辑类
@@ -2615,6 +2624,34 @@ class ScenceViewViewModel extends (mitt_default()) {
         imageryLayers.remove(layer);
       }
     });
+  } //获取三维视角
+
+
+  getViewPosition() {
+    var camera = this._viewer.camera;
+    var position = {
+      x: camera.position.x,
+      y: camera.position.y,
+      z: camera.position.z
+    };
+    return {
+      position: position,
+      heading: camera.heading,
+      pitch: camera.pitch,
+      roll: camera.roll
+    };
+  } //设置三维视角
+
+
+  setViewPosition(view) {
+    this._viewer.camera.flyTo({
+      destination: view.position,
+      orientation: {
+        heading: view.heading,
+        pitch: view.pitch,
+        roll: view.roll
+      }
+    });
   }
 
 }
@@ -9648,9 +9685,7 @@ class TerrainOperationViewModel {
           if (that._terrainmodification) {
             that.setTerrainModification();
           } else {
-            this.createTerrainModification(() => {
-              that.setTerrainModification();
-            });
+            this.createTerrainModification();
           }
         }
 
@@ -9680,10 +9715,28 @@ class TerrainOperationViewModel {
 
     this._globaOptions.viewer.terrainProvider.readyPromise.then(function () {
       setTimeout(() => {
-        // 地形平整
-        that._terrainmodification = new window.Cesium.Kq3dTerrainModification({
-          viewer: that._globaOptions.viewer
-        });
+        let heights = [];
+        let positions = [];
+
+        that._globaOptions.positions.forEach((item, index) => {
+          console.log(index);
+          let cag = window.Cesium.Cartographic.fromCartesian(item);
+          positions.push(cag);
+          heights.push(cag.height);
+        }); // 地形平整
+
+
+        if (!that._terrainmodification) {
+          that._terrainmodification = new window.Cesium.Kq3dTerrainModification({
+            viewer: that._globaOptions.viewer,
+            positions: positions,
+            heights: heights
+          });
+        } else {
+          that._terrainmodification.heights = heights;
+          that._terrainmodification.positions = positions;
+        }
+
         that._terrainmodification._clippingPlanesEnabled = true;
         if (callback) callback();
       }, 500);

package/package.json

@@ -1 +1 @@
-{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"0.5.5-beta","homepage":"","keywords":["KQGIS","webGL","Vue"],"browserslist":["> 1%","last 2 versions","not dead","not ie 11"],"author":"KQWEB GROUP","license":"Apache-2.0","dependencies":{"colorcolor":"^1.1.1","echarts":"^5.3.3","js-cookie":"^3.0.1","omit.js":"^2.0.2","save":"^2.5.0","tinycolor2":"^1.4.2","vue-i18n":"^9.2.0-beta.36","xlsx":"^0.18.5","@turf/turf":"^6.5.0","css-vars-ponyfill":"^2.4.8","xe-utils":"^3.5.4"}}
+{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"0.5.6-beta","homepage":"","keywords":["KQGIS","webGL","Vue"],"browserslist":["> 1%","last 2 versions","not dead","not ie 11"],"author":"KQWEB GROUP","license":"Apache-2.0","dependencies":{"colorcolor":"^1.1.1","echarts":"^5.3.3","js-cookie":"^3.0.1","omit.js":"^2.0.2","save":"^2.5.0","tinycolor2":"^1.4.2","vue-i18n":"^9.2.0-beta.36","xlsx":"^0.18.5","@turf/turf":"^6.5.0","css-vars-ponyfill":"^2.4.8","xe-utils":"^3.5.4"}}

package/scenceview/index.js

@@ -529,10 +529,14 @@ var webmapservice_namespaceObject = require("@kq_npm/client_common_vue/_utils/we
 var webmapservice_default = /*#__PURE__*/__webpack_require__.n(webmapservice_namespaceObject);
 ;// CONCATENATED MODULE: external "@kq_npm/client_common_vue/_utils/util"
 var util_namespaceObject = require("@kq_npm/client_common_vue/_utils/util");
+;// CONCATENATED MODULE: external "@kq_npm/client_common_vue/_types/global-event"
+var global_event_namespaceObject = require("@kq_npm/client_common_vue/_types/global-event");
+var global_event_default = /*#__PURE__*/__webpack_require__.n(global_event_namespaceObject);
 ;// CONCATENATED MODULE: ./src/webgl/scenceview/LayerManager.js
 
 
 
+
  //图层管理类
 
 class LayerManager {
@@ -1285,7 +1289,7 @@ class LayerManager {
    */
 
 
-  setLayerVisibleStateByIds(ids, visible, eventTarget) {
+  setLayerVisibleStateByIds(ids, visible, eventTarget = null) {
     if (!(ids && ids.length > 0)) return;
     let layer;
 
@@ -1331,6 +1335,10 @@ class LayerManager {
         }
       }
     }
+
+    this._scenceView.fire("resetLayerDatas", {
+      eventTarget
+    });
   } //通过guid获取ImageryLayer图层添加的index
 
 
@@ -1751,9 +1759,13 @@ class LayerManager {
 
         this._layerTreeData.forEach(item => {
           uncheckNode(item, guid);
-        });
+        }); //this._scenceView.fire("resetLayerDatas");
+
 
-        this._scenceView.fire("resetLayerDatas");
+        global_event_default().fire("setTreeChecked", {
+          keys: [guid],
+          show: false
+        });
       }
     }
 
@@ -1897,9 +1909,6 @@ function delTreeDataByGuid(data, guid) {
     }
   }
 }
-;// CONCATENATED MODULE: external "@kq_npm/client_common_vue/_types/global-event"
-var global_event_namespaceObject = require("@kq_npm/client_common_vue/_types/global-event");
-var global_event_default = /*#__PURE__*/__webpack_require__.n(global_event_namespaceObject);
 ;// CONCATENATED MODULE: ./src/webgl/scenceview/ScenceViewViewModel.js
 
 //ScenceView逻辑类
@@ -2162,6 +2171,34 @@ class ScenceViewViewModel extends (mitt_default()) {
         imageryLayers.remove(layer);
       }
     });
+  } //获取三维视角
+
+
+  getViewPosition() {
+    var camera = this._viewer.camera;
+    var position = {
+      x: camera.position.x,
+      y: camera.position.y,
+      z: camera.position.z
+    };
+    return {
+      position: position,
+      heading: camera.heading,
+      pitch: camera.pitch,
+      roll: camera.roll
+    };
+  } //设置三维视角
+
+
+  setViewPosition(view) {
+    this._viewer.camera.flyTo({
+      destination: view.position,
+      orientation: {
+        heading: view.heading,
+        pitch: view.pitch,
+        roll: view.roll
+      }
+    });
   }
 
 }

package/terrainoperation/index.js

@@ -128,9 +128,7 @@ class TerrainOperationViewModel {
           if (that._terrainmodification) {
             that.setTerrainModification();
           } else {
-            this.createTerrainModification(() => {
-              that.setTerrainModification();
-            });
+            this.createTerrainModification();
           }
         }
 
@@ -160,10 +158,28 @@ class TerrainOperationViewModel {
 
     this._globaOptions.viewer.terrainProvider.readyPromise.then(function () {
       setTimeout(() => {
-        // 地形平整
-        that._terrainmodification = new window.Cesium.Kq3dTerrainModification({
-          viewer: that._globaOptions.viewer
-        });
+        let heights = [];
+        let positions = [];
+
+        that._globaOptions.positions.forEach((item, index) => {
+          console.log(index);
+          let cag = window.Cesium.Cartographic.fromCartesian(item);
+          positions.push(cag);
+          heights.push(cag.height);
+        }); // 地形平整
+
+
+        if (!that._terrainmodification) {
+          that._terrainmodification = new window.Cesium.Kq3dTerrainModification({
+            viewer: that._globaOptions.viewer,
+            positions: positions,
+            heights: heights
+          });
+        } else {
+          that._terrainmodification.heights = heights;
+          that._terrainmodification.positions = positions;
+        }
+
         that._terrainmodification._clippingPlanesEnabled = true;
         if (callback) callback();
       }, 500);