@kq_npm/client3d_webgl_vue 4.0.7-beta → 4.0.9-beta

package/scenceview/index.js

@@ -93,7 +93,7 @@ element_plus_es__WEBPACK_IMPORTED_MODULE_0__.ElMessage.install = (Vue, opts) =>
 
 /***/ }),
 
-/***/ 696:
+/***/ 5110:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 
@@ -123,11 +123,15 @@ var util_ = __webpack_require__(9519);
 var message = __webpack_require__(1349);
 // EXTERNAL MODULE: external "@kq_npm/client_common_vue/_utils/const-image"
 var const_image_ = __webpack_require__(9702);
+;// CONCATENATED MODULE: external "papaparse"
+var external_papaparse_namespaceObject = require("papaparse");
+var external_papaparse_default = /*#__PURE__*/__webpack_require__.n(external_papaparse_namespaceObject);
 ;// CONCATENATED MODULE: ./src/webgl/adddata/AddDataViewModel.js
 
 
 
 
+
  //添加数据逻辑类
 
 class AddDataViewModel {
@@ -151,13 +155,15 @@ class AddDataViewModel {
         style: Cesium.LabelStyle.FILL_AND_OUTLINE,
         eyeOffset: Cesium.Cartesian3.ZERO,
         pixelOffset: new Cesium.Cartesian2(0, -8),
-        disableDepthTestDistance: Number.POSITIVE_INFINITY
+        disableDepthTestDistance: 10000000 // disableDepthTestDistance: Number.POSITIVE_INFINITY
+
       },
       billboard: {
         image: const_image_.BILLBOARD_IMAGE_URL,
         width: 12,
         height: 12,
-        disableDepthTestDistance: Number.POSITIVE_INFINITY
+        disableDepthTestDistance: 10000000 // disableDepthTestDistance: Number.POSITIVE_INFINITY
+
       },
       polyline: {
         width: 2.0,
@@ -212,8 +218,7 @@ class AddDataViewModel {
               that._viewer.dataSources.add(ds); // ds.autoAvoid(that._viewer);
 
 
-              that._viewer.flyTo(ds);
-
+              that.flyToLayer(ds);
               resolve("success");
               var layer = {
                 guid: ds.guid,
@@ -231,7 +236,7 @@ class AddDataViewModel {
               cb && cb(layer);
             });
           } else {
-            reject(file.name + " service parse error.");
+            reject(file.name + " file parser error.");
             cb && cb("error");
           }
         });
