From 8687fa2178823a3204b3736bc917a7a31cc82f50 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期一, 01 三月 2021 09:57:10 +0800
Subject: [PATCH] 修改图层控制

---
 src/components/helpers/ServiceLayerHelper.js |   66 +++++++++++++++++----------------
 1 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/src/components/helpers/ServiceLayerHelper.js b/src/components/helpers/ServiceLayerHelper.js
index eb4eb9e..96ad647 100644
--- a/src/components/helpers/ServiceLayerHelper.js
+++ b/src/components/helpers/ServiceLayerHelper.js
@@ -29,6 +29,7 @@
   initServiceLayers (layerConfig) {
     this.layerConfig = layerConfig
     this.loadLayers(layerConfig.mapConfig.Layers.LayerSewersLine)
+    // this.loadLayers(layerConfig.mapConfig.Layers.layerSewersPoint)
   }
 
   /**
@@ -40,19 +41,17 @@
     console.debug('ServiceLayerHelper鍔犺浇鍙傛暟锛�', layerConfig)
     for (let i = 0, len = layerConfig.length; i < len; ++i) {
       const opt = layerConfig[i]
-      if (opt.checked) {
-        if (opt.type === 'wmts') {
-          this.loadWmtsLayer(opt, isAddToMap)
-          this.tileLayersWMTSArray.push(opt)
-        } else if (opt.type === 'wms') {
-          this.loadWmsLayer(opt, isAddToMap)
-          this.tileLayersWMSArray.push(opt)
-        } else if (opt.type === 'tile') {
-          this.loadTileLayer(opt, isAddToMap)
-          this.tileLayersTileArray.push(opt)
-        } else if (opt.type === 'geojson') {
-          this.loadGeojsonLayers(opt)
-        }
+      if (opt.type === 'wmts') {
+        this.loadWmtsLayer(opt, isAddToMap)
+        this.tileLayersWMTSArray.push(opt)
+      } else if (opt.type === 'wms') {
+        this.loadWmsLayer(opt, isAddToMap)
+        this.tileLayersWMSArray.push(opt)
+      } else if (opt.type === 'tile') {
+        this.loadTileLayer(opt, isAddToMap)
+        this.tileLayersTileArray.push(opt)
+      } else if (opt.type === 'geojson') {
+        this.loadGeojsonLayers(opt)
       }
     }
   }
@@ -69,16 +68,16 @@
     }
   }
 
-  loadGeojsonLayer (url, layer) {
+  loadGeojsonLayer (url, item) {
     var matches = this.regex.exec(url)
-    var matchValue = layer[matches[1]]
-    var code = layer.code
+    var matchValue = item[matches[1]]
+    var code = item.code
     var newUrl = url.replace(this.regex, matchValue)
     var that = this
     if (!that.geojsonArray[code]) {
       AjaxUtils.GetDataAsynByUrl(newUrl, {}, function (res) {
         store.commit('setSewersDatas', res)
-        var layer = that.loadGeojson(res)
+        var layer = that.loadGeojson(res, item)
         that.geojsonArray[code] = layer
       })
     }
@@ -88,11 +87,10 @@
      * 鍔犺浇鐐规暟鎹�
      * @param res
      */
-  loadGeojson (res) {
+  loadGeojson (res, layer) {
     var that = this
-    const featureGroup = that.L.featureGroup([], {
-      attribution: { id: '123' }
-    }).addTo(that.map)
+    var icon = layer.icon
+    const featureGroup = that.L.featureGroup().addTo(that.map)
     that.L.geoJSON(res.features, {
       style: function (feature) {
         return {
@@ -111,15 +109,14 @@
           {
             radius: 20,
             img: {
-              url: 'assets/images/map/marker-icon.png',
+              // url: 'assets/images/map/marker-icon.png',
+              url: '/assets/images/map/' + icon,
               size: [20, 20]
             }
           })
       }
     }).bindPopup(function (layer) {
-      // return layer.feature.properties.linenumber
-    }).addTo(featureGroup)
-    featureGroup.bringToBack()
+    }).addTo(featureGroup).bringToFront()
     return featureGroup
   }
 
@@ -140,11 +137,13 @@
   loadWmtsLayer (options, isAddToMap = true) {
     const layer = this.L.tileLayer(options.url, options.option)
     layer.config = options
-
-    if (isAddToMap) {
-      layer.addTo(this.map)
+    var checked = options.checked
+    if (checked) {
+      if (isAddToMap) {
+        layer.addTo(this.map)
+      }
+      this.loadedLayersMap.set(options.code, layer)
     }
-    this.loadedLayersMap.set(options.code, layer)
   }
 
   /**
@@ -156,10 +155,13 @@
     const layer = this.L.tileLayer.wms(options.url, options.option)
     layer.config = options
 
-    if (isAddToMap) {
-      layer.addTo(this.tileLayerWmslayerGroup)
+    var checked = options.checked
+    if (checked) {
+      if (isAddToMap) {
+        layer.addTo(this.tileLayerWmslayerGroup)
+      }
+      this.loadedLayersMap.set(options.code, layer)
     }
-    this.loadedLayersMap.set(options.code, layer)
   }
 
   /**

--
Gitblit v1.8.0