From cfb52200f39d0c659eb884a1df331dd997af7e72 Mon Sep 17 00:00:00 2001
From: YANGDL <114714267@qq.com>
Date: 星期三, 10 三月 2021 09:06:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/components/helpers/ServiceLayerHelper.js |   64 +++++++++++++++++++++++--------
 1 files changed, 47 insertions(+), 17 deletions(-)

diff --git a/src/components/helpers/ServiceLayerHelper.js b/src/components/helpers/ServiceLayerHelper.js
index 490b7ea..8d1ab87 100644
--- a/src/components/helpers/ServiceLayerHelper.js
+++ b/src/components/helpers/ServiceLayerHelper.js
@@ -16,13 +16,27 @@
     this.tileLayersTileArray = [] // 鍒濆鐨凾ile闆�
     this.tileLayersWMSArray = [] // 鍒濆鐨刉MS闆�
     this.layerArray = {} // key涓洪厤缃殑code锛屽姞杞界殑鍥惧眰瀵硅薄锛�
-    this.layerConfig = {}
     this.regex = /\{(.+?)\}/g // 鍖归厤{}
     this.popupComp = null
   }
 
   getTileLayer (code) {
     return this.loadedLayersMap.get(code)
+  }
+
+  getByLayerId (layerId) {
+    for (var k in this.layerArray) {
+      var layer = this.layerArray[k]
+      var geojson = layer.toGeoJSON()
+      var features = geojson.features
+      for (var j = 0; j < features.length; j++) {
+        var feature = features[j]
+        if (feature.id === layerId) {
+          return layer
+        }
+      }
+    }
+    return null
   }
 
   initDisplayZoom (layerConfig) {
@@ -34,10 +48,10 @@
         var layers = config.layers
         for (var j = 0; j < layers.length; j++) {
           var layer = layers[j]
-          if (layer.zoom) {
-            if (zoom > layer.zoom) {
+          if (layer.minZoom) {
+            if (zoom > layer.minZoom) {
               var layerObj = that.layerArray[layer.code]
-              layerObj.addTo(that.map)
+              layerObj && layerObj.addTo(that.map)
             } else {
               that.removeLayer(layer)
             }
@@ -102,18 +116,23 @@
      * @param url
      * @param item
      */
-  loadGeojsonLayer (url, item) {
+  async loadGeojsonLayer (url, item) {
     var matches = this.regex.exec(url)
     var matchValue = item[matches[1]]
     var code = item.code
     var newUrl = url.replace(this.regex, matchValue)
     var that = this
     if (!that.layerArray[code]) {
-      AjaxUtils.GetDataAsynByUrl(newUrl, {}, function (res) {
-        store.commit('addSewersDatas', res)
-        var layer = that.loadGeojson(res, item)
-        that.layerArray[code] = layer
-      })
+      const res = await AjaxUtils.GetDataAsynByUrl(newUrl, {})
+      if (res.data instanceof Object && Object.prototype.hasOwnProperty.call(res.data, 'features')) {
+        store.commit('addSewersDatas', res.data)
+        if (newUrl.indexOf('绠＄綉') !== -1 || newUrl.indexOf('鍥涢��') !== -1) {
+          var layer = that.loadGeojson(res.data, item)
+          that.layerArray[code] = layer
+        }
+      }
+    } else {
+      that.layerArray[code].addTo(that.map)
     }
   }
 
@@ -125,6 +144,7 @@
     var that = this
     var icon = opt.icon
     const featureGroup = that.L.featureGroup().addTo(that.map)
+    const featureList = []
     const geojson = that.L.geoJSON(res.features, {
       style: function (feature) {
         return {
@@ -133,9 +153,9 @@
           fillColor: styles.defaultLineStyle.fillColor,
           color: styles.defaultLineStyle.color,
           fillOpacity: styles.defaultLineStyle.fillOpacity,
-          opacity: styles.defaultLineStyle.opacity
-          // dashArray: styles.defaultLineStyle.dashArray,
-          // dashSpeed: styles.defaultLineStyle.dashSpeed
+          opacity: styles.defaultLineStyle.opacity,
+          dashArray: styles.defaultLineStyle.dashArray,
+          dashSpeed: styles.defaultLineStyle.dashSpeed
         }
       },
       pointToLayer: function (geoJsonPoint, latlng) {
@@ -147,6 +167,10 @@
               size: styles.defaultLineStyle.size
             }
           })
+      },
+      onEachFeature: function (feature, layer) {
+        featureList.push(layer)
+        layer.addTo(featureGroup)
       }
     }).bindPopup(function (layer) {
       that.popupComp.setDatas(layer)
@@ -161,10 +185,13 @@
       .bindTooltip(function (layer) {
         const nameId = layer.feature.id
         let name = ''
-        if (nameId.indexOf('涓夐��') !== -1 || nameId.indexOf('鍥涢��') !== -1) {
+        if (nameId.indexOf('涓夐��') !== -1 || nameId.indexOf('鍥涢��') !== -1 || nameId.indexOf('绐ㄤ簳') !== -1) {
           name = layer.feature.properties.pointnumber
         } else {
           name = layer.feature.properties.name
+        }
+        if (name === undefined) {
+          name = ''
         }
         return name
       }, { direction: 'bottom', offset: [0, 15], sticky: true })
@@ -197,18 +224,21 @@
             }
           })
         }
-      }).addTo(featureGroup)
+      // }).addTo(that.map)
+      // }).addTo(featureGroup)
+      })
     store.commit('addSewersDatas', geojson)
     if (Object.prototype.hasOwnProperty.call(res, 'features') && res.features.length > 0 && (res.features[0].geometry.type === 'LineString' || res.features[0].geometry.type === 'MultiLineString')) {
       geojson.bringToBack()
     } else {
       geojson.bringToFront()
     }
-    return featureGroup
+    return geojson
   }
 
   removeLayer (item) {
-    this.map.removeLayer(this.layerArray[item.code])
+    var layer = this.layerArray[item.code]
+    layer && this.map.removeLayer(layer)
   }
 
   /**

--
Gitblit v1.8.0