From 0a0080a207a39e51a30a23a41c2054e842f36dae Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期二, 06 四月 2021 18:21:27 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/conf/MapConfig.js | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/src/conf/MapConfig.js b/src/conf/MapConfig.js
index 98ff85c..9620d76 100644
--- a/src/conf/MapConfig.js
+++ b/src/conf/MapConfig.js
@@ -1,7 +1,8 @@
锘縤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'
const curWwwPath = window.document.location.href
const pathname = window.document.location.pathname
@@ -24,6 +25,7 @@
maxZoom: 18,
// center: [26, 104],
center: [38.828558921813965, 117.41676807403564],
+ // center: [29.454345703125, 113.40362548828125],
zoom: 14,
worldCopyJump: true,
inertia: true,
@@ -40,11 +42,15 @@
IntranetBaseMaps: TDT.intranet,
InternetBaseMaps: TDT.internet,
Layers: {
- LayerSewersLine: [LayerSewersLine, LayerWasteWater],
+ LayerSewersLine: [LayerPipeLine, LayerTopic],
layerSewersPoint: LayerSewersPoint
} // 姹￠洦姘村浘灞傞厤缃�
}
+const mapTokenArray = ['5d76218063082952d18b76da5005f490',
+ 'f1b72b5e7cb1175acddfa485f1bc9770',
+ 'ac8bbce8119b337d75d4b06696f6186d',
+ '9bf834ce1ba3ba01c568147e9bfcab7c']
/**
* 鍐呯綉GIS锛岃幏鍙杢oken鍙傛暟
*/
@@ -59,9 +65,28 @@
}
}
+/**
+ *
+ */
+// const MagicMaker = {
+// Current: 'vanishIn',
+// ARRAY: [
+// 'twisterInDown', 'twisterInUp', 'swap',
+// 'puffIn', 'vanishIn',
+// 'openDownLeftReturn', 'openDownRightReturn', 'openUpLeftReturn', 'openUpRightReturn',
+// 'perspectiveDownReturn', 'perspectiveUpReturn', 'perspectiveLeftReturn', 'perspectiveRightReturn',
+// 'slideDownReturn', 'slideUpReturn', 'slideLeftReturn', 'slideRightReturn',
+// 'swashIn', 'foolishIn',
+// 'tinRightIn', 'tinLeftIn', 'tinUpIn', 'tinDownIn',
+// 'boingInUp',
+// 'spaclInUp', 'spaceInRight', 'spaceInDown', 'spaceInLeft']
+// }
+
export default {
mapOptions,
mapConfig,
TokenConfig,
- BLUEMAP_HOST
+ BLUEMAP_HOST,
+ mapTokenArray
+ // MagicMaker
}
--
Gitblit v1.8.0