From 672f791281b80a61dbda7d2c2d426dd90b31b982 Mon Sep 17 00:00:00 2001
From: ChenZeping02609 <chenzeping02609@163.com>
Date: 星期四, 13 五月 2021 16:42:23 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/LayerController/service/WmsLayerService.js | 70 +++++++++++++++++++++--------------
1 files changed, 42 insertions(+), 28 deletions(-)
diff --git a/src/components/LayerController/service/WmsLayerService.js b/src/components/LayerController/service/WmsLayerService.js
index 36aba46..0094a71 100644
--- a/src/components/LayerController/service/WmsLayerService.js
+++ b/src/components/LayerController/service/WmsLayerService.js
@@ -1,7 +1,7 @@
import AjaxUtils from '../../../utils/AjaxUtils'
import { PIPELINE_WMS } from '../../../conf/Constants'
import Popup from '@views/popup/Popup'
-import List from '../../../utils/List'
+import WmsLayerList from '../dataset/WmsLayerList'
/**
* todo 寰楄�冭檻涓�涓浘灞傞厤缃簡澶氫釜 wmsLayers鐨勬儏鍐�
@@ -28,59 +28,73 @@
// 瀛樻斁getfeatureinfo鐨勫浘灞傜粍
this.featureGroup = this.L.featureGroup({}).addTo(this.map)
- this.layers = new List()
+ this.wmsLayerList = new WmsLayerList()
for (var i = 0; i < layersConfig.length; i++) {
const config = layersConfig[i]
- const typeName = config.typeName
- if (typeName) {
- this.layers.add(config.index, typeName)
- }
+ this.wmsLayerList.addConfig(config)
}
+ this.load()
}
init () {
- if (this.layers) {
- this.load(this.layers)
- this.clickListener()
- }
+ this.clickListener()
}
add (config) {
- const typeName = config.typeName
- if (typeName) {
- if (!this.layers.contains(typeName)) {
- this.layers.add(config.index, typeName)
- this.wmsLayer.setParams({ layers: this.layers.join(',') })
- }
+ this.wmsLayerList.addConfig(config)
+ const layers = this.wmsLayerList.getLayers()
+ const filter = this.wmsLayerList.getFilters()
+ const params = {}
+ if (filter) {
+ params.cql_filter = filter
}
+ if (layers) {
+ params.layers = layers
+ }
+ this.wmsLayer.setParams(params)
}
remove (config) {
- const typeName = config.typeName
- this.layers.remove(typeName)
- this.wmsLayer.setParams({ layers: this.layers.join(',') })
+ console.log(config)
+ this.wmsLayerList.remove(config.typeName, config.filter)
+ const layers = this.wmsLayerList.getLayers()
+ const filter = this.wmsLayerList.getFilters()
+ const params = { layers: layers }
+ if (filter) {
+ params.cql_filter = filter
+ }
+ this.wmsLayer.setParams(params)
}
- load (layers) {
- this.wmsLayer = this.L.tileLayer.wms(PIPELINE_WMS, {
+ load () {
+ const layers = this.wmsLayerList.getLayers()
+ const filter = this.wmsLayerList.getFilters()
+ const params = {
format: 'image/png', // 杩斿洖鐨勬暟鎹牸寮�
transparent: true,
- layers: this.layers.join(',')
- }).addTo(this.map)
+ BBOX: this.map.getBounds().toBBoxString()
+ }
+ if (layers) {
+ params.layers = layers
+ }
+ if (filter.length > 0) {
+ params.cql_filter = filter
+ }
+ this.wmsLayer = this.L.tileLayer.wms(PIPELINE_WMS, params).addTo(this.map)
}
clickListener () {
window.map.on('click', (e) => {
- console.log(e)
+ // console.log(e)
this.featureGroup.clearLayers()
var point = this.map.latLngToContainerPoint(e.latlng, this.map.getZoom())
var size = this.map.getSize()
// const bbox = this.L.latLngBounds(this.L.latLng(e.latlng.lng, e.latlng.lat)).toBBoxString()
-
- if (this.layers.length() > 0) {
+ const layers = this.wmsLayerList.getLayers()
+ if (layers.length > 0) {
const params = Object.assign({
- LAYERS: this.layers.join(','),
- QUERY_LAYERS: this.layers.join(','),
+ LAYERS: layers,
+ QUERY_LAYERS: layers,
WIDTH: size.x,
HEIGHT: size.y,
X: Math.round(point.x),
--
Gitblit v1.8.0