From 3054bbce49457c82df9ad32523f3a0186e268d6f Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期五, 28 五月 2021 21:17:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/LayerController/service/LayerFactory.js | 118 ++++++++++++++--------------------------------------------
1 files changed, 29 insertions(+), 89 deletions(-)
diff --git a/src/components/LayerController/service/LayerFactory.js b/src/components/LayerController/service/LayerFactory.js
index f7ee38d..f7230ba 100644
--- a/src/components/LayerController/service/LayerFactory.js
+++ b/src/components/LayerController/service/LayerFactory.js
@@ -1,6 +1,5 @@
import WfsLayerService from './WfsLayerService'
-import { clone } from '../../../utils/utils'
-import { logicMapper } from '../../../conf/Constants'
+import { logicMapper, SERVICE_TYPE } from '../../../conf/Constants'
import WmsLayerService from './WmsLayerService'
/**
@@ -17,14 +16,14 @@
this.layersLogic = {}
this.minZoomLayers = {}
this.wmsLayers = []
- this.clickSwitch = false
+ this.wmsLayerService = null
}
init (layerConfig) {
- this.initConfig(layerConfig)
// wms鏈嶅姟鍙渶瑕佸垵濮嬪寲涓�娆�
- this.wmsLayerService = new WmsLayerService(this.wmsLayers)
+ this.wmsLayerService = new WmsLayerService()
this.wmsLayerService.init()
+ this.initConfig(layerConfig)
}
initConfig (layerConfig) {
@@ -36,12 +35,12 @@
var childLayer = config.childLayer
var checked = config.checked
/* if (config.groupName) {
- const wmsGroupLayerService = new WmsGroupLayerService(config)
+ const wmsGroupLayerService = new WmsLayerGroupService(config)
wmsGroupLayerService.init()
continue
} */
- layers && this.init(config.layers)
- childLayer && this.init(config.childLayer)
+ layers && this.initConfig(config.layers)
+ childLayer && this.initConfig(config.childLayer)
this.initMinZoom(config)
this.loadLogic(config)
@@ -65,8 +64,7 @@
loadLogic (config) {
var code = config.code
- var wfs = config.wfs
- var wmsLayers = config.wmsLayers
+ var type = config.type
const file = logicMapper[code]
var logic = this.layersLogic[code]
@@ -74,12 +72,8 @@
if (file) {
var BusiLayer = require('../logic/' + file)
logic = new BusiLayer()
- } else if (wfs) {
+ } else if (type === SERVICE_TYPE.WFS) {
logic = new WfsLayerService(config)
- } else if (wmsLayers) {
- var layer = {}
- layer[config.code] = config
- this.wmsLayers.push(layer)
}
}
this.layersLogic[code] = logic
@@ -112,6 +106,16 @@
return layer
}
+ showAll (configs) {
+ if (Array.isArray(configs)) {
+ for (let i = 0; i < configs.length; i++) {
+ const config = configs[i]
+ this.show(config)
+ }
+ this.wmsLayerService && this.wmsLayerService.addAll(configs)
+ }
+ }
+
/**
* 濡傛灉 瀛樺湪宸茬粡鍔犺浇浜嗙殑瀵硅薄锛屽氨鐩存帴鍔犲埌map
* 濡傛灉 涓嶅瓨鍦ㄥ垯 璋冪敤 addLayer 鍙� 閫昏緫绫荤殑init 杩涜鍒濆鍖栨搷浣�
@@ -128,10 +132,19 @@
layer.addTo(this.map)
}
} else {
- logic && logic.init(this.addLayer(config), this.L)
+ logic && logic.init(this.addLayer(config), this.L, config)
}
logic && logic.start && logic.start()
this.wmsLayerService && this.wmsLayerService.add(config)
+ }
+
+ hideAll (configs) {
+ if (Array.isArray(configs)) {
+ for (let i = 0; i < configs.length; i++) {
+ this.hide(configs[i])
+ }
+ this.wmsLayerService && this.wmsLayerService.removeAll(configs)
+ }
}
hide (config) {
@@ -166,79 +179,6 @@
this.hide(config)
}
}
- }
- }
-
- /**
- *
- * 鏍规嵁浼犵殑 feature瀵硅薄瀹氫綅锛�
- * @param code
- * @param feature
- */
- flyByFeature (feature, code) {
- const type = feature.geometry.type
- var point = []
- switch (type) {
- case 'Point':
- point = clone(feature.geometry.coordinates)
- break
- case 'MultiLineString':
- var coordinates = feature.geometry.coordinates
- point = coordinates[parseInt(coordinates.length / 2)][0]
- break
- }
- window.map.flyTo(point.reverse(), 17)
- code && this.openPopup(code, feature.id)
- }
-
- openPopup (layerId, id) {
- const layer = this.layers[layerId]
-
- if (layer.eachLayer) {
- layer.eachLayer(function (layer) {
- const layers = layer.getLayers()
- for (var i = 0; i < layers.length; i++) {
- const lay = layers[i]
- const feature = lay.feature
- lay.closePopup()
- if (feature.id === id) {
- lay.openPopup()
- break
- }
- }
- })
- }
- /* for (var k in this.layers) {
- var layerGroup = this.layers[k]
- layerGroup.eachLayer(function (layer) {
- console.log(layer)
- console.log(layer.getAttribution())
- })
- var layers = layerGroup.getLayers()
- if (layers) {
- for (var m = 0; m < layers.length; m++) {
- var layer = layers[m]
- console.log(layer)
- console.log(layer.getLayerId(val.id))
- /!* var feature = layer.feature
- if (feature.id === layerId) {
- this.map.flyToBounds(bound)
- return layer
- } *!/
- }
- }
- } */
- return null
- }
-
- findLayerById (layer, id) {
- const layers = layer.getLayers
- if (layers) {
- this.findLayerById(layer.getLayers(), id)
- } else {
- layer.eachLayer(function (layer) {
- // console.log(layer)
- })
}
}
}
--
Gitblit v1.8.0