@kq_npm/client3d_webgl_vue 4.0.1-beta → 4.0.3-beta

package/adddata/index.js

@@ -754,6 +754,7 @@ class AddDataViewModel {
 
 
   parseService(options, cb) {
+    let that = this;
     let url = options.url;
     let type = options.type || "";
     type = type.toLowerCase();
@@ -770,7 +771,7 @@ class AddDataViewModel {
       if (["kml", "kmz", "czml", "geojson", "json", "topojson"].indexOf(ext) > -1) {
         name = url.substring(url.lastIndexOf("/") + 1);
       } else {
-        if (type !== "wms" && type !== "wmts") {
+        if (type !== "wms" && type !== "wmts" && type !== 'kqgisaggregationserver') {
           name = url.substring(0, url.lastIndexOf("/"));
           name = name.substring(name.lastIndexOf("/") + 1);
         }
@@ -883,7 +884,9 @@ class AddDataViewModel {
         break;
 
       case "kqgis3dserver":
-        this._viewer.addKq3dServerLayerGroupExt(url).then(group => {
+        this._viewer.addKq3dServerLayerGroupExt(url, {
+          viewer: this._viewer
+        }).then(group => {
           var layers = group._addedLayers || group._layers;
 
           if (layers && layers.length > 0) {
@@ -921,12 +924,16 @@ class AddDataViewModel {
                 serverType = "datasource";
                 addType = "geojson";
                 url = layers[i]._baseUri + layers[i]._name;
+              } else if (layers[i] instanceof Cesium.Kq3dS3MTilesLayer) {
+                serverType = "s3m";
+                addType = "s3m";
+                url = layers[i]._url;
               }
 
               if (!layers[i].guid) layers[i].guid = Cesium.createGuid();
               node.children.push({
                 guid: layers[i].guid,
-                name: layers[i].name,
+                name: layers[i].name || layers[i]._name,
                 visible: true,
                 serverType: serverType,
                 url: url,
@@ -945,28 +952,69 @@ class AddDataViewModel {
         break;
 
       case "kqgisimageserver":
-        layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dKQGISServerImageryProviderExt({
-          name: name,
-          url: url,
-          layerName: name
-        }));
-        this.flyToLayer(layer);
+        // KQGIS 影像服务
         node = {
-          guid: layer.guid,
+          guid: Cesium.createGuid(),
           name: name,
-          visible: true,
-          serverType: "imagerylayer",
-          lsType: "ls",
-          url: url,
-          addType: type,
-          layerName: name,
-          type: "Image" // 图层树显示图标使用
-
+          children: [],
+          lsType: "ls"
         };
+        const service = new KqGIS.Map.GetMapImageInfoService(url);
+        service.init(result => {
+          if (result.resultcode === "success") {
+            let list = service.collectionInfoList;
+
+            if (list && list.length > 0) {
+              list.forEach(item => {
+                layer = that._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dKQGISServerImageryProviderExt({
+                  name: item.collectionName,
+                  url: url,
+                  layerName: item.collectionName
+                }));
+                node.children.push({
+                  guid: layer.guid,
+                  name: item.collectionName,
+                  visible: true,
+                  serverType: "imagerylayer",
+                  lsType: "ls",
+                  url: url,
+                  addType: type,
+                  layerName: item.collectionName,
+                  type: "Image" // 图层树显示图标使用
 
-        this._layerManager.addTempLayerNode(node);
+                });
+              });
+              this.flyToLayer(layer);
+
+              this._layerManager.addTempLayerNode(node);
+
+              cb && cb(node);
+            }
+          } else {
+            console.log('解析服务原始信息失败.');
+          }
+        }); // layer = this._viewer.imageryLayers.addImageryProvider(
+        //   new Cesium.Kq3dKQGISServerImageryProviderExt({
+        //     name: name,
+        //     url: url,
+        //     layerName: name
+        //   })
+        // );
+        // this.flyToLayer(layer);
+        // node = {
+        //   guid: layer.guid,
+        //   name: name,
+        //   visible: true,
+        //   serverType: "imagerylayer",
+        //   lsType: "ls",
+        //   url: url,
+        //   addType: type,
+        //   layerName: name,
+        //   type: "Image" // 图层树显示图标使用
+        // };
+        // this._layerManager.addTempLayerNode(node);
+        // cb && cb(node);
 
-        cb && cb(node);
         break;
 
       case "kqgismapserver":
@@ -1153,9 +1201,18 @@ class AddDataViewModel {
       case "wmts":
       case "kqgistileserver":
       case "kqgisaggregationserver":
+        if (type === "kqgistileserver") {
+          if (url.indexOf('?') > 0) {
+            url = url.replace('?', '/wmts?');
+          } else {
+            url += '/wmts';
+          }
+        }
+
+        let defaultName = 'wmts';
+
         this._viewer.addWMTSLayerGroup(url).then(group => {
-          var defaultName = 'wmts';
-          if (type === "kqgistileserver") defaultName = 'tile';
+          // if(type === "kqgistileserver") defaultName = name;
           if (type === "kqgisaggregationserver") defaultName = 'aggregation';
           node = {
             guid: group.guid,
@@ -1201,7 +1258,6 @@ class AddDataViewModel {
           url: url,
           typeName: name
         });
-        var that = this;
         wfsProvider.load().then(function (data) {
           var ds = new Cesium.Kq3dGeoJsonDataSource(name);
           ds.load(data, that._geojsonStyle).then(ds => {
@@ -1625,7 +1681,7 @@ const __default__ = {
       }, {
         type: "kqgisimageserver",
         name: language.value.KQGISImageServer,
-        namePlaceholder: language.value.imageCollectionName,
+        namePlaceholder: language.value.unnamedLayer,
         urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/image",
         description: language.value.imagertyImageServerdescription
       }, {
@@ -1638,7 +1694,7 @@ const __default__ = {
         type: "kqgistileserver",
         name: language.value.KQGISTileServer,
         namePlaceholder: language.value.unnamedLayer,
-        urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/tile/wmts",
+        urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/tile",
         description: language.value.imagertyTileServerdescription
       }, {
         type: "kqgisaggregationserver",