@kq_npm/client3d_webgl_vue 3.9.8-beta → 4.0.0-beta

package/adddata/index.js

@@ -269,6 +269,7 @@ class AddDataViewModel {
     this._language = scenceView._language;
     this._geometryServerUrl = options.geometryServerUrl;
     this._geometryServerToken = options.geometryServerToken;
+    if (options.geojsonStyle) this._geojsonStyle = Object.assign({}, this._geojsonStyle, options.geojsonStyle);
   } //解析文件
 
 
@@ -299,9 +300,8 @@ class AddDataViewModel {
                 }
               });
 
-              that._viewer.dataSources.add(ds);
+              that._viewer.dataSources.add(ds); // ds.autoAvoid(that._viewer);
 
-              ds.autoAvoid(that._viewer);
 
               that._viewer.flyTo(ds);
 
@@ -342,9 +342,8 @@ class AddDataViewModel {
                 }
               });
 
-              that._viewer.dataSources.add(ds);
+              that._viewer.dataSources.add(ds); // ds.autoAvoid(that._viewer);
 
-              ds.autoAvoid(that._viewer);
 
               that._viewer.flyTo(ds);
 
@@ -416,9 +415,8 @@ class AddDataViewModel {
                   }
                 });
 
-                that._viewer.dataSources.add(ds);
+                that._viewer.dataSources.add(ds); // ds.autoAvoid(that._viewer);
 
-                ds.autoAvoid(that._viewer);
 
                 that._viewer.flyTo(ds);
 
@@ -1069,9 +1067,8 @@ class AddDataViewModel {
         wfsProvider.load().then(function (data) {
           var ds = new Cesium.Kq3dGeoJsonDataSource(name);
           ds.load(data, that._geojsonStyle).then(ds => {
-            that._viewer.dataSources.add(ds);
+            that._viewer.dataSources.add(ds); // ds.autoAvoid(that._viewer);
 
-            ds.autoAvoid(that._viewer);
 
             that._viewer.flyTo(ds);
 
@@ -1105,9 +1102,8 @@ class AddDataViewModel {
             }
           }, this);
 
-          this._viewer.dataSources.add(ds);
+          this._viewer.dataSources.add(ds); // ds.autoAvoid(this._viewer);
 
-          ds.autoAvoid(this._viewer);
 
           this._viewer.flyTo(ds);
 
@@ -1215,6 +1211,30 @@ class AddDataViewModel {
         });
         break;
 
+      case "s3m":
+        layer = this._viewer.scene.primitives.add(new Cesium.Kq3dS3MTilesLayer({
+          context: this._viewer.scene._context,
+          url: url,
+          maxVisibleDistance: 1000000,
+          minVisibleDistance: 0
+        }));
+        this.flyToLayer(layer);
+        if (!layer.guid) layer.guid = Cesium.createGuid();
+        node = {
+          guid: layer.guid,
+          name: name,
+          visible: true,
+          serverType: "3dtiles",
+          lsType: "ls",
+          url: url,
+          addType: type
+        };
+
+        this._layerManager.addTempLayerNode(node);
+
+        cb && cb(node);
+        break;
+
       default:
         break;
     }
@@ -1231,6 +1251,12 @@ class AddDataViewModel {
       });
     } else if (layer instanceof Cesium.Cesium3DTileset) {
       viewer.zoomTo(layer);
+    } else if (layer instanceof Cesium.Kq3dS3MTilesLayer) {
+      layer.readyPromise.then(function (tileset) {
+        viewer.camera.flyTo({
+          destination: tileset.rectangle
+        });
+      });
     } else if (layer instanceof Cesium.GeoJsonDataSource || layer instanceof Cesium.Kq3dGeoJsonDataSource || layer instanceof Cesium.KmlDataSource || layer instanceof Cesium.CzmlDataSource) {
       viewer.flyTo(layer);
     } else if (layer instanceof Cesium.Kq3dKQGISServerTerrainProvider || layer instanceof Cesium.Kq3dFileTerrainProvider || layer instanceof Cesium.CesiumTerrainProvider) {
@@ -1366,6 +1392,10 @@ const __default__ = {
     isRight: {
       type: Boolean,
       default: true
+    },
+    // geojson数据加载样式
+    geojsonStyle: {
+      type: Object
     }
   },
 
@@ -1477,6 +1507,12 @@ const __default__ = {
         namePlaceholder: language.value.unnamedLayer,
         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,
+        urlPlaceholder: language.value.format + ":http://<host>:<port>/xxx/realspace/datas/xxx/config",
+        description: language.value.imagertyS3Mdescription
       }, {
         type: "arcgismapserver",
         name: language.value.ArcGISMapServer,
@@ -1561,7 +1597,8 @@ const __default__ = {
         if (scenceView) {
           let options = {
             geometryServerUrl: props.geometryServerUrl,
-            geometryServerToken: props.geometryServerToken
+            geometryServerToken: props.geometryServerToken,
+            geojsonStyle: props.geojsonStyle
           };
           viewModel = new AddDataViewModel(scenceView, options);
         }

package/index.js

@@ -2171,9 +2171,9 @@ class LayerManager {
               }
             }, this);
 
-            this._viewer.dataSources.add(ds);
+            this._viewer.dataSources.add(ds); // ds.autoAvoid(this._viewer);
+
 
-            ds.autoAvoid(this._viewer);
             ds._guid = layerData.guid;
             layerData.shapeType = this.getShapeType(ds);
           });
