From 1855420d71d8df701879548bb7f6ecb810ab0e9a Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期三, 07 四月 2021 13:01:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/helpers/BasemapHelper.js | 27 +++++++++++----------------
1 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/src/components/helpers/BasemapHelper.js b/src/components/helpers/BasemapHelper.js
index d17a606..8105721 100644
--- a/src/components/helpers/BasemapHelper.js
+++ b/src/components/helpers/BasemapHelper.js
@@ -1,5 +1,6 @@
/* eslint-disable no-debugger */
import AjaxUtils from '@/utils/AjaxUtils'
+import * as utils from '../../utils/utils'
/**
* 搴曞浘绠＄悊鍔╂墜锛岃礋璐ｅ簳鍥惧垱寤哄強寮�鍏�
@@ -53,23 +54,15 @@
*/
showBasemap = (code, showAnnotation, isHideOthers = true) => {
const basemap = this.basemapMap.get(code)
-
if (isHideOthers) {
this.basemapLayerGroup.clearLayers()
}
- setTimeout(() => {
- // const layer = this.basemapLayerGroup.hasLayer(basemap.layer)
- // if (!layer) {
- this.basemapLayerGroup.addLayer(basemap.layer)
- // }
-
- if (showAnnotation) {
- // if()
- this.basemapLayerGroup.addLayer(basemap.annotation)
- } else {
- this.basemapLayerGroup.removeLayer(basemap.annotation)
- }
- }, 300)
+ this.basemapLayerGroup.addLayer(basemap.layer)
+ if (showAnnotation) {
+ this.basemapLayerGroup.addLayer(basemap.annotation)
+ } else {
+ this.basemapLayerGroup.removeLayer(basemap.annotation)
+ }
}
/**
@@ -87,8 +80,10 @@
const internetBasemaps = config.mapConfig.InternetBaseMaps
for (let i = 0, len = internetBasemaps.length; i < len; ++i) {
const basemapConfig = internetBasemaps[i]
- const basemapLayer = this.L.tileLayer(basemapConfig.map.url, basemapConfig.map.option)
- const basemapAnnotationLayer = this.L.tileLayer(basemapConfig.annotation.url, basemapConfig.annotation.option)
+ const mapToken = utils.getRandomTDTToken()
+ const mapUrl = utils.changeURLArg(basemapConfig.map.url, 'tk', mapToken)
+ const basemapLayer = this.L.tileLayer(mapUrl, basemapConfig.map.option)
+ const basemapAnnotationLayer = this.L.tileLayer(mapUrl, basemapConfig.annotation.option)
const basemap = {
code: basemapConfig.code,
--
Gitblit v1.8.0