From cd80929f0ae8882a98cfe3936b2a96bded1c12d8 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期三, 07 四月 2021 18:59:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

---
 src/conf/MapConfig.js |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/conf/MapConfig.js b/src/conf/MapConfig.js
index a039e8f..4dff288 100644
--- a/src/conf/MapConfig.js
+++ b/src/conf/MapConfig.js
@@ -1,7 +1,9 @@
 锘縤mport * as L from 'leaflet'
 import TDT from './TDT'
-import { LayerSewersLine, LayerSewersPoint } from './LayerSewers'
-import { LayerWasteWater } from './LayerWasteWater'
+import { LayerSewersPoint } from './layers/LayerSewers'
+import { LayerTopic } from './LayerTopic'
+import { LayerPipeLine } from './LayerPipeLine'
+import { LayerBasin } from './layers/LayerBasin'
 
 const curWwwPath = window.document.location.href
 const pathname = window.document.location.pathname
@@ -24,7 +26,8 @@
   maxZoom: 18,
   // center: [26, 104],
   center: [38.828558921813965, 117.41676807403564],
-  zoom: 14,
+  // center: [29.454345703125, 113.40362548828125],
+  zoom: 5,
   worldCopyJump: true,
   inertia: true,
   zoomControl: false,
@@ -40,11 +43,15 @@
   IntranetBaseMaps: TDT.intranet,
   InternetBaseMaps: TDT.internet,
   Layers: {
-    LayerSewersLine: [LayerSewersLine, LayerWasteWater],
+    LayerSewersLine: [LayerBasin, LayerTopic, LayerPipeLine],
     layerSewersPoint: LayerSewersPoint
   } // 姹¢洦姘村浘灞傞厤缃�
 }
 
+const mapTokenArray = ['5d76218063082952d18b76da5005f490',
+  'f1b72b5e7cb1175acddfa485f1bc9770',
+  'ac8bbce8119b337d75d4b06696f6186d',
+  '9bf834ce1ba3ba01c568147e9bfcab7c']
 /**
  * 鍐呯綉GIS锛岃幏鍙杢oken鍙傛暟
  */
@@ -80,6 +87,7 @@
   mapOptions,
   mapConfig,
   TokenConfig,
-  BLUEMAP_HOST
+  BLUEMAP_HOST,
+  mapTokenArray
   // MagicMaker
 }

--
Gitblit v1.8.0