From dc2421508ec5cc18dc5ff2b2df6b39aba59188c8 Mon Sep 17 00:00:00 2001
From: seatonwan9 <seatonwan9@163.com>
Date: 星期日, 30 五月 2021 20:24:25 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/Sgis.js | 63 ++++++++-----------------------
1 files changed, 17 insertions(+), 46 deletions(-)
diff --git a/src/Sgis.js b/src/Sgis.js
index f908709..16feefe 100644
--- a/src/Sgis.js
+++ b/src/Sgis.js
@@ -1,12 +1,7 @@
-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 MapConfig from './conf/MapConfig'
import '@components/plugin/PathDashFlow' // 娴佸姩绾垮浘
-import DownLoad from '@components/plugin/DownLoad'
+import DownLoad from './components/plugin/DownLoad'
// 娴嬮噺
import '@components/plugin/leaflet-measure-path/leaflet-measure-path'
@@ -16,50 +11,34 @@
import './components/plugin/Editable' // 鏍囩粯鎿嶄綔
import './components/plugin/MagicMarker' // 鍔ㄧ敾Marker
import './assets/css/map/magic.min.css' // 鍔ㄧ敾Marker css
-import './components/BaseNav/Pulse'
-import './components/BaseNav/Pulse.css'
+import '@/components/plugin/magicMarker.css'
+import '@components/plugin/pulse/Pulse' // marker 澶栧湀娉�
+import '@components/plugin/pulse/Pulse.css' // marker 澶栧湀娉� css
+import '@components/plugin/L.CircleEditor'
+import BasemapHelper from './components/helpers/BasemapHelper'
+import VectorLayerHelper from './components/helpers/VectorLayerHelper'
-// import WmtsSupport from '@components/plugin/wmts_plugins'
-// import CanvasMarkers from '@components/plugin/CanvasMarkers'
-// import FullScreen from '@components/plugin/FullScreen'
-// import 'leaflet-canvas-markers'
+import '@/components/plugin/leaflet-echart'
+// import '@/components/plugin/flowline'
+// import eventBus from './eventBus'
let map = null
const L = window.L
-const initMap = (div) => {
+const initMap = (div, mapOption) => {
if (map != null) {
map.remove()
}
-
- // Leaflet鎵╁睍浠ｇ爜
- // Editable.init(L) // 鍥惧眰缂栬緫
- // PathDrag.init(L) // 璺緞鎷栨嫿
- // MagicMarker.init(L) // 鍔ㄧ敾Marker
- // WmtsSupport.init(L) // 鎵╁睍锛屼娇鏀寔WMTS
- // CustomPopup.init(L) // 鑷畾涔夊脊鍑烘
- // CanvasMarkers.init(L)// 鐢诲竷鍥惧眰
- // 鍏ㄥ睆
- // FullScreen.init(L)
- // 涓嬭浇
- // LeafletMeasurePath.init(L)
DownLoad.init(L)
+ const option = mapOption || MapConfig.mapOptions
+ map = L.map(div, option)
- map = L.map(div, MapConfig.mapOptions)
-
- map.on('click', (event, a, b) => {
- console.log(event, a, b)
- })
+ // eventBus.$emit('map-obj', map)
window.map = map
window.L = L
- // L.sgis = L.sgis || L
-
- initTileLayersHelper(map)
-
return map
}
-
/**
* 鍩虹搴曞浘鍒濆鍖�
* @param map
@@ -67,17 +46,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
@@ -92,6 +64,5 @@
export default {
initMap,
initBasemapsHelper,
- initTileLayersHelper,
initVectorLayersHelper
}
--
Gitblit v1.8.0