From 0039429882f8434000a0f61d6995324f1589633a Mon Sep 17 00:00:00 2001
From: seatonwan9 <seatonwan9@163.com>
Date: 星期日, 30 五月 2021 13:36:06 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

---
 src/Sgis.js |   75 ++++++++++++++++---------------------
 1 files changed, 32 insertions(+), 43 deletions(-)

diff --git a/src/Sgis.js b/src/Sgis.js
index 79265e7..6e9dd2b 100644
--- a/src/Sgis.js
+++ b/src/Sgis.js
@@ -1,62 +1,52 @@
-import * as L from 'leaflet'
-import BasemapHelper from '@components/helpers/BasemapHelper'
-import VectorLayerHelper from '@components/helpers/VectorLayerHelper'
-import ServiceLayerHelper from '@components/helpers/ServiceLayerHelper'
+// 鍒濆鍖栨樉绀�
+import MapConfig from './conf/MapConfig'
+import '@components/plugin/PathDashFlow' // 娴佸姩绾垮浘
+import DownLoad from './components/plugin/DownLoad'
+// 娴嬮噺
+import '@components/plugin/leaflet-measure-path/leaflet-measure-path'
 
-import Editable from '@components/plugin/Editable'
-import PathDrag from '@components/plugin/PathDrag'
-import CanvasIcon from '@components/plugin/CanvasMarkers'
-import MagicMarker from '@components/plugin/MagicMarker'
-import WmtsSupport from '@components/plugin/wmts_plugins'
 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
+import BasemapHelper from './components/helpers/BasemapHelper'
+import VectorLayerHelper from './components/helpers/VectorLayerHelper'
 
-import MapConfig from '@/conf/MapConfig'
-import DashFlow from '@components/plugin/PathDashFlow'
+import '@/components/plugin/leaflet-echart'
+// import '@/components/plugin/flowline'
+// import eventBus from './eventBus'
+
 let map = null
-// let baseMapGroup = null
-const initMap = (div) => {
+const L = window.L
+const initMap = (div, mapOption) => {
   if (map != null) {
     map.remove()
   }
+  DownLoad.init(L)
+  const option = mapOption || MapConfig.mapOptions
+  map = L.map(div, option)
 
-  // Leaflet鎵╁睍浠ｇ爜
-  Editable.init(L) // 鍥惧眰缂栬緫
-  PathDrag.init(L) // 璺緞鎷栨嫿
-  MagicMarker.init(L) // 鍔ㄧ敾Marker
-  CanvasIcon.init(L) // 浣跨敤canvas缁樺埗Marker
-  WmtsSupport.init(L) // 鎵╁睍锛屼娇鏀寔WMTS
-  // CustomPopup.init(L) // 鑷畾涔夊脊鍑烘
-  DashFlow.DashFlow(L) // 娴佸姩绾垮浘
-  // Leaflet鎵╁睍浠ｇ爜
-
-  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
 
-  return { map: map, L: L }
+  return map
 }
-
 /**
  * 鍩虹搴曞浘鍒濆鍖�
  * @param map
  * @param L
  */
-const initBasemapsHelper = (map, L) => {
+const initBasemapsHelper = (map) => {
   // todo 杩欓噷杩涜搴曞浘鍦板浘鐨勫垵濮嬪寲
-  return new BasemapHelper({ map, L })
-}
-/**
- * 涓氬姟搴曞浘鍒濆鍖�
- * @param map
- * @param L
- */
-const initTileLayersHelper = (map, L) => {
-  return new ServiceLayerHelper({ map, L })
+  console.log(map)
+  return new BasemapHelper({ map })
 }
 
 /**
@@ -64,15 +54,14 @@
  * @param map
  * @param L
  */
-const initVectorLayersHelper = (map, L) => {
+const initVectorLayersHelper = (map) => {
   // todo 杩欓噷杩涜鍦板浘鐨勫垵濮嬪寲
-  window.vectorLayerHelper = new VectorLayerHelper({ map, L })
+  window.vectorLayerHelper = new VectorLayerHelper({ map })
   return window.vectorLayerHelper
 }
 
 export default {
   initMap,
   initBasemapsHelper,
-  initTileLayersHelper,
   initVectorLayersHelper
 }

--
Gitblit v1.8.0