@@ -2614,7 +2614,7 @@ class LayerManager {
     } else if (type === "3dtiles") {
       let primitives = this._viewer.scene.primitives._primitives;
       let layer = primitives.find(item => {
-        return item.guid === guid && item instanceof Cesium.Cesium3DTileset;
+        return item.guid === guid;
       });
       return layer;
     } else if (type === "datasource") {
@@ -3336,7 +3336,10 @@ class ScenceViewViewModel extends (mitt_default()) {
 
       case "tianditu":
         layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dTiandituImageryProvider({
-          mapStyle: layerConfig.layerType + "_c"
+          mapStyle: layerConfig.layerType + "_c",
+          maximumLevel: layerConfig.maximumLevel || null,
+          useCache: layerConfig.useCache || false,
+          key: layerConfig.key || Cesium.Kq3dTiandituImageryProvider.DEFAULT_KEY
         }), index);
         break;
 
@@ -22707,6 +22710,7 @@ class AddDataViewModel {
     this._language = scenceView._language;
     this._geometryServerUrl = options.geometryServerUrl;
     this._geometryServerToken = options.geometryServerToken;
+    if (options.geojsonStyle) this._geojsonStyle = Object.assign({}, this._geojsonStyle, options.geojsonStyle);
   } //解析文件
 
 
@@ -22737,9 +22741,8 @@ class AddDataViewModel {
                 }
               });
 
-              that._viewer.dataSources.add(ds);
+              that._viewer.dataSources.add(ds); // ds.autoAvoid(that._viewer);
 
-              ds.autoAvoid(that._viewer);
 
               that._viewer.flyTo(ds);
 
@@ -22780,9 +22783,8 @@ class AddDataViewModel {
                 }
               });
 
-              that._viewer.dataSources.add(ds);
+              that._viewer.dataSources.add(ds); // ds.autoAvoid(that._viewer);
 
-              ds.autoAvoid(that._viewer);
 
               that._viewer.flyTo(ds);
 
@@ -22854,9 +22856,8 @@ class AddDataViewModel {
                   }
                 });
 
-                that._viewer.dataSources.add(ds);
+                that._viewer.dataSources.add(ds); // ds.autoAvoid(that._viewer);
 
-                ds.autoAvoid(that._viewer);
 
                 that._viewer.flyTo(ds);
 
