From 1348c11eceeecc172e2a069b67e197de90aa5827 Mon Sep 17 00:00:00 2001 From: wangqi <magical1908@outlook.com> Date: 星期四, 11 三月 2021 10:00:32 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/Sgis.js | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/Sgis.js b/src/Sgis.js index 02831eb..5b21f5e 100644 --- a/src/Sgis.js +++ b/src/Sgis.js @@ -4,20 +4,18 @@ 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 MagicMarker from '@components/plugin/MagicMarker' +import WmtsSupport from '@components/plugin/wmts_plugins' import MapConfig from '@/conf/MapConfig' -import '@components/plugin/PathDashFlow' // 娴佸姩绾垮浘 -// import CanvasMarkers from '@components/plugin/CanvasMarkers' -// import FullScreen from '@components/plugin/FullScreen' +// import DashFlow from '@components/plugin/PathDashFlow' +import CanvasMarkers from '@components/plugin/CanvasMarkers' +import FullScreen from '@components/plugin/FullScreen' +// 涓嬭浇 import DownLoad from '@components/plugin/DownLoad' +// 娴嬮噺 +import LeafletMeasurePath from '@components/plugin/leaflet-measure-path/leaflet-measure-path' -import 'leaflet.markercluster' -// import 'leaflet-canvas-markers' -import './components/plugin/Leaflet.GridLayer.FadeOut' // 鐡︾墖鍥惧眰鍒囨崲娣″叆娣″嚭 - -import './components/plugin/leaflet-canvas-markers' // 鐢诲竷marker let map = null const L = window.L const initMap = (div) => { @@ -28,14 +26,16 @@ // Leaflet鎵╁睍浠g爜 Editable.init(L) // 鍥惧眰缂栬緫 PathDrag.init(L) // 璺緞鎷栨嫿 - // MagicMarker.init(L) // 鍔ㄧ敾Marker - // WmtsSupport.init(L) // 鎵╁睍锛屼娇鏀寔WMTS + MagicMarker.init(L) // 鍔ㄧ敾Marker + WmtsSupport.init(L) // 鎵╁睍锛屼娇鏀寔WMTS // CustomPopup.init(L) // 鑷畾涔夊脊鍑烘 - // CanvasMarkers.init(L)// 鐢诲竷鍥惧眰 + // DashFlow.DashFlow(L) // 娴佸姩绾垮浘 + CanvasMarkers.init(L)// 鐢诲竷鍥惧眰 // 鍏ㄥ睆 - // FullScreen.init(L) + FullScreen.init(L) // 涓嬭浇 DownLoad.init(L) + LeafletMeasurePath.init(L) map = L.map(div, MapConfig.mapOptions) -- Gitblit v1.8.0