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 | 41 +++++++++++++++++++++++++++++++++--------
1 files changed, 33 insertions(+), 8 deletions(-)
diff --git a/src/conf/MapConfig.js b/src/conf/MapConfig.js
index 8e502d3..4cae2f1 100644
--- a/src/conf/MapConfig.js
+++ b/src/conf/MapConfig.js
@@ -1,6 +1,10 @@
锘縤mport * as L from 'leaflet'
import TDT from './TDT'
-import { LayerSewersLine, LayerSewersPoint } from './LayerSewers'
+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
const pos = curWwwPath.indexOf(pathname)
@@ -8,8 +12,7 @@
// service涓绘満閰嶇疆
// const APP_GIS_HOST = 'http://xearth.cn:6299'
-const APP_GIS_HOST = 'http://xearth.cn:6289'
-
+const APP_GIS_HOST = 'http://xearth.cn:8088'
// 鑷畾涔変富鏈洪厤缃�
const BLUEMAP_HOST = APP_GIS_HOST // 鍏徃鍙戝竷鐨勫湴鍥炬湇鍔★紝鐢ㄤ簬娴嬭瘯鐨勫湴鍧�
@@ -19,10 +22,11 @@
const mapOptions = {
crs: L.CRS.EPSG4326,
minZoom: 3,
- maxZoom: 18,
- // center: [26, 104],
- center: [32.224016189575195, 118.77070426940918],
- zoom: 14,
+ maxZoom: 21,
+ center: [34.828558921813965, 117.41676807403564],
+ zoom: 5,
+ // center: [39.907214641571045, 116.39019012451172],
+ // zoom: 16,
worldCopyJump: true,
inertia: true,
zoomControl: false,
@@ -37,7 +41,9 @@
// defaultBasemapCode: 'tianditu_img', // 榛樿鏄剧ず 鍦板浘绫诲瀷
IntranetBaseMaps: TDT.intranet,
InternetBaseMaps: TDT.internet,
- Layers: { LayerSewersLine: [LayerSewersLine], layerSewersPoint: LayerSewersPoint } // 姹￠洦姘村浘灞傞厤缃�
+ Layers: {
+ LayerSewersLine: [LayerBasin, LayerPlate, LayerTopic, LayerEmergency]
+ } // 姹￠洦姘村浘灞傞厤缃�
}
/**
@@ -54,9 +60,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
+ // mapTokenArray
+ // MagicMaker
}
--
Gitblit v1.8.0