@@ -23507,9 +23508,8 @@ class AddDataViewModel {
         wfsProvider.load().then(function (data) {
           var ds = new Cesium.Kq3dGeoJsonDataSource(name);
           ds.load(data, that._geojsonStyle).then(ds => {
-            that._viewer.dataSources.add(ds);
+            that._viewer.dataSources.add(ds); // ds.autoAvoid(that._viewer);
 
-            ds.autoAvoid(that._viewer);
 
             that._viewer.flyTo(ds);
 
@@ -23543,9 +23543,8 @@ class AddDataViewModel {
             }
           }, this);
 
-          this._viewer.dataSources.add(ds);
+          this._viewer.dataSources.add(ds); // ds.autoAvoid(this._viewer);
 
-          ds.autoAvoid(this._viewer);
 
           this._viewer.flyTo(ds);
 
@@ -23653,6 +23652,30 @@ class AddDataViewModel {
         });
         break;
 
+      case "s3m":
+        layer = this._viewer.scene.primitives.add(new Cesium.Kq3dS3MTilesLayer({
+          context: this._viewer.scene._context,
+          url: url,
+          maxVisibleDistance: 1000000,
+          minVisibleDistance: 0
+        }));
+        this.flyToLayer(layer);
+        if (!layer.guid) layer.guid = Cesium.createGuid();
+        node = {
+          guid: layer.guid,
+          name: name,
+          visible: true,
+          serverType: "3dtiles",
+          lsType: "ls",
+          url: url,
+          addType: type
+        };
+
+        this._layerManager.addTempLayerNode(node);
+
+        cb && cb(node);
+        break;
+
       default:
         break;
     }
@@ -23669,6 +23692,12 @@ class AddDataViewModel {
       });
     } else if (layer instanceof Cesium.Cesium3DTileset) {
       viewer.zoomTo(layer);
+    } else if (layer instanceof Cesium.Kq3dS3MTilesLayer) {
+      layer.readyPromise.then(function (tileset) {
+        viewer.camera.flyTo({
+          destination: tileset.rectangle
+        });
+      });
     } else if (layer instanceof Cesium.GeoJsonDataSource || layer instanceof Cesium.Kq3dGeoJsonDataSource || layer instanceof Cesium.KmlDataSource || layer instanceof Cesium.CzmlDataSource) {
       viewer.flyTo(layer);
     } else if (layer instanceof Cesium.Kq3dKQGISServerTerrainProvider || layer instanceof Cesium.Kq3dFileTerrainProvider || layer instanceof Cesium.CesiumTerrainProvider) {
@@ -23802,6 +23831,10 @@ const AddDatavue_type_script_setup_true_lang_js_default_ = {
     isRight: {
       type: Boolean,
       default: true
+    },
+    // geojson数据加载样式
+    geojsonStyle: {
+      type: Object
     }
   },
 
@@ -23913,6 +23946,12 @@ const AddDatavue_type_script_setup_true_lang_js_default_ = {
         namePlaceholder: language.value.unnamedLayer,
         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,
+        urlPlaceholder: language.value.format + ":http://<host>:<port>/xxx/realspace/datas/xxx/config",
+        description: language.value.imagertyS3Mdescription
       }, {
         type: "arcgismapserver",
         name: language.value.ArcGISMapServer,
@@ -23997,7 +24036,8 @@ const AddDatavue_type_script_setup_true_lang_js_default_ = {
         if (scenceView) {
           let options = {
             geometryServerUrl: props.geometryServerUrl,
-            geometryServerToken: props.geometryServerToken
+            geometryServerToken: props.geometryServerToken,
+            geojsonStyle: props.geojsonStyle
           };
           viewModel = new AddDataViewModel(scenceView, options);
         }

package/package.json

@@ -1 +1 @@
-{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"3.9.8-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","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.0-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","css-vars-ponyfill":"^2.4.8","html2canvas":"^1.4.1","xe-utils":"^3.5.4"}}

package/scenceview/index.js

@@ -186,6 +186,7 @@ class AddDataViewModel {
     this._language = scenceView._language;
     this._geometryServerUrl = options.geometryServerUrl;
     this._geometryServerToken = options.geometryServerToken;
+    if (options.geojsonStyle) this._geojsonStyle = Object.assign({}, this._geojsonStyle, options.geojsonStyle);
   } //解析文件
 
 
@@ -216,9 +217,8 @@ class AddDataViewModel {
                 }
               });
 
-              that._viewer.dataSources.add(ds);
+              that._viewer.dataSources.add(ds); // ds.autoAvoid(that._viewer);
 
-              ds.autoAvoid(that._viewer);
 
               that._viewer.flyTo(ds);
 
@@ -259,9 +259,8 @@ class AddDataViewModel {
                 }
               });
 
-              that._viewer.dataSources.add(ds);
+              that._viewer.dataSources.add(ds); // ds.autoAvoid(that._viewer);
 
-              ds.autoAvoid(that._viewer);
 
               that._viewer.flyTo(ds);
 
@@ -333,9 +332,8 @@ class AddDataViewModel {
                   }
                 });
 
-                that._viewer.dataSources.add(ds);
+                that._viewer.dataSources.add(ds); // ds.autoAvoid(that._viewer);
 
-                ds.autoAvoid(that._viewer);
 
                 that._viewer.flyTo(ds);
 
