@kq_npm/client3d_webgl_vue 0.7.6-beta → 0.7.8-beta

package/package.json

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

package/scenceview/index.js

@@ -664,8 +664,10 @@ class LayerManager {
             source.mapServerInfo = (0,util_namespaceObject.formatKQMapInfo)(mapInfo.result, serverUrl, serverName, token, null, true);
             source.mapServerInfo.layers_old.forEach(layer_old => {
               layer_old.guid = source.name + "@@@" + layer_old.id;
-            });
-            this._layerListData_old = this._layerListData_old.concat(source.mapServerInfo.layers_old);
+              layer_old.sourceName = source.name;
+
+              this._layerListData_old.push(layer_old);
+            }, this);
           });
           sourcePromises.push(sourcePromise);
         }
@@ -678,7 +680,20 @@ class LayerManager {
         Promise.all(this._promises).then(() => {
           this._layerTreeData = layer.layerTreeData;
 
-          this._scenceView.fire("resetLayerDatas");
+          this._scenceView.fire("resetLayerDatas"); //重置Imagerylayer图层顺序，wms和wmts异步加载导致图层顺序错乱
+
+
+          this._layerListData.forEach(layerData => {
+            if (layerData.serverType === "imagerylayer") {
+              var imagerylayer = this.getLayerByGuid(layerData.guid, 'imagerylayer');
+
+              if (imagerylayer) {
+                this._viewer.imageryLayers.raiseToTop(imagerylayer);
+              }
+            }
+          }, this);
+
+          this.recordImageryLayerOriginIndex();
         });
       });
     }
@@ -701,6 +716,7 @@ class LayerManager {
           layerData.sourceType = source.serverType;
           layerData.renderType = source.renderType;
           layerData.url = source.url;
+          layerData.guid = layerData.sourceName + "@@@" + (layerData.id || Math.random() * 10);
           var type = layerData.renderType;
 
           if (layerData.sourceType === "kqserver") {
@@ -729,16 +745,16 @@ class LayerManager {
             type = "kqgis3dserver";
           }
 
-          var promise = this.addLayerData(layerData, type);
+          layerData.addType = type;
 
-          if (promise) {
-            this._promises.push(promise);
+          this._layerListData.push(layerData);
 
-            promise.then(() => {
-              this._layerListData.push(layerData);
-            });
-          } else {
-            this._layerListData.push(layerData);
+          if (!this._scenceShowLayers || this._scenceShowLayers.indexOf(layerData.name) > -1) {
+            var promise = this.addLayerData(layerData);
+
+            if (promise) {
+              this._promises.push(promise);
+            }
           }
         }
       }
@@ -746,7 +762,8 @@ class LayerManager {
   } //添加图层数据
 
 
-  addLayerData(layerData, type) {
+  addLayerData(layerData) {
+    var type = layerData.addType;
     let url = layerData.url;
     type = type || "";
     type = type.toLowerCase();
@@ -782,15 +799,9 @@ class LayerManager {
           name: name,
           url: url
         }));
-        layerData.guid = layer.guid;
+        this._guidMapping[layerData.guid] = layer.guid;
         layerData.visible = true;
         layerData.serverType = "imagerylayer";
-
-        if (this._scenceShowLayers && this._scenceShowLayers.indexOf(name) === -1) {
-          layerData.visible = false;
-          layer.show = false;
-        }
-
         break;
 
       case 'obterrain':
@@ -800,18 +811,13 @@ class LayerManager {
           url: url
         });
         if (!layer.guid) layer.guid = Cesium.createGuid();
-        layerData.guid = layer.guid;
+        this._guidMapping[layerData.guid] = layer.guid;
         layerData.visible = true;
-        layerData.serverType = "terrainprovider"; //this._viewer.terrainProvider = layer;
+        layerData.serverType = "terrainprovider";
+        this._viewer.terrainProvider = layer;
 
         this._terrainProviders.push(layer);
 
-        if (this._scenceShowLayers && this._scenceShowLayers.indexOf(name) === -1) {
-          layerData.visible = false;
-        } else {
-          this._viewer.terrainProvider = layer;
-        }
-
         break;
 
       case 'stkterrain':
@@ -822,20 +828,14 @@ class LayerManager {
           requestVertexNormals: true,
           requestWaterMask: false
         });
