@kq_npm/client3d_webgl_vue 4.0.7-beta → 4.0.8-beta

package/adddata/index.js

@@ -827,7 +827,7 @@ class AddDataViewModel {
                 });
                 promiseList.push(promise);
               } else if (layers[i] instanceof Cesium.Kq3dS3MTilesLayer) {
-                serverType = "s3m";
+                serverType = "3dtiles";
                 addType = "s3m";
                 url = layers[i]._url;
               }
@@ -1002,7 +1002,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 = {

package/baseterraingallery/index.js

@@ -363,8 +363,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);
         }
       });
     });

package/index.js

@@ -1069,10 +1069,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);
@@ -1107,8 +1103,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
         });
       }
 
@@ -2122,7 +2121,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({
@@ -2167,6 +2166,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;
@@ -2234,6 +2236,8 @@ class LayerManager {
             name: name,
             url: url,
             layers: layerData.id + "",
+            usePreCachedTilesIfAvailable: false,
+            //使用export请求可支持自定义比例尺
             ...params
           }));
           layer._guid = layerData.guid;
@@ -2281,7 +2285,8 @@ class LayerManager {
 
       case "wms":
         //配置id时只能是单个图层
-        if (layerData.rect84) {
+        if (layerData.rect84 && layerData.sourceType !== "service") {
+          // 大数据wms服务使用
           layerData.visible = isAdd;
           layerData.serverType = "imagerylayer";
 
@@ -2321,7 +2326,7 @@ class LayerManager {
           layerData.serverType = "imagerylayer";
 
           if (isAdd) {
-            promise = this._viewer.addWMSLayerGroup(url, {
+            promise = this._viewer.addWMSLayerGroup(url, { ...params,
               layers: layerData.id + ""
             }).then(group => {
               var layers = group._addedLayers || group._layers;
@@ -2359,7 +2364,7 @@ class LayerManager {
         layerData.serverType = "imagerylayer"; //配置id时只能是单个图层
 
         if (isAdd) {
-          promise = this._viewer.addWMTSLayerGroup(url, {
+          promise = this._viewer.addWMTSLayerGroup(url, { ...params,
             layers: layerData.id + ""
           }).then(group => {
             var layers = group._addedLayers || group._layers;
@@ -7004,8 +7009,9 @@ const BaseterrainGalleryvue_type_script_setup_true_lang_js_default_ = {
       gis_utils_namespaceObject.utils.getWebMap(null, scenceView => {
         if (scenceView) {
           changSelectTerrain();
-          viewModel = new BaseterrainGalleryViewModel(scenceView._viewer);
-          viewModel.setTerrainType(currentIndex.value);
+          viewModel = new BaseterrainGalleryViewModel(scenceView._viewer); // 初始化无地形时不需要设置地形, 如果将地形设置为无地形可能会影响其他功能添加的地形
+
+          if (currentIndex.value != 2) viewModel.setTerrainType(currentIndex.value);
         }
       });
     });
@@ -27103,7 +27109,7 @@ class AddDataViewModel {
                 });
                 promiseList.push(promise);
               } else if (layers[i] instanceof Cesium.Kq3dS3MTilesLayer) {
-                serverType = "s3m";
+                serverType = "3dtiles";
                 addType = "s3m";
                 url = layers[i]._url;
               }
@@ -27278,7 +27284,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 = {

package/package.json

@@ -1 +1 @@
-{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"4.0.7-beta","homepage":"","keywords":["KQGIS","webGL","Vue"],"restrictedVersion":true,"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.0","echarts-stat":"1.2.0","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","css-vars-ponyfill":"2.4.8","html2canvas":"1.4.1","xe-utils":"3.5.4"}}
+{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"4.0.8-beta","homepage":"","keywords":["KQGIS","webGL","Vue"],"restrictedVersion":true,"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.0","echarts-stat":"1.2.0","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","css-vars-ponyfill":"2.4.8","html2canvas":"1.4.1","xe-utils":"3.5.4"}}

package/scenceview/index.js

@@ -737,7 +737,7 @@ class AddDataViewModel {
                 });
                 promiseList.push(promise);
               } else if (layers[i] instanceof Cesium.Kq3dS3MTilesLayer) {
-                serverType = "s3m";
+                serverType = "3dtiles";
                 addType = "s3m";
                 url = layers[i]._url;
               }
@@ -912,7 +912,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 = {
@@ -2841,8 +2843,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);
         }
       });
     });
@@ -37170,10 +37173,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 +37207,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
         });
       }
 
@@ -38210,7 +38212,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({
@@ -38255,6 +38257,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;
@@ -38322,6 +38327,8 @@ class LayerManager {
             name: name,
             url: url,
             layers: layerData.id + "",
+            usePreCachedTilesIfAvailable: false,
+            //使用export请求可支持自定义比例尺
             ...params
           }));
           layer._guid = layerData.guid;
@@ -38369,7 +38376,8 @@ class LayerManager {
 
       case "wms":
         //配置id时只能是单个图层
-        if (layerData.rect84) {
+        if (layerData.rect84 && layerData.sourceType !== "service") {
+          // 大数据wms服务使用
           layerData.visible = isAdd;
           layerData.serverType = "imagerylayer";
 
@@ -38409,7 +38417,7 @@ class LayerManager {
           layerData.serverType = "imagerylayer";
 
           if (isAdd) {
-            promise = this._viewer.addWMSLayerGroup(url, {
+            promise = this._viewer.addWMSLayerGroup(url, { ...params,
               layers: layerData.id + ""
             }).then(group => {
               var layers = group._addedLayers || group._layers;
@@ -38447,7 +38455,7 @@ class LayerManager {
         layerData.serverType = "imagerylayer"; //配置id时只能是单个图层
 
         if (isAdd) {
-          promise = this._viewer.addWMTSLayerGroup(url, {
+          promise = this._viewer.addWMTSLayerGroup(url, { ...params,
             layers: layerData.id + ""
           }).then(group => {
             var layers = group._addedLayers || group._layers;