From 93850b9aee34d3a66c2770a1eb0435ce104e772f Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期四, 15 四月 2021 15:20:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/Sgis.js | 31 ++++++++++---------------------
1 files changed, 10 insertions(+), 21 deletions(-)
diff --git a/src/Sgis.js b/src/Sgis.js
index e26ff26..d46bfc2 100644
--- a/src/Sgis.js
+++ b/src/Sgis.js
@@ -1,9 +1,6 @@
-import BasemapHelper from '@components/helpers/BasemapHelper'
-import VectorLayerHelper from '@components/helpers/VectorLayerHelper'
-// 鍒濆鍖栨樉绀�
-import ServiceLayerHelper from '@components/helpers/ServiceLayerHelper'
-import '@components/plugin/PathDrag'
+// 鍒濆鍖栨樉绀�
+
import MapConfig from '@/conf/MapConfig'
import '@components/plugin/PathDashFlow' // 娴佸姩绾垮浘
import DownLoad from '@components/plugin/DownLoad'
@@ -16,18 +13,20 @@
import './components/plugin/Editable' // 鏍囩粯鎿嶄綔
import './components/plugin/MagicMarker' // 鍔ㄧ敾Marker
import './assets/css/map/magic.min.css' // 鍔ㄧ敾Marker css
+import '@/components/plugin/magicMarker.css'
import '@components/plugin/pulse/Pulse' // marker 澶栧湀娉�
import '@components/plugin/pulse/Pulse.css' // marker 澶栧湀娉� css
-
+import BasemapHelper from '@components/helpers/BasemapHelper'
+import VectorLayerHelper from '@components/helpers/VectorLayerHelper'
let map = null
const L = window.L
-const initMap = (div) => {
+const initMap = (div, mapOption) => {
if (map != null) {
map.remove()
}
DownLoad.init(L)
-
- map = L.map(div, MapConfig.mapOptions)
+ const option = mapOption || MapConfig.mapOptions
+ map = L.map(div, option)
map.on('click', (event, a, b) => {
console.log(event, a, b)
@@ -35,8 +34,6 @@
window.map = map
window.L = L
-
- initTileLayersHelper(map)
return map
}
@@ -48,17 +45,10 @@
*/
const initBasemapsHelper = (map) => {
// todo 杩欓噷杩涜搴曞浘鍦板浘鐨勫垵濮嬪寲
+ console.log(map)
return new BasemapHelper({ map })
}
-/**
- * 涓氬姟搴曞浘鍒濆鍖�
- * @param map
- * @param L
- */
-const initTileLayersHelper = (map) => {
- var serviceLayerHelper = new ServiceLayerHelper({ map })
- return serviceLayerHelper
-}
+
/**
* 鐭㈤噺鍦板浘鍒濆鍖�
* @param map
@@ -73,6 +63,5 @@
export default {
initMap,
initBasemapsHelper,
- initTileLayersHelper,
initVectorLayersHelper
}
--
Gitblit v1.8.0