-        if (!layer.guid) layer.guid = Cesium.createGuid(); //this._viewer.terrainProvider = layer;
+        if (!layer.guid) layer.guid = Cesium.createGuid();
+        this._viewer.terrainProvider = layer;
 
         this._terrainProviders.push(layer);
 
-        layerData.guid = layer.guid;
+        this._guidMapping[layerData.guid] = layer.guid;
         layerData.visible = true;
         layerData.serverType = "terrainprovider";
-
-        if (this._scenceShowLayers && this._scenceShowLayers.indexOf(name) === -1) {
-          layerData.visible = false;
-        } else {
-          this._viewer.terrainProvider = layer;
-        }
-
         break;
 
       case "3dtiles":
@@ -843,87 +843,36 @@ class LayerManager {
           name: name,
           url: url
         }));
-        layerData.guid = layer.guid;
+        this._guidMapping[layerData.guid] = layer.guid;
         layerData.visible = true;
         layerData.serverType = "3dtiles";
-
-        if (this._scenceShowLayers && this._scenceShowLayers.indexOf(name) === -1) {
-          layerData.visible = false;
-          layer.show = false;
-        }
-
         break;
 
       case "kqgis3dserver":
-        var hideLayer = this._scenceShowLayers && this._scenceShowLayers.indexOf(name) === -1;
         var that = this;
         promise = this._viewer.addKq3dServerLayerGroupExt(url).then(group => {
           var layers = group._addedLayers || group._layers;
 
-          if (layers) {
-            var length = layers.length;
-
-            if (length > 1) {
-              layerData.guid = group.guid;
-              layerData.children = [];
+          if (layers && layers.length > 0) {
+            layer = layers[0];
+            var serverType = "";
+
+            if (layer instanceof Cesium.Cesium3DTileset) {
+              serverType = "3dtiles";
+            } else if (layer instanceof Cesium.ImageryLayer) {
+              serverType = "imagerylayer";
+            } else if (layer instanceof Cesium.Kq3dFileTerrainProvider || layer instanceof Cesium.CesiumTerrainProvider) {
+              serverType = "terrainprovider";
+
+              that._terrainProviders.push(layer);
+            } else if (layer instanceof Cesium.Kq3dGeoJsonDataSource) {
+              serverType = "datasource";
             }
 
-            for (var i = 0; i < length; i++) {
-              var serverType = "";
-
-              if (layers[i] instanceof Cesium.Cesium3DTileset) {
-                serverType = "3dtiles";
-              } else if (layers[i] instanceof Cesium.ImageryLayer) {
-                serverType = "imagerylayer";
-              } else if (layers[i] instanceof Cesium.Kq3dFileTerrainProvider || layers[i] instanceof Cesium.CesiumTerrainProvider) {
-                serverType = "terrainprovider";
-
-                that._terrainProviders.push(layers[i]);
-              } else if (layers[i] instanceof Cesium.Kq3dGeoJsonDataSource) {
-                serverType = "datasource";
-              }
-
-              if (!layers[i].guid) layers[i].guid = Cesium.createGuid();
-
-              if (length > 1) {
-                var child = {
-                  guid: layers[i].guid,
-                  name: layers[i].name,
-                  visible: true,
-                  serverType: serverType
-                };
-
-                if (hideLayer) {
-                  child.visible = false;
-
-                  if (serverType === "terrainprovider") {
-                    layers[i].readyPromise.then(() => {
-                      that._viewer.terrainProvider = that._emptyTerrainProvider;
-                    });
-                  } else {
-                    layers[i].show = false;
-                  }
-                }
-
-                layerData.children.push(child);
-              } else {
-                layerData.guid = layers[i].guid;
-                layerData.visible = true;
-                layerData.serverType = serverType;
-
-                if (hideLayer) {
-                  layerData.visible = false;
-
-                  if (serverType === "terrainprovider") {
-                    layers[i].readyPromise.then(() => {
-                      that._viewer.terrainProvider = that._emptyTerrainProvider;
-                    });
-                  } else {
-                    layers[i].show = false;
-                  }
-                }
-              }
-            }
+            if (!layer.guid) layer.guid = Cesium.createGuid();
+            this._guidMapping[layerData.guid] = layer.guid;
+            layerData.visible = true;
+            layerData.serverType = serverType;
           }
         });
         break;
@@ -934,19 +883,12 @@ class LayerManager {
           url: url,
           layerName: layerData.layerName
         }));
