@kq_npm/client3d_webgl_vue 4.5.17-beta → 4.5.19-beta

package/adddata/index.js

@@ -61,6 +61,13 @@ module.exports = require("core-js/modules/esnext.iterator.constructor.js");
 
 /***/ }),
 
+/***/ 2753:
+/***/ (function(module) {
+
+module.exports = require("core-js/modules/esnext.iterator.filter.js");
+
+/***/ }),
+
 /***/ 1058:
 /***/ (function(module) {
 
@@ -296,6 +303,8 @@ var client_icons_vue_ = __webpack_require__(348);
 var gis_utils_ = __webpack_require__(7135);
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/defineProperty.js + 3 modules
 var defineProperty = __webpack_require__(5301);
+// EXTERNAL MODULE: external "core-js/modules/esnext.iterator.filter.js"
+var esnext_iterator_filter_js_ = __webpack_require__(2753);
 // EXTERNAL MODULE: external "core-js/modules/web.url-search-params.delete.js"
 var web_url_search_params_delete_js_ = __webpack_require__(4360);
 // EXTERNAL MODULE: external "core-js/modules/web.url-search-params.has.js"
@@ -322,6 +331,7 @@ var external_papaparse_default = /*#__PURE__*/__webpack_require__.n(external_pap
 
 
 
+
 /*
  * Copyright (C) 2019 KQ GEO Technologies Co., Ltd.
  * All rights reserved.
@@ -756,6 +766,49 @@ class AddDataViewModel {
                 cb && cb(layer);
               });
               break;
+            case "kqgeobody":
+              ret = ret.replace(/(^\s*)|(\s*$)/, "");
+              try {
+                let data = JSON.parse(ret);
+                if (Array.isArray(data)) {
+                  ret = data;
+                }
+              } catch (e) {}
+              let geology = new Cesium.Kq3dGeologyBody({
+                viewer: that._viewer
+              });
+              geology.name = name;
+              that._viewer.geologyBodyCollection.push(geology);
+              geology.createGeology(ret).then(function (geobody) {
+                if (!geobody.viewer.scene.primitives.contains(geobody.geologyPrimitives)) {
+                  geobody.geologyPrimitives = geobody.viewer.scene.primitives.add(geobody.geologyPrimitiveCollection);
+                }
+                let boundingSpheres = [];
+                geobody.geologyPrimitives._primitives.forEach(primitive => {
+                  if (primitive.geometryInstances.geometry.boundingSphere) {
+                    boundingSpheres = boundingSpheres.concat(primitive.geometryInstances.geometry.boundingSphere);
+                  }
+                });
+                if (boundingSpheres.length > 0) {
+                  let boundingSphere = Cesium.BoundingSphere.fromBoundingSpheres(boundingSpheres);
+                  that._viewer.camera.flyToBoundingSphere(boundingSphere, {
+                    offset: new Cesium.HeadingPitchRange(0.0, Cesium.Math.toRadians(-90.0), boundingSphere.radius * 3)
+                  });
+                }
+                resolve("success");
+                var layer = {
+                  guid: geology.geologyPrimitiveCollection._guid,
+                  name: name,
+                  visible: true,
+                  serverType: "kqgeobody",
+                  lsType: "ls",
+                  url: ret,
+                  addType: "kqgeobody"
+                };
+                that._layerManager.addTempLayerNode(layer);
+                cb && cb(layer);
+              });
+              break;
             default:
               break;
           }
@@ -1074,7 +1127,17 @@ class AddDataViewModel {
         break;
       case "kqgisdataserver":
         // KQGIS 数据服务
-        // addDataServer(url, name);
+        this.addDataServer(url).then(children => {
+          node = {
+            guid: Cesium.createGuid(),
+            name: name,
+            visible: true,
+            children: children,
+            lsType: "ls"
+          };
+          this._layerManager.addTempLayerNode(node, 1);
+          cb && cb(node);
+        });
         break;
       case "kqgismapserver":
         // KQGIS 地图服务
@@ -1447,28 +1510,38 @@ class AddDataViewModel {
   }
 
   // 添加数据服务
-  addDataServer(url, name) {
-    window.KqGIS.datasourceService(url).getDatasources(async e => {
-      if (e.result.resultcode === "success") {
-        let datasourceList = e.result.result.datasources;
-        if (datasourceList) {
-          for (let i = 0; i < datasourceList.length; i++) {
-            await _getDatasetList(url, datasourceList[i].datasourceName);
+  addDataServer(url) {
+    return new Promise((resolve, reject) => {
+      Cesium.Kq3dService.datasourceService(url).getDatasources(async e => {
+        if (e.result.resultcode === "success") {
+          let datasourceList = e.result.result.datasources;
+          if (datasourceList) {
+            let nodes = [];
+            for (let i = 0; i < datasourceList.length; i++) {
+              let datasetList = await this._getDatasetList(url, datasourceList[i].datasourceName);
+              if (!datasetList || datasetList.length === 0) continue;
+              await this._addDataSets(url, datasourceList[i].datasourceName, datasetList, nodes);
+            }
+            resolve(nodes);
+          } else {
+            reject([]);
           }
+        } else {
+          console.error(e);
+          reject([]);
         }
-      } else {
-        console.error(e);
-      }
-    }, err => {
-      console.error(err);
+      }, err => {
+        console.error(err);
+        reject([]);
+      });
     });
   }
-  _getDatasetList(url, dataSourceName) {
+  _getDatasetList(url, datasourceName) {
     let params = new window.KqGIS.Data.GetDatasetsInfoParams({
-      datasourceName: dataSourceName
+      datasourceName: datasourceName
     });
     return new Promise((resolve, reject) => {
-      window.KqGIS.datasetService(url).getDatasets(params, e => {
+      Cesium.Kq3dService.datasetService(url).getDatasets(params, e => {
         if (e.result.resultcode === "success") {
           resolve(e.result.result.datasets);
         } else {
@@ -1481,6 +1554,76 @@ class AddDataViewModel {
       });
     });
   }
+
+  // 加载数据集
+  async _addDataSets(url, datasourceName, datasetList, nodes) {
+    let dataSourceNode = {
+      guid: window.Cesium.createGuid(),
+      name: datasourceName,
+      visible: true,
+      children: []
+    };
+    // 获取数据集类型数据
+    const datasetArr = datasetList.filter(o => o['isParentDataset'] === true);
+    if (datasetArr.length === 0) {
+      await this._addFeatures(url, datasourceName, datasetList, dataSourceNode);
+    } else {
+      datasetArr.forEach(dataset => {
+        dataSourceNode.children.unshift({
+          guid: window.Cesium.createGuid(),
+          name: dataset.datasetName,
+          visible: true,
+          children: []
+        });
+      });
+      for (let i = 0; i < dataSourceNode.children.length; i++) {
+        const datasetChild = datasetList.filter(o => o['parentDatasetName'] === dataSourceNode.children[i].name);
+        await this._addFeatures(url, datasourceName, datasetChild, dataSourceNode.children[i]);
+      }
+    }
+    nodes.push(dataSourceNode);
+  }
+
+  // 加载要素
+  async _addFeatures(url, datasourceName, datasetList, parentNode) {
+    let promises = [];
+    for (let i = 0; i < datasetList.length; i++) {
+      const dataset = datasetList[i];
+      // 获取数据集数据
+      const featureData = await this._getFeatureList(url, datasourceName, dataset.datasetName);
+      var ds = new Cesium.Kq3dGeoJsonDataSource(featureData.datasetName);
+      let promise = ds.load(featureData.features, this._geojsonStyle).then(ds => {
+        ds.entities.values.forEach(entity => {
+          if (entity.polygon) {
+            entity.polyline = {
+              positions: entity.polygon.hierarchy._value.positions,
+              width: this._geojsonStyle.polygon.outlineWidth,
+              material: this._geojsonStyle.polygon.outlineColor
+            };
+          }
+        }, this);
+        this._viewer.dataSources.add(ds);
+        parentNode.children.push({
+          guid: ds.guid,
+          name: featureData.datasetName,
+          visible: true,
+          serverType: "datasource",
+          lsType: "ls",
+          url: featureData.features,
+          addType: 'geojson',
+          shapeType: featureData.geometryType
+        });
+        this._layerManager._layerListData.push(parentNode.children[i]);
+        if (i == 0) this.flyToLayer(ds);
+      });
+      promises.push(promise);
+    }
+    return new Promise(resolve => {
+      Promise.all(promises).then(() => {
+        resolve();
+      });
+    });
+  }
   _getFeatureList(url, datasourceName, datasetName) {
     let params = new window.KqGIS.Data.GetFeaturesParamsBase({
       datasourceName: datasourceName,
@@ -1490,7 +1633,7 @@ class AddDataViewModel {
       outSRS: "EPSG:4326"
     });
     return new Promise((resolve, reject) => {
-      window.KqGIS.dataFeatureService(url).getFeatureList(params, e => {
+      Cesium.Kq3dService.dataFeatureService(url).getFeatureList(params, e => {
         if (e.result.resultcode === "success") {
           e.result.result["datasetName"] = datasetName;
           resolve(e.result.result);
@@ -1513,9 +1656,10 @@ class AddDataViewModel {
         });
       });
     } else if (layer instanceof Cesium.Cesium3DTileset) {
-      // viewer.zoomTo(layer);
       layer.readyPromise.then(function () {
-        viewer.camera.flyToBoundingSphere(layer.boundingSphere);
+        viewer.camera.flyToBoundingSphere(layer.boundingSphere, {
+          offset: new Cesium.HeadingPitchRange(0.0, Cesium.Math.toRadians(-90.0), layer.boundingSphere.radius * 2)
+        });
       });
     } else if (layer instanceof Cesium.Kq3dS3MTilesLayer) {
       layer.readyPromise.then(function (tileset) {
@@ -1682,7 +1826,7 @@ const __default__ = {
     expose: __expose
   }) {
     const props = __props;
-    let accept = ".zip,.geojson,.topojson,.json,.kml,.kmz,.czml,.csv,.xls,.xlsx,.txt,.dwg,.dfx";
+    let accept = ".zip,.geojson,.topojson,.json,.kml,.kmz,.czml,.csv,.xls,.xlsx,.txt,.dwg,.dfx,.kqgeobody";
     const {
       proxy
     } = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.getCurrentInstance)();
@@ -1768,15 +1912,13 @@ const __default__ = {
         namePlaceholder: language.value.optional,
         urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/map",
         description: language.value.imagertyMapServerdescription
-      },
-      // {
-      //   type: "kqgisdataserver",
-      //   name: language.value.KQGISDataServer,
-      //   namePlaceholder: language.value.optional,
-      //   urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/data",
-      //   description: language.value.imagertyDataServerdescription
-      // },
-      {
+      }, {
+        type: "kqgisdataserver",
+        name: language.value.KQGISDataServer,
+        namePlaceholder: language.value.optional,
+        urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/data",
+        description: language.value.imagertyDataServerdescription
+      }, {
         type: "kqgisimageserver",
         name: language.value.KQGISImageServer,
         namePlaceholder: language.value.optional,

package/adddata/style/adddata.css

@@ -1 +1 @@
-.kq3d-add-data{z-index:999;width:568px;border-radius:var(--kq-border-radius-base);padding:16px;pointer-events:auto;cursor:default;background-color:var(--kq-bg-color)}.kq3d-add-data .kq3d-add-data-box{min-width:568px}.kq3d-add-data .kq-form-item{width:100%}.kq3d-add-data .kq-tabs__item{height:28px;line-height:20px;font-weight:400;font-size:var(--kq-font-size-medium);padding:0 16px}.kq3d-add-data .kq3d-add-data-desc{margin-bottom:16px}.kq3d-add-data .kq3d-add-data-title{color:var(--kq-text-color-regular);font-size:var(--kq-font-size-base);padding-bottom:8px}.kq3d-add-data .kq3d-add-data-tip{color:var(--kq-text-color-secondary);font-size:13px;white-space:pre-wrap}.kq3d-add-data .kq3d-add-data-upload_text{color:#606266}.kq3d-add-data .kq-select{width:100%}.kq3d-add-data .kq-upload-dragger{background:var(--kq-bg-color);border:1px dashed var(--kq-border-color);border-radius:4px}.kq3d-add-data .kq3d-add-data-filelist{width:calc(100% - 2px);min-height:100px;height:auto;background:#f2f6fc;border:1px dashed #409eff;border-radius:4px}.kq3d-add-data .kq3d-add-data-filelist .kq-row{margin:10px 0;display:-webkit-box;display:-ms-flexbox;display:flex;margin-left:0!important;margin-right:0!important}.kq3d-add-data .kq3d-add-data-filelist .kq3d-add-data-file{background:#d9ecff;border-radius:4px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding:0 8px;height:40px;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.kq3d-add-data .kq3d-add-data-filelist .kq3d-add-data-file .kq3d-add-data-doc{font-size:28px;color:#409eff;padding:4px}.kq3d-add-data .kq3d-add-data-filelist .kq3d-add-data-file p{overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.kq3d-add-data .kq3d-add-data-filelist .kq3d-add-data-file .kq3d-add-data-close{font-size:18px;color:#f56c6c;padding:4px;cursor:pointer}.kq3d-add-data .kq3d-add-data-footer{width:100%;padding-top:16px}.kq3d-add-data .kq3d-add-data-footer .btns_box{float:right;display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex}.kq3d-add-data .kq3d-add-data-footer .kq3d-add-data-footer-upload{padding:0 12px}
+.kq3d-add-data{z-index:999;width:568px;border-radius:var(--kq-border-radius-base);padding:16px;pointer-events:auto;cursor:default;background-color:var(--kq-bg-color)}.kq3d-add-data .kq3d-add-data-box{min-width:570px}.kq3d-add-data .kq-form-item{width:100%}.kq3d-add-data .kq-tabs__item{height:28px;line-height:20px;font-weight:400;font-size:var(--kq-font-size-medium);padding:0 16px}.kq3d-add-data .kq3d-add-data-desc{margin-bottom:16px}.kq3d-add-data .kq3d-add-data-title{color:var(--kq-text-color-regular);font-size:var(--kq-font-size-base);padding-bottom:8px}.kq3d-add-data .kq3d-add-data-tip{color:var(--kq-text-color-secondary);font-size:13px;white-space:pre-wrap}.kq3d-add-data .kq3d-add-data-upload_text{color:#606266}.kq3d-add-data .kq-select{width:100%}.kq3d-add-data .kq-upload-dragger{background:var(--kq-bg-color);border:1px dashed var(--kq-border-color);border-radius:4px}.kq3d-add-data .kq3d-add-data-filelist{width:calc(100% - 2px);min-height:100px;height:auto;background:#f2f6fc;border:1px dashed #409eff;border-radius:4px}.kq3d-add-data .kq3d-add-data-filelist .kq-row{margin:10px 0;display:-webkit-box;display:-ms-flexbox;display:flex;margin-left:0!important;margin-right:0!important}.kq3d-add-data .kq3d-add-data-filelist .kq3d-add-data-file{background:#d9ecff;border-radius:4px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding:0 8px;height:40px;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.kq3d-add-data .kq3d-add-data-filelist .kq3d-add-data-file .kq3d-add-data-doc{font-size:28px;color:#409eff;padding:4px}.kq3d-add-data .kq3d-add-data-filelist .kq3d-add-data-file p{overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.kq3d-add-data .kq3d-add-data-filelist .kq3d-add-data-file .kq3d-add-data-close{font-size:18px;color:#f56c6c;padding:4px;cursor:pointer}.kq3d-add-data .kq3d-add-data-footer{width:100%;padding-top:16px}.kq3d-add-data .kq3d-add-data-footer .btns_box{float:right;display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex}.kq3d-add-data .kq3d-add-data-footer .kq3d-add-data-footer-upload{padding:0 12px}

package/aspectanalysis/index.js

@@ -272,7 +272,7 @@ class AspectAnalysisViewModel {
   start() {
     // 判断是否添加了地形
     if (this._globaOptions.viewer.terrainProvider.availability) {
-      if (this._globaOptions.viewer.terrainProvider instanceof Cesium.CesiumTerrainProvider) {
+      if (this._globaOptions.viewer.terrainProvider && this._globaOptions.viewer.terrainProvider.constructor.name == "CesiumTerrainProvider") {
         if (this._globaOptions._drawManager) {
           this.clear();
           this._globaOptions._drawManager.startDraw("polygon", {