From 69818a26487f546e62eee96d2d6c4733b01c54a2 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期三, 14 四月 2021 09:57:18 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork 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..59e35d6 100644
--- a/src/conf/MapConfig.js
+++ b/src/conf/MapConfig.js
@@ -1,6 +1,8 @@
锘縤mport * as L from 'leaflet'
import TDT from './TDT'
-import { LayerSewersLine, LayerSewersPoint } from './LayerSewers'
+import { LayerTopic } from './LayerTopic'
+import { LayerBasin } from './layers/LayerBasin'
+
const curWwwPath = window.document.location.href
const pathname = window.document.location.pathname
const pos = curWwwPath.indexOf(pathname)
@@ -8,8 +10,8 @@
// 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 PIPELINE_WFS = APP_GIS_HOST + '/server/ogcserver/PipeLine2/wfs'
// 鑷畾涔変富鏈洪厤缃�
const BLUEMAP_HOST = APP_GIS_HOST // 鍏徃鍙戝竷鐨勫湴鍥炬湇鍔★紝鐢ㄤ簬娴嬭瘯鐨勫湴鍧�
@@ -19,10 +21,11 @@
const mapOptions = {
crs: L.CRS.EPSG4326,
minZoom: 3,
- maxZoom: 18,
+ maxZoom: 17,
// center: [26, 104],
- center: [32.224016189575195, 118.77070426940918],
- zoom: 14,
+ center: [38.828558921813965, 117.41676807403564],
+ // center: [29.454345703125, 113.40362548828125],
+ zoom: 5,
worldCopyJump: true,
inertia: true,
zoomControl: false,
@@ -37,7 +40,9 @@
// defaultBasemapCode: 'tianditu_img', // 榛樿鏄剧ず 鍦板浘绫诲瀷
IntranetBaseMaps: TDT.intranet,
InternetBaseMaps: TDT.internet,
- Layers: { LayerSewersLine: [LayerSewersLine], layerSewersPoint: LayerSewersPoint } // 姹￠洦姘村浘灞傞厤缃�
+ Layers: {
+ LayerSewersLine: [LayerBasin, LayerTopic]
+ } // 姹￠洦姘村浘灞傞厤缃�
}
/**
@@ -54,9 +59,29 @@
}
}
+/**
+ *
+ */
+// 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,
+ PIPELINE_WFS
+ // mapTokenArray
+ // MagicMaker
}
--
Gitblit v1.8.0