-        layerData.guid = layer.guid;
+        this._guidMapping[layerData.guid] = layer.guid;
         layerData.visible = true;
         layerData.serverType = "imagerylayer";
-
-        if (this._scenceShowLayers && this._scenceShowLayers.indexOf(name) === -1) {
-          layerData.visible = false;
-          layer.show = false;
-        }
-
         break;
 
       case "kqgismapserver":
-        layerData.guid = layerData.sourceName + "@@@" + layerData.id;
         var layerInfo = layerData.sourceLayers.find(item => {
           return item.id + "" == layerData.id + "";
         });
@@ -970,11 +912,6 @@ class LayerManager {
 
           this._guidMapping[layerData.guid] = layer.guid;
           layerData.serverType = "imagerylayer";
-
-          if (this._scenceShowLayers && this._scenceShowLayers.indexOf(layerData.name) === -1) {
-            layerData.visible = false;
-            layer.show = false;
-          }
         }
 
         break;
@@ -984,18 +921,10 @@ class LayerManager {
           name: name,
           url: url,
           layers: layerData.id + ""
-        })); //layerData.guid = layer.guid;
-
-        layerData.guid = layerData.sourceName + "@@@" + layerData.id;
+        }));
         this._guidMapping[layerData.guid] = layer.guid;
         layerData.visible = true;
         layerData.serverType = "imagerylayer";
-
-        if (this._scenceShowLayers && this._scenceShowLayers.indexOf(name) === -1) {
-          layerData.visible = false;
-          layer.show = false;
-        }
-
         break;
 
       case "wms":
@@ -1021,16 +950,10 @@ class LayerManager {
               }
             }
 
-            layerData.guid = layerData.sourceName + "@@@" + layerData.id;
             this._guidMapping[layerData.guid] = layers[0].guid;
             layerData.name = name || layers[0].name;
             layerData.visible = true;
             layerData.serverType = "imagerylayer";
-
-            if (this._scenceShowLayers && this._scenceShowLayers.indexOf(layerData.name) === -1) {
-              layerData.visible = false;
-              layers[0].show = false;
-            }
           }
         });
         break;
@@ -1058,16 +981,10 @@ class LayerManager {
               }
             }
 
-            layerData.guid = layerData.sourceName + "@@@" + layerData.id;
             this._guidMapping[layerData.guid] = layers[0].guid;
             layerData.name = name || layers[0].name;
             layerData.visible = true;
             layerData.serverType = "imagerylayer";
-
-            if (this._scenceShowLayers && this._scenceShowLayers.indexOf(layerData.name) === -1) {
-              layerData.visible = false;
-              layers[0].show = false;
-            }
           }
         });
         break;
@@ -1095,14 +1012,9 @@ class LayerManager {
           this._viewer.dataSources.add(ds);
 
           ds.autoAvoid(this._viewer);
-          layerData.guid = ds.guid;
+          this._guidMapping[layerData.guid] = ds.guid;
           layerData.visible = true;
           layerData.serverType = "datasource";
-
-          if (this._scenceShowLayers && this._scenceShowLayers.indexOf(name) === -1) {
-            layerData.visible = false;
-            ds.show = false;
-          }
         });
         break;
 
@@ -1115,14 +1027,9 @@ class LayerManager {
         promise = ds.load(url).then(ds => {
           this._viewer.dataSources.add(ds);
 
-          layerData.guid = ds.guid;
+          this._guidMapping[layerData.guid] = ds.guid;
           layerData.visible = true;
           layerData.serverType = "datasource";
-
-          if (this._scenceShowLayers && this._scenceShowLayers.indexOf(name) === -1) {
-            layerData.visible = false;
-            ds.show = false;
-          }
         });
         break;
 
@@ -1131,14 +1038,9 @@ class LayerManager {
         promise = ds.load(url).then(ds => {
           this._viewer.dataSources.add(ds);
 
-          layerData.guid = ds.guid;
+          this._guidMapping[layerData.guid] = ds.guid;
           layerData.visible = true;
           layerData.serverType = "datasource";
-
-          if (this._scenceShowLayers && this._scenceShowLayers.indexOf(name) === -1) {
-            layerData.visible = false;
-            ds.show = false;
-          }
         });
         break;
 
@@ -1146,72 +1048,40 @@ class LayerManager {
         layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dTiandituImageryProvider({
           name: name,
           mapStyle: layerData.layerType + "_c"
-        })); //layerData.guid = layer.guid;
-
-        layerData.guid = layerData.sourceName + "@@@" + layerData.layerType;
+        }));
         this._guidMapping[layerData.guid] = layer.guid;
         layerData.visible = true;
         layerData.serverType = "imagerylayer";
