From 9cce34615a148d7e3e81e044f1bcee213e890514 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期四, 25 三月 2021 15:05:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/Sgis.js | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/src/Sgis.js b/src/Sgis.js
index 273ae8b..cbc3d10 100644
--- a/src/Sgis.js
+++ b/src/Sgis.js
@@ -1,25 +1,23 @@
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 '@components/plugin/PathDrag'
// 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 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 'leaflet-canvas-markers'
import './components/plugin/Leaflet.GridLayer.FadeOut' // 鐡︾墖鍥惧眰鍒囨崲娣″叆娣″嚭
-
import './components/plugin/leaflet-canvas-markers' // 鐢诲竷marker
+import './components/plugin/Editable' // 鏍囩粯鎿嶄綔
+
let map = null
const L = window.L
const initMap = (div) => {
@@ -28,8 +26,8 @@
}
// Leaflet鎵╁睍浠ｇ爜
- Editable.init(L) // 鍥惧眰缂栬緫
- PathDrag.init(L) // 璺緞鎷栨嫿
+ // Editable.init(L) // 鍥惧眰缂栬緫
+ // PathDrag.init(L) // 璺緞鎷栨嫿
// MagicMarker.init(L) // 鍔ㄧ敾Marker
// WmtsSupport.init(L) // 鎵╁睍锛屼娇鏀寔WMTS
// CustomPopup.init(L) // 鑷畾涔夊脊鍑烘
@@ -38,7 +36,7 @@
// FullScreen.init(L)
// 涓嬭浇
DownLoad.init(L)
- LeafletMeasurePath.init(L)
+ // LeafletMeasurePath.init(L)
map = L.map(div, MapConfig.mapOptions)
--
Gitblit v1.8.0