@@ -986,9 +984,8 @@ class AddDataViewModel {
         wfsProvider.load().then(function (data) {
           var ds = new Cesium.Kq3dGeoJsonDataSource(name);
           ds.load(data, that._geojsonStyle).then(ds => {
-            that._viewer.dataSources.add(ds);
+            that._viewer.dataSources.add(ds); // ds.autoAvoid(that._viewer);
 
-            ds.autoAvoid(that._viewer);
 
             that._viewer.flyTo(ds);
 
@@ -1022,9 +1019,8 @@ class AddDataViewModel {
             }
           }, this);
 
-          this._viewer.dataSources.add(ds);
+          this._viewer.dataSources.add(ds); // ds.autoAvoid(this._viewer);
 
-          ds.autoAvoid(this._viewer);
 
           this._viewer.flyTo(ds);
 
@@ -1132,6 +1128,30 @@ class AddDataViewModel {
         });
         break;
 
+      case "s3m":
+        layer = this._viewer.scene.primitives.add(new Cesium.Kq3dS3MTilesLayer({
+          context: this._viewer.scene._context,
+          url: url,
+          maxVisibleDistance: 1000000,
+          minVisibleDistance: 0
+        }));
+        this.flyToLayer(layer);
+        if (!layer.guid) layer.guid = Cesium.createGuid();
+        node = {
+          guid: layer.guid,
+          name: name,
+          visible: true,
+          serverType: "3dtiles",
+          lsType: "ls",
+          url: url,
+          addType: type
+        };
+
+        this._layerManager.addTempLayerNode(node);
+
+        cb && cb(node);
+        break;
+
       default:
         break;
     }
@@ -1148,6 +1168,12 @@ class AddDataViewModel {
       });
     } else if (layer instanceof Cesium.Cesium3DTileset) {
       viewer.zoomTo(layer);
+    } else if (layer instanceof Cesium.Kq3dS3MTilesLayer) {
+      layer.readyPromise.then(function (tileset) {
+        viewer.camera.flyTo({
+          destination: tileset.rectangle
+        });
+      });
     } else if (layer instanceof Cesium.GeoJsonDataSource || layer instanceof Cesium.Kq3dGeoJsonDataSource || layer instanceof Cesium.KmlDataSource || layer instanceof Cesium.CzmlDataSource) {
       viewer.flyTo(layer);
     } else if (layer instanceof Cesium.Kq3dKQGISServerTerrainProvider || layer instanceof Cesium.Kq3dFileTerrainProvider || layer instanceof Cesium.CesiumTerrainProvider) {
@@ -1283,6 +1309,10 @@ const __default__ = {
     isRight: {
       type: Boolean,
       default: true
+    },
+    // geojson数据加载样式
+    geojsonStyle: {
+      type: Object
     }
   },
 
@@ -1394,6 +1424,12 @@ const __default__ = {
         namePlaceholder: language.value.unnamedLayer,
         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,
+        urlPlaceholder: language.value.format + ":http://<host>:<port>/xxx/realspace/datas/xxx/config",
+        description: language.value.imagertyS3Mdescription
       }, {
         type: "arcgismapserver",
         name: language.value.ArcGISMapServer,
@@ -1478,7 +1514,8 @@ const __default__ = {
         if (scenceView) {
           let options = {
             geometryServerUrl: props.geometryServerUrl,
-            geometryServerToken: props.geometryServerToken
+            geometryServerToken: props.geometryServerToken,
+            geojsonStyle: props.geojsonStyle
           };
           viewModel = new AddDataViewModel(scenceView, options);
         }
@@ -28121,9 +28158,9 @@ class LayerManager {
               }
             }, this);
 
-            this._viewer.dataSources.add(ds);
+            this._viewer.dataSources.add(ds); // ds.autoAvoid(this._viewer);
+
 
-            ds.autoAvoid(this._viewer);
             ds._guid = layerData.guid;
             layerData.shapeType = this.getShapeType(ds);
           });
@@ -28564,7 +28601,7 @@ class LayerManager {
     } else if (type === "3dtiles") {
       let primitives = this._viewer.scene.primitives._primitives;
       let layer = primitives.find(item => {
-        return item.guid === guid && item instanceof Cesium.Cesium3DTileset;
+        return item.guid === guid;
       });
       return layer;
     } else if (type === "datasource") {
@@ -29286,7 +29323,10 @@ class ScenceViewViewModel extends (mitt_default()) {
 
       case "tianditu":
         layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dTiandituImageryProvider({
-          mapStyle: layerConfig.layerType + "_c"
+          mapStyle: layerConfig.layerType + "_c",
+          maximumLevel: layerConfig.maximumLevel || null,
+          useCache: layerConfig.useCache || false,
+          key: layerConfig.key || Cesium.Kq3dTiandituImageryProvider.DEFAULT_KEY
         }), index);
         break;