-
-        if (this._scenceShowLayers && this._scenceShowLayers.indexOf(name) === -1) {
-          layerData.visible = false;
-          layer.show = false;
-        }
-
         break;
 
       case "baidu":
         layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dBaiduMapsImageryProvider({
           name: name,
           mapStyle: layerData.layerType
-        })); //layerData.guid = layer.guid;
-
-        layerData.guid = layerData.sourceName + "@@@" + layerData.layerType;
+        }));
         this._guidMapping[layerData.guid] = layer.guid;
         layerData.visible = true;
         layerData.serverType = "imagerylayer";
-
-        if (this._scenceShowLayers && this._scenceShowLayers.indexOf(name) === -1) {
-          layerData.visible = false;
-          layer.show = false;
-        }
-
         break;
 
       case "gaode":
         layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dAMapsImageryProvider({
           name: name,
           mapStyle: layerData.layerType
-        })); //layerData.guid = layer.guid;
-
-        layerData.guid = layerData.sourceName + "@@@" + layerData.layerType;
+        }));
         this._guidMapping[layerData.guid] = layer.guid;
         layerData.visible = true;
         layerData.serverType = "imagerylayer";
-
-        if (this._scenceShowLayers && this._scenceShowLayers.indexOf(name) === -1) {
-          layerData.visible = false;
-          layer.show = false;
-        }
-
         break;
 
       case "tencent":
         layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dQQMapsImageryProvider({
           name: name,
           mapStyle: layerData.layerType
-        })); //layerData.guid = layer.guid;
-
-        layerData.guid = layerData.sourceName + "@@@" + layerData.layerType;
+        }));
         this._guidMapping[layerData.guid] = layer.guid;
         layerData.visible = true;
         layerData.serverType = "imagerylayer";
-
-        if (this._scenceShowLayers && this._scenceShowLayers.indexOf(name) === -1) {
-          layerData.visible = false;
-          layer.show = false;
-        }
-
         break;
 
       default:
@@ -1372,6 +1242,33 @@ class LayerManager {
               }
 
               this.recordImageryLayerOriginIndex();
+            } else if (this._layerListData[i].sourceType) {
+              var promise = this.addLayerData(this._layerListData[i]);
+
+              if (promise) {
+                promise.then(() => {
+                  adjustLayerIndex(this._layerListData[i]);
+                });
+              } else {
+                adjustLayerIndex(this._layerListData[i]);
+              }
+
+              var that = this;
+
+              function adjustLayerIndex(layerData) {
+                if (layerData.serverType === "imagerylayer") {
+                  var addIndex = that.getImageryLayerAddIndex(layerData.guid);
+                  layer = that.getLayerByGuid(layerData.guid, layerData.serverType);
+
+                  if (layer) {
+                    var count = layer._layerIndex - addIndex;
+
+                    for (var i = 0; i < count; i++) {
+                      that._viewer.imageryLayers.lower(layer);
+                    }
+                  }
+                }
+              }
             }
           }
         }
@@ -1591,7 +1488,7 @@ class LayerManager {
 
     for (let i = 0; i < layers_checked.length; i++) {
       if (layers_checked[i].combined) {
-        getChildren(layers_checked[i].id);
+        getChildren(layers_checked[i]);
       } else {
         layerData.push(layers_checked[i]);
       }
@@ -1599,12 +1496,12 @@ class LayerManager {
 
     return layerData;
 
-    function getChildren(parentId) {
+    function getChildren(parent) {
       for (let z = 0; z < layers_old.length; z++) {
-        if (layers_old[z].parentLayerId === parentId) {
+        if (layers_old[z].parentLayerId === parent.id && layers_old[z].sourceName === parent.sourceName) {
           // 分组节点
           if (layers_old[z].groupLayer) {
-            getChildren(layers_old[z].id);
+            getChildren(layers_old[z]);
           } else {
             layerData.push(layers_old[z]);
           }