From cfb52200f39d0c659eb884a1df331dd997af7e72 Mon Sep 17 00:00:00 2001
From: YANGDL <114714267@qq.com>
Date: 星期三, 10 三月 2021 09:06:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/Sgis.js |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/Sgis.js b/src/Sgis.js
index 264422a..f736ba3 100644
--- a/src/Sgis.js
+++ b/src/Sgis.js
@@ -4,12 +4,15 @@
 
 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 CanvasMarkers from '@components/plugin/CanvasMarkers'
+import FullScreen from '@components/plugin/FullScreen'
+import DownLoad from '@components/plugin/DownLoad'
+
 let map = null
 const L = window.L
 const initMap = (div) => {
@@ -21,11 +24,14 @@
   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鎵╁睍浠g爜
+  CanvasMarkers.init(L)// 鐢诲竷鍥惧眰
+  // 鍏ㄥ睆
+  FullScreen.init(L)
+  // 涓嬭浇
+  DownLoad.init(L)
 
   map = L.map(div, MapConfig.mapOptions)
 
@@ -34,6 +40,7 @@
   })
 
   window.map = map
+  window.L = L
   initTileLayersHelper(map)
   return map
 }

--
Gitblit v1.8.0