From 17e7836b1d0a7bd1a51d44ae071a88423a9f9370 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期一, 08 三月 2021 17:57:16 +0800
Subject: [PATCH] 添加工具栏功能

---
 src/Sgis.js |   79 +++++++++++++++++++--------------------
 1 files changed, 39 insertions(+), 40 deletions(-)

diff --git a/src/Sgis.js b/src/Sgis.js
index d8b2ffd..af7ecb2 100644
--- a/src/Sgis.js
+++ b/src/Sgis.js
@@ -1,44 +1,45 @@
-import * as L from 'leaflet'
 import BasemapHelper from '@components/helpers/BasemapHelper'
 import VectorLayerHelper from '@components/helpers/VectorLayerHelper'
 import ServiceLayerHelper from '@components/helpers/ServiceLayerHelper'
 
 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 'leaflet.markercluster'
 
 import MapConfig from '@/conf/MapConfig'
 import DashFlow from '@components/plugin/PathDashFlow'
+import CanvasMarkers from '@components/plugin/CanvasMarkers'
+import FullScreen from '@components/plugin/FullScreen'
+
 let map = null
-// let baseMapGroup = null
+const L = window.L
 const initMap = (div) => {
-    if (map != null) {
-        map.remove()
-    }
+  if (map != null) {
+    map.remove()
+  }
 
-    // Leaflet鎵╁睍浠ｇ爜
-    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鎵╁睍浠ｇ爜
+  // Leaflet鎵╁睍浠ｇ爜
+  Editable.init(L) // 鍥惧眰缂栬緫
+  PathDrag.init(L) // 璺緞鎷栨嫿
+  MagicMarker.init(L) // 鍔ㄧ敾Marker
+  WmtsSupport.init(L) // 鎵╁睍锛屼娇鏀寔WMTS
+  // CustomPopup.init(L) // 鑷畾涔夊脊鍑烘
+  DashFlow.DashFlow(L) // 娴佸姩绾垮浘
+  CanvasMarkers.init(L)// 鐢诲竷鍥惧眰
+  // Leaflet鎵╁睍浠ｇ爜
+  // 鍏ㄥ睆
+  FullScreen.init(L)
 
-    map = L.map(div, MapConfig.mapOptions)
+  map = L.map(div, MapConfig.mapOptions)
 
-    map.on('click', (event, a, b) => {
-        console.log(event, a, b)
-    })
+  map.on('click', (event, a, b) => {
+    console.log(event, a, b)
+  })
 
-    window.map = map
-    window.L = L
-
-    return { map: map, L: L }
+  window.map = map
+  initTileLayersHelper(map)
+  return map
 }
 
 /**
@@ -46,19 +47,18 @@
  * @param map
  * @param L
  */
-const initBasemapsHelper = (map, L) => {
-    // todo 杩欓噷杩涜搴曞浘鍦板浘鐨勫垵濮嬪寲
-    var basemapHelper = new BasemapHelper({map, L})
-    return basemapHelper
+const initBasemapsHelper = (map) => {
+  // todo 杩欓噷杩涜搴曞浘鍦板浘鐨勫垵濮嬪寲
+  return new BasemapHelper({ map })
 }
 /**
  * 涓氬姟搴曞浘鍒濆鍖�
  * @param map
  * @param L
  */
-const initTileLayersHelper = (map, L) => {
-    let serviceLayerHelper = new ServiceLayerHelper({map, L})
-    return serviceLayerHelper
+const initTileLayersHelper = (map) => {
+  var serviceLayerHelper = new ServiceLayerHelper({ map })
+  return serviceLayerHelper
 }
 
 /**
@@ -66,16 +66,15 @@
  * @param map
  * @param L
  */
-const initVectorLayersHelper = (map, L) => {
-    // todo 杩欓噷杩涜鍦板浘鐨勫垵濮嬪寲
-    var vectorLayerHelper = new VectorLayerHelper({map, L})
-    window.vectorLayerHelper = vectorLayerHelper
-    return vectorLayerHelper
+const initVectorLayersHelper = (map) => {
+  // todo 杩欓噷杩涜鍦板浘鐨勫垵濮嬪寲
+  window.vectorLayerHelper = new VectorLayerHelper({ map })
+  return window.vectorLayerHelper
 }
 
 export default {
-    initMap,
-    initBasemapsHelper,
-    initTileLayersHelper,
-    initVectorLayersHelper
+  initMap,
+  initBasemapsHelper,
+  initTileLayersHelper,
+  initVectorLayersHelper
 }

--
Gitblit v1.8.0