@@ -254,8 +259,129 @@ class AddDataViewModel {
               that._viewer.dataSources.add(ds); // ds.autoAvoid(that._viewer);
 
 
-              that._viewer.flyTo(ds);
+              that.flyToLayer(ds);
+              resolve("success");
+              var layer = {
+                guid: ds.guid,
+                name: name,
+                visible: true,
+                serverType: "datasource",
+                lsType: "ls",
+                url: res,
+                addType: "geojson",
+                shapeType: that._layerManager.getShapeType(ds)
+              };
+
+              that._layerManager.addTempLayerNode(layer);
+
+              cb && cb(layer);
+            });
+          } else {
+            reject(file.name + " file parser error.");
+            cb && cb("error");
+          }
+        });
+      } else if (ext === "csv") {
+        (0,util_.readFile)(file, res => {
+          var features = external_papaparse_default().parse(res, {
+            skipEmptyLines: true,
+            header: true
+          }).data;
+          let _featureCollection = {
+            type: "FeatureCollection",
+            features: []
+          };
+
+          for (var i = 0; i < features.length; i++) {
+            let item = features[i];
+            let lat = null;
+            let lng = null;
+            let properties = {};
+
+            for (var j in item) {
+              if (j.toUpperCase().indexOf("LAT") != -1) {
+                lat = item[j];
+              } else if (j.toUpperCase().indexOf("LNG") != -1 || j.toUpperCase().indexOf("LON") != -1) {
+                lng = item[j];
+              } else if (j.toUpperCase() === "X") {
+                lat = item[j];
+              } else if (j.toUpperCase() === "Y") {
+                lng = item[j];
+              } else {
+                properties[j] = item[j];
+              }
+            } // 点数据
+
+
+            if (lat && lng) {
+              let _point = {
+                type: "Feature",
+                geometry: {
+                  type: "Point",
+                  coordinates: [Number(lng), Number(lat)]
+                },
+                properties: properties
+              };
+
+              _featureCollection.features.push(_point);
+            } else {}
+          }
+
+          if (_featureCollection.features.length > 0) {
+            var ds = new Cesium.Kq3dGeoJsonDataSource(name);
+            ds.load(_featureCollection, that._geojsonStyle).then(ds => {
+              ds.entities.values.forEach(entity => {
+                if (entity.polygon) {
+                  entity.polyline = {
+                    positions: entity.polygon.hierarchy._value.positions,
+                    width: that._geojsonStyle.polygon.outlineWidth,
+                    material: that._geojsonStyle.polygon.outlineColor
+                  };
+                }
+              });
+
+              that._viewer.dataSources.add(ds);
+
+              that.flyToLayer(ds);
+              resolve("success");
+              var layer = {
+                guid: ds.guid,
+                name: name,
+                visible: true,
+                serverType: "datasource",
+                lsType: "ls",
+                url: _featureCollection,
+                addType: "geojson",
+                shapeType: that._layerManager.getShapeType(ds)
+              };
+
+              that._layerManager.addTempLayerNode(layer);
+
+              cb && cb(layer);
+            });
+          } else {
+            reject(file.name + " file parser error.");
+            cb && cb("error");
+          }
+        });
+      } else if (ext === "xls" || ext === "xlsx") {
+        (0,util_.readExcel)(file, this._language, res => {
+          if (res) {
+            var ds = new Cesium.Kq3dGeoJsonDataSource(name);
+            ds.load(res, that._geojsonStyle).then(ds => {
+              ds.entities.values.forEach(entity => {
+                if (entity.polygon) {
+                  entity.polyline = {
+                    positions: entity.polygon.hierarchy._value.positions,
+                    width: that._geojsonStyle.polygon.outlineWidth,
+                    material: that._geojsonStyle.polygon.outlineColor
+                  };
+                }
+              });
+
+              that._viewer.dataSources.add(ds);
 
+              that.flyToLayer(ds);
               resolve("success");
               var layer = {
                 guid: ds.guid,
@@ -273,7 +399,8 @@ class AddDataViewModel {
               cb && cb(layer);
             });
           } else {
-            reject(file.name + " service parse error.");
+            reject(file.name + " file parser error.");
+            cb && cb("error");
           }
         });
       } else {
@@ -327,8 +454,7 @@ class AddDataViewModel {
                 that._viewer.dataSources.add(ds); // ds.autoAvoid(that._viewer);
 
 
-                that._viewer.flyTo(ds);
-
+                that.flyToLayer(ds);
                 resolve("success");
                 var layer = {
                   guid: ds.guid,
@@ -361,8 +487,7 @@ class AddDataViewModel {
               ds.load(data).then(ds => {
                 that._viewer.dataSources.add(ds);
 
-                that._viewer.flyTo(ds);
-
+                that.flyToLayer(ds);
                 resolve("success");
                 var layer = {
                   guid: ds.guid,
@@ -390,8 +515,7 @@ class AddDataViewModel {
               ds.load(file).then(ds => {
                 that._viewer.dataSources.add(ds);
 
-                that._viewer.flyTo(ds);
-
+                that.flyToLayer(ds);
                 resolve("success");
                 var layer = {
                   guid: ds.guid,
@@ -423,8 +547,7 @@ class AddDataViewModel {
               that._viewer.dataSources.add(Cesium.CzmlDataSource.load(ret, {
                 name: name
               })).then(ds => {
-                that._viewer.flyTo(ds);
-
+                that.flyToLayer(ds);
                 resolve("success");
                 var layer = {
                   guid: ds.guid,
@@ -464,7 +587,7 @@ class AddDataViewModel {
   } //解析数据源
 
 
-  parseDataSource(options, cb) {
+  parseDataSource(options, cb, loadCustom) {
     options = options || {};
 
     if (options.url && options.url !== "") {
@@ -483,13 +606,13 @@ class AddDataViewModel {
       } catch (error) {
         (0,message/* default */.Z)({
           message: this._language.errorUrlAddress,
-          type: "error"
+          type: "warning"
         });
         return;
       }
 
       if (options.type === "kml") {
-        this.parseService(options, cb);
+        this.parseService(options, cb, loadCustom);
         return;
       }
 
@@ -499,17 +622,17 @@ class AddDataViewModel {
         if (data.status !== 200) {
           (0,message/* default */.Z)({
             message: this._language.serviceNotAvailable,
-            type: "error"
+            type: "warning"
           });
         } else {
           try {
-            this.parseService(options, cb);
+            this.parseService(options, cb, loadCustom);
           } catch {}
         }
       }).catch(() => {
         (0,message/* default */.Z)({
           message: this._language.serviceNotAvailable,
-          type: "error"
+          type: "warning"
         });
       });
     } else {
@@ -521,7 +644,7 @@ class AddDataViewModel {
   } //解析服务
 
 
-  parseService(options, cb) {
+  parseService(options, cb, loadCustom) {
     let that = this;
     let url = options.url;
     let type = options.type || "";
@@ -737,7 +860,7 @@ class AddDataViewModel {
                 });
                 promiseList.push(promise);
               } else if (layers[i] instanceof Cesium.Kq3dS3MTilesLayer) {
-                serverType = "s3m";
+                serverType = "3dtiles";
                 addType = "s3m";
                 url = layers[i]._url;
               }
@@ -834,6 +957,14 @@ class AddDataViewModel {
         break;
 
       case "kqgismapserver":
+        if (loadCustom) {
+          loadCustom({
+            name,
+            url
+          });
+          return;
+        }
+
         node = {
           guid: Cesium.createGuid(),
           name: name,
@@ -857,7 +988,7 @@ class AddDataViewModel {
           if (mapInfo.resultcode === "error") {
             (0,message/* default */.Z)({
               message: mapInfo.message,
-              type: "error"
+              type: "warning"
             });
             return;
           }
@@ -912,7 +1043,9 @@ class AddDataViewModel {
       case "arcgismapserver":
         layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dArcGISMapServerImageryProvider({
           name: name,
-          url: url
+          url: url,
+          usePreCachedTilesIfAvailable: false //使用export请求可支持自定义比例尺
+
         }));
         this.flyToLayer(layer);
         node = {
@@ -1086,8 +1219,7 @@ class AddDataViewModel {
             that._viewer.dataSources.add(ds); // ds.autoAvoid(that._viewer);
 
 
-            that._viewer.flyTo(ds);
-
+            that.flyToLayer(ds);
             node = {
               guid: ds.guid,
               name: name,
@@ -1121,8 +1253,7 @@ class AddDataViewModel {
           this._viewer.dataSources.add(ds); // ds.autoAvoid(this._viewer);
 
 
-          this._viewer.flyTo(ds);
-
+          that.flyToLayer(ds);
           node = {
             guid: ds.guid,
             name: name,
@@ -1158,8 +1289,7 @@ class AddDataViewModel {
 
           this._viewer.dataSources.add(ds);
 
-          this._viewer.flyTo(ds);
-
+          that.flyToLayer(ds);
           node = {
             guid: ds.guid,
             name: name,
@@ -1186,8 +1316,7 @@ class AddDataViewModel {
         ds.load(url).then(ds => {
           this._viewer.dataSources.add(ds);
 
-          this._viewer.flyTo(ds);
-
+          that.flyToLayer(ds);
           node = {
             guid: ds.guid,
             name: name,
@@ -1209,8 +1338,7 @@ class AddDataViewModel {
         ds.load(url).then(ds => {
           this._viewer.dataSources.add(ds);
 
-          this._viewer.flyTo(ds);
-
+          that.flyToLayer(ds);
           node = {
             guid: ds.guid,
             name: name,
@@ -1273,7 +1401,7 @@ class AddDataViewModel {
           destination: tileset.rectangle
         });
       });
-    } else if (layer instanceof Cesium.GeoJsonDataSource || layer instanceof Cesium.Kq3dGeoJsonDataSource) {
+    } else if (layer instanceof Cesium.GeoJsonDataSource || layer instanceof Cesium.Kq3dGeoJsonDataSource || layer instanceof Cesium.Kq3dEsriGeoJsonDataSource) {
       let offset = new Cesium.HeadingPitchRange(0, Cesium.Math.toRadians(-90), 0);
       viewer.flyTo(layer, {
         offset
@@ -1353,7 +1481,6 @@ const _hoisted_12 = {
 
 
 
- //accept=".zip,.geojson,.topojson,.json,.kml,.kmz,.czml,.csv,.xls,.xlsx,.txt"
 
 const __default__ = {
   name: "Kq3dAddData"
@@ -1390,6 +1517,11 @@ const __default__ = {
       type: Function,
       default: null
     },
+    // 自定义加载函数, 只对KQGIS REST服务生效, earthstudio使用
+    loadCustom: {
+      type: Function,
+      default: null
+    },
     // 是否生成HeaderTemp
     showHeaderTemp: {
       type: Boolean,
@@ -1424,6 +1556,7 @@ const __default__ = {
     expose
   }) {
     const props = __props;
+    let accept = ".zip,.geojson,.topojson,.json,.kml,.kmz,.czml,.csv,.xls,.xlsx,.txt";
     let language = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)({});
     let selectTypeIndex = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(0); //URL服务支持的数据源类型
 
@@ -1482,104 +1615,104 @@ const __default__ = {
       return [// {
       //     type: 'kq3dimageryfile',
       //     name: language.value.ImagertyTileFile,
-      //     namePlaceholder: language.value.unnamedLayer,
+      //     namePlaceholder: language.value.optional,
       //     urlPlaceholder: language.value.format +':http://<host>:<port>/xxx/<servername>/info.xml',
       //     description: language.value.imagertyTileFiledescription
       // }, {
       //     type: 'obterrain',
       //     name: language.value.ObTerrainTileFile,
-      //     namePlaceholder: language.value.unnamedLayer,
+      //     namePlaceholder: language.value.optional,
       //     urlPlaceholder: language.value.format +':http://<host>:<port>/xxx/<servername>/info.xml',
       //     description: language.value.imagertyObTerrainTileFiledescription
       // },
       {
         type: "kqgis3dserver",
         name: language.value.KQGIS3DServer,
-        namePlaceholder: language.value.unnamedLayer,
+        namePlaceholder: language.value.optional,
         urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/realspace",
         description: language.value.imagerty3DServerdescription
       }, {
         type: "kqgismapserver",
         name: language.value.KQGISMapServer,
-        namePlaceholder: language.value.unnamedLayer,
+        namePlaceholder: language.value.optional,
         urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/map",
         description: language.value.imagertyMapServerdescription
       }, {
         type: "kqgisimageserver",
         name: language.value.KQGISImageServer,
-        namePlaceholder: language.value.unnamedLayer,
+        namePlaceholder: language.value.optional,
         urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/image",
         description: language.value.imagertyImageServerdescription
       }, {
         type: "kqgisdataflowserver",
         name: language.value.KQGISDataflowServer,
-        namePlaceholder: language.value.unnamedLayer,
+        namePlaceholder: language.value.optional,
         urlPlaceholder: language.value.format + ":http://<host>:<port>/streaming/rest/services/<servername>/dataflow",
         description: language.value.imagertyDataflowServerdescription
       }, {
         type: "kqgistileserver",
         name: language.value.KQGISTileServer,
-        namePlaceholder: language.value.unnamedLayer,
+        namePlaceholder: language.value.optional,
         urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/tile",
         description: language.value.imagertyTileServerdescription
       }, {
         type: "kqgisaggregationserver",
         name: language.value.KQGISAggregationServer,
-        namePlaceholder: language.value.unnamedLayer,
+        namePlaceholder: language.value.optional,
         urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/map/wmts",
         description: language.value.imagertyAggregationServerdescription
       }, {
         type: "s3m",
         name: language.value.S3M,
-        namePlaceholder: language.value.unnamedLayer,
+        namePlaceholder: language.value.optional,
         urlPlaceholder: language.value.format + ":http://<host>:<port>/xxx/realspace/datas/xxx/config",
         description: language.value.imagertyS3Mdescription
       }, {
         type: "arcgismapserver",
         name: language.value.ArcGISMapServer,
-        namePlaceholder: language.value.unnamedLayer,
+        namePlaceholder: language.value.optional,
         urlPlaceholder: language.value.format + ":http://<host>:<port>/ArcGIS/rest/services/<servername>/MapServer",
         description: language.value.imagertyArcGISMapServerdescription
       }, {
         type: "wms",
         name: language.value.OGCWMS,
-        namePlaceholder: language.value.unnamedLayer,
+        namePlaceholder: language.value.optional,
         urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/map/wms",
         description: language.value.imagertyOGCWMSdescription
       }, {
         type: "wmts",
         name: language.value.OGCWMTS,
-        namePlaceholder: language.value.unnamedLayer,
+        namePlaceholder: language.value.optional,
         urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/map/wmts",
         description: language.value.imagertyOGCWMTSdescription
       }, {
         type: "3dtiles",
         name: language.value.Cesium3DTilesFile,
-        namePlaceholder: language.value.unnamedLayer,
+        namePlaceholder: language.value.optional,
         urlPlaceholder: language.value.format + ":http://<host>:<port>/tileset.json",
         description: language.value.imagerty3DTilesFiledescription
       }, {
         type: "stkterrain",
         name: language.value.StkTerrainTileFile,
-        namePlaceholder: language.value.unnamedLayer,
+        namePlaceholder: language.value.optional,
         urlPlaceholder: language.value.format + ":http://<host>:<port>/xxx/<foldername>/",
         description: language.value.imagertyStkTerrainTileFiledescription
       }, {
         type: "geojson",
         name: language.value.GeoJson,
-        namePlaceholder: language.value.unnamedLayer,
+        namePlaceholder: language.value.optional,
         urlPlaceholder: language.value.format + ":http://<host>:<port>/xxx.geojson",
         description: language.value.imagertyGeoJsondescription
       }, {
         type: "arcjson",
         name: language.value.ArcJson,
-        namePlaceholder: language.value.unnamedLayer,
+        namePlaceholder: language.value.optional,
         urlPlaceholder: language.value.format + ":http://<host>:<port>/xxx.json",
         description: language.value.imagertyArcJsondescription
       }, {
         type: "mvt",
         name: language.value.MVT,
-        namePlaceholder: language.value.unnamedLayer,
+        namePlaceholder: language.value.optional,
         urlPlaceholder: language.value.format + ":http://<host>:<port>/mvt/style.json",
         description: language.value.imagertyMVTdescription
       }
@@ -1592,13 +1725,13 @@ const __default__ = {
       }, {
           type: 'kml',
           name: language.value.KML,
-          namePlaceholder: language.value.unnamedLayer,
+          namePlaceholder: language.value.optional,
           urlPlaceholder: language.value.format +': http://<host>:<port>/xxx/<servername>/xxx.kml',
           description: language.value.imagertyKMLdescription
       }, {
           type: 'czml',
           name: language.value.CZML,
-          namePlaceholder: language.value.unnamedLayer,
+          namePlaceholder: language.value.optional,
           urlPlaceholder: language.value.format +': http://<host>:<port>/xxx/<servername>/xxx.czml',
           description: language.value.imagertyCZMLdescription
       }*/
@@ -1686,7 +1819,7 @@ const __default__ = {
         type: dataSourceType.value.type,
         url: dataSource.url,
         name: dataSource.name
-      }, props.loadCallback);
+      }, props.loadCallback, props.loadCustom);
     } // 重置
 
 
@@ -1769,7 +1902,7 @@ const __default__ = {
             "auto-upload": false,
             "file-list": (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(fileList),
             "onUpdate:file-list": _cache[0] || (_cache[0] = $event => (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.isRef)(fileList) ? fileList.value = $event : fileList = $event),
-            accept: ".zip,.geojson,.topojson,.json,.kml,.kmz,.czml,.txt",
+            accept: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(accept),
             "on-change": changeFile,
             ref_key: "upload_ref",
             ref: upload_ref
@@ -1782,7 +1915,7 @@ const __default__ = {
 
           }, 8
           /* PROPS */
-          , ["file-list"]), [[external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.vShow, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(fileList).length === 0]]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withDirectives)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("div", _hoisted_4, [((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.openBlock)(true), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementBlock)(external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.Fragment, null, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.renderList)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(operatorArray), (rowItem, i) => {
+          , ["file-list", "accept"]), [[external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.vShow, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(fileList).length === 0]]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withDirectives)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("div", _hoisted_4, [((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.openBlock)(true), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementBlock)(external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.Fragment, null, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.renderList)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(operatorArray), (rowItem, i) => {
             return (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createBlock)(_component_kq_row, {
               key: i,
               gutter: 20
@@ -1837,7 +1970,7 @@ const __default__ = {
             action: "",
             "show-file-list": false,
             "auto-upload": false,
-            accept: ".zip,.geojson,.topojson,.json,.kml,.kmz,.czml,.txt",
+            accept: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(accept),
             ref_key: "upload_btn_ref",
             ref: upload_btn_ref,
             class: "kq3d-add-data-footer-upload",
@@ -1859,9 +1992,9 @@ const __default__ = {
             _: 1
             /* STABLE */
 
-          }, 512
-          /* NEED_PATCH */
-          ), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_button, {
+          }, 8
+          /* PROPS */
+          , ["accept"]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_button, {
             onClick: _cache[1] || (_cache[1] = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withModifiers)($event => removeFiles(), ["stop"])),
             title: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).clearFiles,
             type: "primary"
@@ -1963,7 +2096,7 @@ const __default__ = {
 
             }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_row, null, {
               default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_form_item, {
-                label: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).layerName
+                label: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).nodeName
               }, {
                 default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_input, {
                   modelValue: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(dataSource).name,
@@ -2841,8 +2974,9 @@ const __default__ = {
       gis_utils_.utils.getWebMap(null, scenceView => {
         if (scenceView) {
           changSelectTerrain();
-          viewModel = new BaseterrainGalleryViewModel/* default */.Z(scenceView._viewer);
-          viewModel.setTerrainType(currentIndex.value);
+          viewModel = new BaseterrainGalleryViewModel/* default */.Z(scenceView._viewer); // 初始化无地形时不需要设置地形, 如果将地形设置为无地形可能会影响其他功能添加的地形
+
+          if (currentIndex.value != 2) viewModel.setTerrainType(currentIndex.value);
         }
       });
     });
@@ -36479,8 +36613,8 @@ var isolineanalysis = __webpack_require__(9783);
 var boxclip = __webpack_require__(4510);
 // EXTERNAL MODULE: ./src/webgl/planeclip/index.js + 4 modules
 var planeclip = __webpack_require__(9736);
-// EXTERNAL MODULE: ./src/webgl/adddata/index.js + 4 modules
-var adddata = __webpack_require__(696);
+// EXTERNAL MODULE: ./src/webgl/adddata/index.js + 5 modules
+var adddata = __webpack_require__(5110);
 // EXTERNAL MODULE: ./src/webgl/particleeffect/index.js + 4 modules
 var particleeffect = __webpack_require__(828);
 // EXTERNAL MODULE: ./src/webgl/weathereffect/index.js + 4 modules
@@ -37170,10 +37304,6 @@ class DrawManager {
       delete style.billboard;
     }
 
-    if (geojsonData.type === "Feature") {
-      geojsonData.properties = geojsonData.properties || {};
-    }
-
     this._viewer.scene.globe.depthTestAgainstTerrain = false;
 
     let geojsonDs = this._viewer.dataSources.getByName(idCustom);
@@ -37208,8 +37338,11 @@ class DrawManager {
       }
 
       if (isLocation) {
+        let offset = new Cesium.HeadingPitchRange(0, Cesium.Math.toRadians(-90), 0);
+
         that._viewer.flyTo(ds, {
-          duration: 1.5
+          duration: 1.5,
+          offset
         });
       }
 
@@ -38074,6 +38207,10 @@ class LayerManager {
             }
           } else if (layerData.sourceType === "kqimageserver") {
             type = "kqgisimageserver";
+
+            if (layerData.renderType === "weather") {
+              type = "kqgisweatherserver";
+            }
           } else if (layerData.sourceType === "kq3dserver") {
             type = "kqgis3dserver";
           } else if (layerData.sourceType === "mvt") {
@@ -38210,7 +38347,7 @@ class LayerManager {
 
       case "s3m":
         layerData.visible = isAdd;
-        layerData.serverType = "s3m";
+        layerData.serverType = "3dtiles";
 
         if (isAdd) {
           layer = this._viewer.scene.primitives.add(new Cesium.Kq3dS3MTilesLayer({
@@ -38227,7 +38364,8 @@ class LayerManager {
       case "kqgis3dserver":
         var that = this;
         layerData.visible = isAdd;
-        promise = this._viewer.addKq3dServerLayerGroupExt(url).then(group => {
+        promise = this._viewer.addKq3dServerLayerGroupExt(url, { ...params
+        }).then(group => {
           var layers = group._addedLayers || group._layers;
 
           if (layers && layers.length > 0) {
@@ -38255,6 +38393,9 @@ class LayerManager {
               serverType = "datasource";
               layer.show = isAdd;
               layerData.shapeType = that.getShapeType(layer);
+            } else if (layer instanceof Cesium.Kq3dS3MTilesLayer) {
+              serverType = "3dtiles";
+              layer.show = isAdd;
             }
 
             layer._guid = layerData.guid;
@@ -38264,6 +38405,7 @@ class LayerManager {
         break;
 
       case "kqgisimageserver":
+        //kqgis影像服务-栅格数据
         layerData.visible = isAdd;
         layerData.serverType = "imagerylayer";
         layerData.type = "Image"; // 图层树显示图标使用
@@ -38280,6 +38422,26 @@ class LayerManager {
 
         break;
 
+      case "kqgisweatherserver":
+        //kqgis影像服务-气象数据
+        layerData.visible = isAdd;
+        layerData.serverType = "imagerylayer";
+
+        if (isAdd) {
+          if (url.indexOf("/image/wmts") < 0) {
+            url = url.replace("/image", "/image/wmts");
+          }
+
+          layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dContourImageryProviderExt({
+            name: name,
+            url: url,
+            ...params
+          }));
+          layer._guid = layerData.guid;
+        }
+
+        break;
+
       case "kqgismapserver":
         if (layerData.sourceLayers) {
           var layerInfo = layerData.sourceLayers.find(item => {
@@ -38322,6 +38484,8 @@ class LayerManager {
             name: name,
             url: url,
             layers: layerData.id + "",
+            usePreCachedTilesIfAvailable: false,
+            //使用export请求可支持自定义比例尺
             ...params
           }));
           layer._guid = layerData.guid;
@@ -38369,7 +38533,8 @@ class LayerManager {
 
       case "wms":
         //配置id时只能是单个图层
-        if (layerData.rect84) {
+        if (layerData.rect84 && layerData.sourceType !== "service" && layerData.dataSourceType !== "service") {
+          // 大数据wms服务使用
           layerData.visible = isAdd;
           layerData.serverType = "imagerylayer";
 
@@ -38409,7 +38574,9 @@ class LayerManager {
           layerData.serverType = "imagerylayer";
 
           if (isAdd) {
-            promise = this._viewer.addWMSLayerGroup(url, {
+            if (params.url) url = params.url; // 设置多子域时使用
+
+            promise = this._viewer.addWMSLayerGroup(url, { ...params,
               layers: layerData.id + ""
             }).then(group => {
               var layers = group._addedLayers || group._layers;
@@ -38447,7 +38614,9 @@ class LayerManager {
         layerData.serverType = "imagerylayer"; //配置id时只能是单个图层
 
         if (isAdd) {
-          promise = this._viewer.addWMTSLayerGroup(url, {
+          if (params.url) url = params.url; // 设置多子域时使用
+
+          promise = this._viewer.addWMTSLayerGroup(url, { ...params,
             layers: layerData.id + ""
           }).then(group => {
             var layers = group._addedLayers || group._layers;