From 4fef038c7e4ba6a82b77e9679f58e2f9d8c0711b Mon Sep 17 00:00:00 2001
From: ChenZeping <chenzeping>
Date: 星期四, 29 四月 2021 18:54:39 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

---
 src/conf/MapConfig.js |   20 +++++++++-----------
 1 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/conf/MapConfig.js b/src/conf/MapConfig.js
index d1ece05..0acc40f 100644
--- a/src/conf/MapConfig.js
+++ b/src/conf/MapConfig.js
@@ -1,9 +1,7 @@
 锘縤mport * as L from 'leaflet'
 import TDT from './TDT'
-import { LayerSewersLine, LayerSewersPoint } from './layers/LayerSewers'
-import { LayerWasteWater } from './layers/LayerWasteWater'
-import { LayerSolidWaste } from './layers/LayerSolidWaste'
-import { LayerWasteGas } from './layers/LayerWasteGas'
+import { LayerTopic } from './LayerTopic'
+import { LayerBasin } from './layers/LayerBasin'
 
 const curWwwPath = window.document.location.href
 const pathname = window.document.location.pathname
@@ -13,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 // 鍏徃鍙戝竷鐨勫湴鍥炬湇鍔★紝鐢ㄤ簬娴嬭瘯鐨勫湴鍧�
 
@@ -23,11 +20,12 @@
 const mapOptions = {
   crs: L.CRS.EPSG4326,
   minZoom: 3,
-  maxZoom: 18,
+  maxZoom: 17,
   // center: [26, 104],
-  // center: [38.828558921813965, 117.41676807403564],
-  center: [29.769515991210938, 107.03567504882812],
-  zoom: 14,
+  // center: [34.828558921813965, 117.41676807403564],
+  // zoom: 5,
+  center: [32.25853085517883, 118.78592848777771],
+  zoom: 15,
   worldCopyJump: true,
   inertia: true,
   zoomControl: false,
@@ -43,8 +41,7 @@
   IntranetBaseMaps: TDT.intranet,
   InternetBaseMaps: TDT.internet,
   Layers: {
-    LayerSewersLine: [LayerSewersLine, LayerWasteWater, LayerWasteGas, LayerSolidWaste],
-    layerSewersPoint: LayerSewersPoint
+    LayerSewersLine: [LayerBasin, LayerTopic]
   } // 姹¢洦姘村浘灞傞厤缃�
 }
 
@@ -84,5 +81,6 @@
   mapConfig,
   TokenConfig,
   BLUEMAP_HOST
+  // mapTokenArray
   // MagicMaker
 }

--
Gitblit v1.8.0