From faadb3a39e89b2cb7a00e81e3778f480f1f09998 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期三, 14 四月 2021 17:38:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/conf/MapConfig.js | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/conf/MapConfig.js b/src/conf/MapConfig.js
index a039e8f..168b466 100644
--- a/src/conf/MapConfig.js
+++ b/src/conf/MapConfig.js
@@ -1,7 +1,7 @@
锘縤mport * as L from 'leaflet'
import TDT from './TDT'
-import { LayerSewersLine, LayerSewersPoint } from './LayerSewers'
-import { LayerWasteWater } from './LayerWasteWater'
+import { LayerTopic } from './LayerTopic'
+import { LayerBasin } from './layers/LayerBasin'
const curWwwPath = window.document.location.href
const pathname = window.document.location.pathname
@@ -11,7 +11,6 @@
// service涓绘満閰嶇疆
// const APP_GIS_HOST = 'http://xearth.cn:6299'
const APP_GIS_HOST = 'http://xearth.cn:8088'
-
// 鑷畾涔変富鏈洪厤缃�
const BLUEMAP_HOST = APP_GIS_HOST // 鍏徃鍙戝竷鐨勫湴鍥炬湇鍔★紝鐢ㄤ簬娴嬭瘯鐨勫湴鍧�
@@ -21,10 +20,11 @@
const mapOptions = {
crs: L.CRS.EPSG4326,
minZoom: 3,
- maxZoom: 18,
+ maxZoom: 17,
// center: [26, 104],
center: [38.828558921813965, 117.41676807403564],
- zoom: 14,
+ // center: [29.454345703125, 113.40362548828125],
+ zoom: 5,
worldCopyJump: true,
inertia: true,
zoomControl: false,
@@ -40,8 +40,7 @@
IntranetBaseMaps: TDT.intranet,
InternetBaseMaps: TDT.internet,
Layers: {
- LayerSewersLine: [LayerSewersLine, LayerWasteWater],
- layerSewersPoint: LayerSewersPoint
+ LayerSewersLine: [LayerBasin, LayerTopic]
} // 姹￠洦姘村浘灞傞厤缃�
}
@@ -81,5 +80,6 @@
mapConfig,
TokenConfig,
BLUEMAP_HOST
+ // mapTokenArray
// MagicMaker
}
--
Gitblit v1.8.0