From 3072da92f3c3f08b2ee0ca03ee4e74b12f545b0e Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期三, 26 五月 2021 21:31:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/conf/MapConfig.js | 28 +++++++++++-----------------
1 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/src/conf/MapConfig.js b/src/conf/MapConfig.js
index ef799e2..4cae2f1 100644
--- a/src/conf/MapConfig.js
+++ b/src/conf/MapConfig.js
@@ -1,14 +1,9 @@
锘縤mport * as L from 'leaflet'
import TDT from './TDT'
-import { LayerSewersPoint } from './layers/LayerSewers'
-import { LayerWasteWater } from './layers/LayerWasteWater'
-import { LayerSolidWaste } from './layers/LayerSolidWaste'
-import { LayerWasteGas } from './layers/LayerWasteGas'
-import { LayerPipeLine } from './layers/LayerPipeLine'
-import { LayerArea } from './layers/LayerArea'
-import { LayerPk } from './layers/LayerPk'
-import { LayerFsss } from './layers/LayerFsss'
-import { LayerHbss } from './layers/LayerHbss'
+import { LayerTopic } from './LayerTopic'
+import { LayerBasin } from './layers/LayerBasin'
+import { LayerEmergency } from './LayerEmergency'
+import { LayerPlate } from './layers/LayerPlate'
const curWwwPath = window.document.location.href
const pathname = window.document.location.pathname
@@ -18,7 +13,6 @@
// service涓绘満閰嶇疆
// const APP_GIS_HOST = 'http://xearth.cn:6299'
const APP_GIS_HOST = 'http://xearth.cn:8088'
-
// 鑷畾涔変富鏈洪厤缃�
const BLUEMAP_HOST = APP_GIS_HOST // 鍏徃鍙戝竷鐨勫湴鍥炬湇鍔★紝鐢ㄤ簬娴嬭瘯鐨勫湴鍧�
@@ -28,11 +22,11 @@
const mapOptions = {
crs: L.CRS.EPSG4326,
minZoom: 3,
- maxZoom: 18,
- // center: [26, 104],
- center: [38.828558921813965, 117.41676807403564],
- // center: [29.454345703125, 113.40362548828125],
- zoom: 14,
+ maxZoom: 21,
+ center: [34.828558921813965, 117.41676807403564],
+ zoom: 5,
+ // center: [39.907214641571045, 116.39019012451172],
+ // zoom: 16,
worldCopyJump: true,
inertia: true,
zoomControl: false,
@@ -48,8 +42,7 @@
IntranetBaseMaps: TDT.intranet,
InternetBaseMaps: TDT.internet,
Layers: {
- LayerSewersLine: [LayerPipeLine, LayerFsss, LayerHbss, LayerArea, LayerPk, LayerWasteWater, LayerWasteGas, LayerSolidWaste],
- layerSewersPoint: LayerSewersPoint
+ LayerSewersLine: [LayerBasin, LayerPlate, LayerTopic, LayerEmergency]
} // 姹￠洦姘村浘灞傞厤缃�
}
@@ -89,5 +82,6 @@
mapConfig,
TokenConfig,
BLUEMAP_HOST
+ // mapTokenArray
// MagicMaker
}
--
Gitblit v1.8.0