From a6ab25145a4b82f5a7fd1b8cc4a3f027b0f8c608 Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期日, 28 五月 2023 11:24:39 +0800
Subject: [PATCH] Merge branch 'master' of http://103.85.165.99:8989/r/LFWEB_NEW
---
src/views/Tools/LayerTree.vue | 39 ++++++++++++++++++++-------------------
1 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/src/views/Tools/LayerTree.vue b/src/views/Tools/LayerTree.vue
index d1577b4..1439953 100644
--- a/src/views/Tools/LayerTree.vue
+++ b/src/views/Tools/LayerTree.vue
@@ -313,11 +313,11 @@
}
}
- if (obj.WMS.length) this.setChangeWMS(obj.WMS, checked);
- if (obj.Tileset.length) this.setChangeTileset(obj.Tileset, checked);
+ this.setChangeDEM(obj.DEM, checked);
if (obj.TMS.length) this.setChangeTMS(obj.TMS, checked);
if (obj.Mpt.length) this.setChangeMpt(obj.Mpt, checked);
- if (obj.DEM.length) this.setChangeDEM(obj.DEM, checked);
+ if (obj.Tileset.length) this.setChangeTileset(obj.Tileset, checked);
+ if (obj.WMS.length) this.setChangeWMS(obj.WMS, checked);
},
// 鑾峰彇瀛愯妭鐐�
getNodes (data, arr) {
@@ -464,7 +464,7 @@
let layer = Viewer.imageryLayers.addImageryProvider(new Cesium.UrlTemplateImageryProvider({
url: res.url,
maximumLevel: 22,
- }));
+ }), 1); // addImageryProvider -> add
layer.id = res.id;
layer.name = res.cnName;
}
@@ -505,36 +505,37 @@
},
// 鍒囨崲DEM
setChangeDEM (layers, checked) {
- let ids = this.getCheckNodesIds(), arr = [], isDel = false, useSG = false;
+ let ids = this.getCheckNodesIds(), arr = [];
for (let i in layers) {
let layer = layers[i];
if (ids.indexOf(layer.id) != -1) {
arr.push(layer.url);
continue;
}
-
- if (window.Viewer.terrainProvider._layers[0].resource._url == layer.url) isDel = true; // 鍒犻櫎DEM
}
- if (!arr.length && isDel) useSG = true; // demLayer
- if (arr.length) this.addDEMLayers(arr[0], useSG);
+ let url = arr.length ? arr[arr.length - 1] : null;
+ this.addDEMLayers(url, null == url);
},
// 娣诲姞DEM鍥惧眰
- addDEMLayer (url, useSG) {
+ addDEMLayers (url, useSG) {
if (useSG) {
+ if (Viewer.terrainProvider._isMPT) return;
+
let option = {
url: window.sceneConfig.SGUrl,
layerName: window.sceneConfig.mptName,
requestVertexNormals: true
};
- window.terrainLayer = sgworld.Creator.sfsterrainprovider("", option, "", true, "");
- } else {
- window.terrainLayer = new Cesium.CesiumTerrainProvider({
- url: url,
- requestVertexNormals: true
- });
+ sgworld.Creator.sfsterrainprovider("", option, "", true, "");
+ return;
}
- Viewer.terrainProvider = terrainLayer;
+
+ if (url.indexOf("{host}") > -1) url = url.replace("{host}", iisHost);
+ Viewer.terrainProvider = new Cesium.CesiumTerrainProvider({
+ url: url,
+ requestVertexNormals: true
+ });
},
// 璁剧疆Tileset鍙傛暟
async setTilesetArgs (tileset, res) {
@@ -544,7 +545,7 @@
}
const data = await comprehensive_selectPubById({ id: res.pubid })
- if (data.code == 200) this.setTilesetCoord(tileset, data.result.json);
+ if (data.code == 200 && data.result.json) this.setTilesetCoord(tileset, data.result.json);
},
// 璁剧疆Tileset楂樺害
setTilesetHeigth (tileset, height) {
@@ -587,7 +588,7 @@
minimumLevel: data.result.min
});
- let layer = Viewer.imageryLayers.addImageryProvider(provider);
+ let layer = Viewer.imageryLayers.addImageryProvider(provider, 1);
layer.name = res.cnName;
// if (data.result.geom) {
--
Gitblit v1.9.3