From 5bd3c6fc05b2548195ebe78bc4cec04886b51ca2 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期五, 02 四月 2021 14:22:03 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/Sgis.js | 41 +++++++++++++++++------------------------
1 files changed, 17 insertions(+), 24 deletions(-)
diff --git a/src/Sgis.js b/src/Sgis.js
index 5b21f5e..6626200 100644
--- a/src/Sgis.js
+++ b/src/Sgis.js
@@ -1,20 +1,24 @@
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 MagicMarker from '@components/plugin/MagicMarker'
-import WmtsSupport from '@components/plugin/wmts_plugins'
-
+import '@components/plugin/PathDrag'
import MapConfig from '@/conf/MapConfig'
-// import DashFlow from '@components/plugin/PathDashFlow'
-import CanvasMarkers from '@components/plugin/CanvasMarkers'
-import FullScreen from '@components/plugin/FullScreen'
-// 涓嬭浇
+import '@components/plugin/PathDashFlow' // 娴佸姩绾垮浘
import DownLoad from '@components/plugin/DownLoad'
// 娴嬮噺
-import LeafletMeasurePath from '@components/plugin/leaflet-measure-path/leaflet-measure-path'
+import '@components/plugin/leaflet-measure-path/leaflet-measure-path'
+
+import 'leaflet.markercluster'
+import './components/plugin/Leaflet.GridLayer.FadeOut' // 鐡︾墖鍥惧眰鍒囨崲娣″叆娣″嚭
+import './components/plugin/leaflet-canvas-markers' // 鐢诲竷marker
+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
let map = null
const L = window.L
@@ -22,20 +26,7 @@
if (map != null) {
map.remove()
}
-
- // Leaflet鎵╁睍浠ｇ爜
- Editable.init(L) // 鍥惧眰缂栬緫
- PathDrag.init(L) // 璺緞鎷栨嫿
- MagicMarker.init(L) // 鍔ㄧ敾Marker
- WmtsSupport.init(L) // 鎵╁睍锛屼娇鏀寔WMTS
- // CustomPopup.init(L) // 鑷畾涔夊脊鍑烘
- // DashFlow.DashFlow(L) // 娴佸姩绾垮浘
- CanvasMarkers.init(L)// 鐢诲竷鍥惧眰
- // 鍏ㄥ睆
- FullScreen.init(L)
- // 涓嬭浇
DownLoad.init(L)
- LeafletMeasurePath.init(L)
map = L.map(div, MapConfig.mapOptions)
@@ -45,7 +36,9 @@
window.map = map
window.L = L
+
initTileLayersHelper(map)
+
return map
}
@@ -56,6 +49,7 @@
*/
const initBasemapsHelper = (map) => {
// todo 杩欓噷杩涜搴曞浘鍦板浘鐨勫垵濮嬪寲
+ console.log(map)
return new BasemapHelper({ map })
}
/**
@@ -67,7 +61,6 @@
var serviceLayerHelper = new ServiceLayerHelper({ map })
return serviceLayerHelper
}
-
/**
* 鐭㈤噺鍦板浘鍒濆鍖�
* @param map
--
Gitblit v1.8.0