From 1bbce96c3e694c834a830b2c038f9303e35895b5 Mon Sep 17 00:00:00 2001
From: YANGDL <114714267@qq.com>
Date: 星期五, 12 三月 2021 20:57:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/plugin/MakeTation.js | 72 +++++++++++++++++++++---------------
1 files changed, 42 insertions(+), 30 deletions(-)
diff --git a/src/components/plugin/MakeTation.js b/src/components/plugin/MakeTation.js
index 9aedc5e..189619f 100644
--- a/src/components/plugin/MakeTation.js
+++ b/src/components/plugin/MakeTation.js
@@ -20,14 +20,20 @@
TextAnnotation.layers = L.layerGroup()
map.on('click', TextAnnotation.click).on('dblclick', TextAnnotation.dblclick)
},
- setContent :function (changeContent) {
- console.log(changeContent)
+ // 璁剧疆鏀瑰彉鏂囧瓧鍐呭
+ setContent: function (changeContent) {
+ // console.log(changeContent)
TextAnnotation.changeContent = changeContent
},
+ // 璁剧疆鏀瑰彉鏂囧瓧棰滆壊
+ setColor: function (changeColor) {
+ // console.log(changeColor)
+ TextAnnotation.changeColor = changeColor
+ },
click: function (e) {
- console.log(TextAnnotation.changeContent)
+ // console.log(TextAnnotation.changeContent)
let labIcon = L.divIcon({
- html: '<div style="color: red;font-size: 18px;">' + TextAnnotation.changeContent + '</div>',
+ html: '<div style="color:' + TextAnnotation.changeColor + ';font-size: 18px;">' + TextAnnotation.changeContent + '</div>',
iconSize: [100, 40],
iconAnchor: [0, 0],
className: ''
@@ -52,7 +58,7 @@
}
// 娣诲姞 鐐� 鐨勬爣娉�
-var CircleAnnotation = {
+let pointAnnotation = {
points: [],
color: 'yellow',
L: null,
@@ -61,54 +67,60 @@
polyline: null,
marker: null,
init: function (map, L) {
- // console.log(L)
- CircleAnnotation.L = L
- CircleAnnotation.map = map
- CircleAnnotation.points = []
- CircleAnnotation.polyline = null
- CircleAnnotation.marker = null
- CircleAnnotation.layers = L.layerGroup()
- map.on('click', CircleAnnotation.click).on('dblclick', CircleAnnotation.dblclick)
+ pointAnnotation.L = L
+ pointAnnotation.map = map
+ pointAnnotation.points = []
+ pointAnnotation.polyline = null
+ pointAnnotation.marker = null
+ pointAnnotation.layers = L.layerGroup()
+ map.on('click', pointAnnotation.click).on('dblclick', pointAnnotation.dblclick)
},
click: function (e) {
- // var myIcon = L.divIcon({className: 'my-div-icon'});
let marker = L.marker(e.latlng)
- marker.addTo(CircleAnnotation.map)
+ marker.addTo(pointAnnotation.map)
+ // pointAnnotation.map.panBy(L.point(e.latlng))
},
dblclick: function (e) {
- CircleAnnotation.map.off('click', CircleAnnotation.click).off('dblclick', CircleAnnotation.dblclick)
+ pointAnnotation.map.off('click', pointAnnotation.click).off('dblclick', pointAnnotation.dblclick)
},
destory: function () {
- if (CircleAnnotation.polyline) {
- CircleAnnotation.map.removeLayer(CircleAnnotation.polyline)
+ if (pointAnnotation.polyline) {
+ pointAnnotation.map.removeLayer(pointAnnotation.polyline)
}
- if (CircleAnnotation.marker) {
- CircleAnnotation.marker.remove()
+ if (pointAnnotation.marker) {
+ pointAnnotation.marker.remove()
}
- if (CircleAnnotation.layers) {
- CircleAnnotation.layers.clearLayers()
+ if (pointAnnotation.layers) {
+ pointAnnotation.layers.clearLayers()
}
}
}
+// 娣诲姞鏂囧瓧鏍囨敞
const startMakeText = function (map, L) {
TextAnnotation.init(map, L)
}
-
-const StartCircleAnnotation = function (map, L) {
- CircleAnnotation.init(map, L)
-}
-
+// 鏂囧瓧鏍囨敞鐨� 鍐呭绀捐缃�
const setContentText = function (text) {
TextAnnotation.setContent(text)
+}
+// 鏂囧瓧鏍囨敞鍐呭鐨� 棰滆壊 璁剧疆
+const setContentColor = function (color) {
+ TextAnnotation.setColor(color)
+}
+
+// 鐐� 鏍囨敞
+const StartPointAnnotation = function (map, L) {
+ pointAnnotation.init(map, L)
}
const clearText = function () {
startMakeText.destory()
}
export default {
- startMakeText,
clearText,
- StartCircleAnnotation,
- setContentText
+ startMakeText,
+ setContentText,
+ setContentColor,
+ StartPointAnnotation
}
--
Gitblit v1.8.0