From 44280203af25006efc4b8939b4fc01477041e9b8 Mon Sep 17 00:00:00 2001
From: wangrui <zephyrs0894@163.com>
Date: 星期六, 19 十二月 2020 01:01:47 +0800
Subject: [PATCH] 重构基础图层加载的代码

---
 src/Sgis.js |   90 ++++++++++++++++++++++++--------------------
 1 files changed, 49 insertions(+), 41 deletions(-)

diff --git a/src/Sgis.js b/src/Sgis.js
index 9bedeb6..378fcba 100644
--- a/src/Sgis.js
+++ b/src/Sgis.js
@@ -2,49 +2,43 @@
 import BasemapHelper from '@components/helpers/BasemapHelper'
 import VectorLayerHelper from '@components/helpers/VectorLayerHelper'
 
-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 Editable from '@components/plugin/Editable'
+// import PathDrag from '@components/plugin/PathDrag'
+// import CanvasIcon from '@components/plugin/CanvasMarkers'
+// import MagicMarker from '@components/plugin/MagicMarker'
 import 'leaflet.markercluster'
 
 import MapConfig from '@/conf/MapConfig'
 import CommonLayerLoad from '@components/mapmodules/CommonLayerLoad'
-import DashFlow from '@components/plugin/PathDashFlow'
-import AjaxUtils from '@/utils/AjaxUtils'
+// import DashFlow from '@components/plugin/PathDashFlow'
+// import AjaxUtils from '@/utils/AjaxUtils'
 let map = null
-let baseMapGroup = null
+// let baseMapGroup = null
 let commonLayerLoad = null
 const initMap = (div) => {
     if (map != null) {
         map.remove()
-        baseMapGroup = null
+        // baseMapGroup = null
         commonLayerLoad = null
     }
 
-    Editable.init(L)
-    PathDrag.init(L)
-    MagicMarker.init(L)
-    CanvasIcon.init(L)
+    // Leaflet鎵╁睍浠ｇ爜
+    // Editable.init(L) // 鍥惧眰缂栬緫
+    // PathDrag.init(L) // 璺緞鎷栨嫿
+    // MagicMarker.init(L) // 鍔ㄧ敾Marker
+    // CanvasIcon.init(L) // 浣跨敤canvas缁樺埗Marker
 
-    // CustomPopup.init(L)
-    // DashFlow.DashFlow(L)
+    // CustomPopup.init(L) // 鑷畾涔夊脊鍑烘
+    // DashFlow.DashFlow(L) // 娴佸姩绾垮浘
+    // Leaflet鎵╁睍浠ｇ爜
+
     map = L.map(div, MapConfig.mapOptions)
-    DashFlow.DashFlow(L, map)
-    commonLayerLoad = new CommonLayerLoad()
-    const blueMap = commonLayerLoad.loadBlueMap()
-    // const imgMapm = commonLayerLoad.loadImgMapm()
-    // const imgMapa = commonLayerLoad.loadImgMapa()
-    // L.layerGroup([normalMapm, normalMapa]).addTo(map)
-    baseMapGroup = L.layerGroup([blueMap]).addTo(map)
-    getToken()
+
+    
+    // getToken()
     // L.control.scale({ maxWidth: 200, metric: true, imperial: false }).addTo(map)
     // L.control.layers(SgisConfig.baseLayers, SgisConfig.overlayLayers, { position: 'bottomright' }).addTo(map)
-    // 鍔犺浇鍥界晫鍜岄搧璺�
-    const nationalBoundaries = commonLayerLoad.loadGuoJie()
-    const railWay = commonLayerLoad.loadRailWay()
-    nationalBoundaries.addTo(map)
-    railWay.addTo(map)
+
     window.map = map
     window.L = L
 
@@ -52,18 +46,19 @@
     return { map: map, L: L }
 }
 
-let getToken = () => {
-    let params = MapConfig.TokenConfig
-    AjaxUtils.GetDataAsynByUrl(params.url, params.option, function(token) {
-        showTdt(token)
-    })
-}
-let showTdt = (token) => {
-    const imgMapm = commonLayerLoad.loadIntranetImgMap(token)
-    const imgMapa = commonLayerLoad.loadIntranetImgMapCia(token)
-    baseMapGroup.addLayer(imgMapm)
-    baseMapGroup.addLayer(imgMapa)
-}
+// let getToken = () => {
+//     let params = MapConfig.TokenConfig
+//     AjaxUtils.GetDataAsynByUrl(params.url, params.option, function(token) {
+//         showTdt(token)
+//     })
+// }
+// let showTdt = (token) => {
+//     const imgMapm = commonLayerLoad.loadIntranetImgMap(token)
+//     const imgMapa = commonLayerLoad.loadIntranetImgMapCia(token)
+//     baseMapGroup.addLayer(imgMapm)
+//     baseMapGroup.addLayer(imgMapa)
+// }
+
 /**
  * 鐡︾墖搴曞浘鍒濆鍖�
  * @param map
@@ -72,6 +67,18 @@
     // todo 杩欓噷杩涜搴曞浘鍦板浘鐨勫垵濮嬪寲
     var basemapHelper = new BasemapHelper(map, L)
     return basemapHelper
+}
+
+const initTileLayers = (map, L) => {
+    // DashFlow.DashFlow(L, map)
+    commonLayerLoad = new CommonLayerLoad()
+    // const blueMap = commonLayerLoad.loadBlueMap()
+    // baseMapGroup = L.layerGroup([blueMap]).addTo(map)
+
+    const imgMapm = commonLayerLoad.loadImgMapm()
+    const imgMapa = commonLayerLoad.loadImgMapa()
+    
+    L.layerGroup([imgMapm, imgMapa]).addTo(map)
 }
 
 /**
@@ -85,7 +92,7 @@
  * @param obj { name: 'trackPlayer', ref: this.$refs.trackPlayer }  缁勪欢鐨勫悕绉� 鍜� 缁勪欢鐨勫紩鐢�
  * @param loadMethodNames
  */
-const initLayers = (map, L, obj, env) => {
+const initVectorLayers = (map, L, obj, env) => {
     // todo 杩欓噷杩涜鍦板浘鐨勫垵濮嬪寲
     var vectorLayerHelper = new VectorLayerHelper(map, L, env)
     if (obj != null) {
@@ -100,5 +107,6 @@
 export default {
     initMap,
     initBasemaps,
-    initLayers
+    initTileLayers,
+    initVectorLayers
 }

--
Gitblit v1.8.0