From 4879421ff17a679a838de208125617d2eaa351a2 Mon Sep 17 00:00:00 2001
From: ChenZeping <chenzeping>
Date: 星期六, 08 五月 2021 10:59:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/LayerController/service/WmsLayerService.js | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/src/components/LayerController/service/WmsLayerService.js b/src/components/LayerController/service/WmsLayerService.js
index 9e6d2f5..3a2f882 100644
--- a/src/components/LayerController/service/WmsLayerService.js
+++ b/src/components/LayerController/service/WmsLayerService.js
@@ -1,5 +1,6 @@
import AjaxUtils from '../../../utils/AjaxUtils'
import { PIPELINE_WMS } from '../../../conf/Constants'
+import Popup from '@views/popup/Popup'
/**
* todo 寰楄�冭檻涓�涓浘灞傞厤缃簡澶氫釜 wmsLayers鐨勬儏鍐�
@@ -75,6 +76,9 @@
clickListener () {
window.map.on('click', (e) => {
+ if (!window.layerFactory.clickSwitch) {
+ return
+ }
this.featureGroup.clearLayers()
var point = this.map.latLngToContainerPoint(e.latlng, this.map.getZoom())
var size = this.map.getSize()
@@ -118,7 +122,7 @@
var myIcon = this.L.divIcon({ className: 'my-div-icon' })
this.L.marker(e.latlng, {
icon: myIcon
- }).addTo(this.featureGroup)
+ }).addTo(this.featureGroup)/*
.bindPopup((layer) => {
this.popupComp.setDatas(popupDatas)
this.popupComp.setShow()
@@ -129,14 +133,25 @@
closeButton: false,
autoClose: false
})
- .openPopup()
+ .openPopup() */
+ window.$layer.open({
+ content: {
+ content: Popup, // 缁勪欢
+ data: { // 浼犻�掔殑鍙傛暟
+ datas: popupDatas
+ }
+ },
+ title: '' // 鏍囬
+ })
+ // this.popupComp.setDatas(popupDatas)
+ // this.popupComp.setShow()
}
})
}
})
}
- reverse (feature) {
+ reverseMultiLine (feature) {
const coordinates = feature.geometry.coordinates
var latlng = []
for (var j = 0; j < coordinates.length; j++) {
@@ -151,15 +166,27 @@
return latlng
}
+ reversePolyLine (feature) {
+ const coordinates = feature.geometry.coordinates
+ var latlng = []
+ for (var j = 0; j < coordinates.length; j++) {
+ const coordinate = coordinates[j]
+ latlng.push(coordinate.reverse())
+ }
+ return latlng
+ }
+
highlight (feature) {
const type = feature.geometry.type
if (type === 'MultiLineString') {
- this.L.polyline(this.reverse(feature), { color: 'red' }).addTo(this.featureGroup)
+ this.L.polyline(this.reverseMultiLine(feature), { color: 'red' }).addTo(this.featureGroup)
} else if (type === 'Point') {
var myIcon = this.L.divIcon({ className: 'my-div-icon' })
this.L.marker(feature.geometry.coordinates.reverse(), {
icon: myIcon
}).addTo(this.featureGroup)
+ } else if (type === 'LineString') {
+ this.L.polyline(this.reversePolyLine(feature), { color: 'red' }).addTo(this.featureGroup)
}
}
}
--
Gitblit v1.8.0