From c4044fb60e53e5c83da4ee645d5160f914e422a3 Mon Sep 17 00:00:00 2001
From: YANGDL <114714267@qq.com>
Date: 星期五, 05 三月 2021 16:17:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/helpers/ServiceLayerHelper.js | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/components/helpers/ServiceLayerHelper.js b/src/components/helpers/ServiceLayerHelper.js
index 444421f..dcde9a6 100644
--- a/src/components/helpers/ServiceLayerHelper.js
+++ b/src/components/helpers/ServiceLayerHelper.js
@@ -37,7 +37,7 @@
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)
}
@@ -161,10 +161,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 })
@@ -208,7 +211,8 @@
}
removeLayer (item) {
- this.map.removeLayer(this.layerArray[item.code])
+ var layer = this.layerArray[item.code]
+ layer && this.map.removeLayer(layer)
}
/**
--
Gitblit v1.8.0