From 1348c11eceeecc172e2a069b67e197de90aa5827 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期四, 11 三月 2021 10:00:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/Sgis.js | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/src/Sgis.js b/src/Sgis.js
index eec70ab..5b21f5e 100644
--- a/src/Sgis.js
+++ b/src/Sgis.js
@@ -4,12 +4,18 @@
import Editable from '@components/plugin/Editable'
import PathDrag from '@components/plugin/PathDrag'
-import CanvasIcon from '@components/plugin/CanvasMarkers'
import MagicMarker from '@components/plugin/MagicMarker'
import WmtsSupport from '@components/plugin/wmts_plugins'
import MapConfig from '@/conf/MapConfig'
-import DashFlow from '@components/plugin/PathDashFlow'
+// import DashFlow from '@components/plugin/PathDashFlow'
+import CanvasMarkers from '@components/plugin/CanvasMarkers'
+import FullScreen from '@components/plugin/FullScreen'
+// 涓嬭浇
+import DownLoad from '@components/plugin/DownLoad'
+// 娴嬮噺
+import LeafletMeasurePath from '@components/plugin/leaflet-measure-path/leaflet-measure-path'
+
let map = null
const L = window.L
const initMap = (div) => {
@@ -21,11 +27,15 @@
Editable.init(L) // 鍥惧眰缂栬緫
PathDrag.init(L) // 璺緞鎷栨嫿
MagicMarker.init(L) // 鍔ㄧ敾Marker
- CanvasIcon.init(L) // 浣跨敤canvas缁樺埗Marker
WmtsSupport.init(L) // 鎵╁睍锛屼娇鏀寔WMTS
// CustomPopup.init(L) // 鑷畾涔夊脊鍑烘
- DashFlow.DashFlow(L) // 娴佸姩绾垮浘
- // Leaflet鎵╁睍浠ｇ爜
+ // DashFlow.DashFlow(L) // 娴佸姩绾垮浘
+ CanvasMarkers.init(L)// 鐢诲竷鍥惧眰
+ // 鍏ㄥ睆
+ FullScreen.init(L)
+ // 涓嬭浇
+ DownLoad.init(L)
+ LeafletMeasurePath.init(L)
map = L.map(div, MapConfig.mapOptions)
@@ -34,7 +44,8 @@
})
window.map = map
-
+ window.L = L
+ initTileLayersHelper(map)
return map
}
@@ -53,7 +64,8 @@
* @param L
*/
const initTileLayersHelper = (map) => {
- return new ServiceLayerHelper({ map })
+ var serviceLayerHelper = new ServiceLayerHelper({ map })
+ return serviceLayerHelper
}
/**
--
Gitblit v1.8.0