From 047637f2325730e200a9eaa1544206357b9a9480 Mon Sep 17 00:00:00 2001
From: YANGDL <114714267@qq.com>
Date: 星期一, 22 二月 2021 14:54:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/Sgis.js | 26 ++++++++++----------------
1 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/src/Sgis.js b/src/Sgis.js
index cbda89c..264422a 100644
--- a/src/Sgis.js
+++ b/src/Sgis.js
@@ -1,4 +1,3 @@
-import * as L from 'leaflet'
import BasemapHelper from '@components/helpers/BasemapHelper'
import VectorLayerHelper from '@components/helpers/VectorLayerHelper'
import ServiceLayerHelper from '@components/helpers/ServiceLayerHelper'
@@ -8,12 +7,11 @@
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'
let map = null
-// let baseMapGroup = null
+const L = window.L
const initMap = (div) => {
if (map != null) {
map.remove()
@@ -36,9 +34,8 @@
})
window.map = map
- window.L = L
-
- return { map: map, L: L }
+ initTileLayersHelper(map)
+ return map
}
/**
@@ -46,19 +43,17 @@
* @param map
* @param L
*/
-const initBasemapsHelper = (map, L) => {
+const initBasemapsHelper = (map) => {
// todo 杩欓噷杩涜搴曞浘鍦板浘鐨勫垵濮嬪寲
- var basemapHelper = new BasemapHelper({ map, L })
- console.log(basemapHelper)
- return basemapHelper
+ return new BasemapHelper({ map })
}
/**
* 涓氬姟搴曞浘鍒濆鍖�
* @param map
* @param L
*/
-const initTileLayersHelper = (map, L) => {
- const serviceLayerHelper = new ServiceLayerHelper({ map, L })
+const initTileLayersHelper = (map) => {
+ var serviceLayerHelper = new ServiceLayerHelper({ map })
return serviceLayerHelper
}
@@ -67,11 +62,10 @@
* @param map
* @param L
*/
-const initVectorLayersHelper = (map, L) => {
+const initVectorLayersHelper = (map) => {
// todo 杩欓噷杩涜鍦板浘鐨勫垵濮嬪寲
- var vectorLayerHelper = new VectorLayerHelper({ map, L })
- window.vectorLayerHelper = vectorLayerHelper
- return vectorLayerHelper
+ window.vectorLayerHelper = new VectorLayerHelper({ map })
+ return window.vectorLayerHelper
}
export default {
--
Gitblit v1.8.0