From d838248f54e3bcacf9c2a54f7dc692525af3c051 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期三, 14 四月 2021 10:04:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/conf/MapConfig.js | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/src/conf/MapConfig.js b/src/conf/MapConfig.js
index a89c954..59e35d6 100644
--- a/src/conf/MapConfig.js
+++ b/src/conf/MapConfig.js
@@ -1,6 +1,5 @@
锘縤mport * as L from 'leaflet'
import TDT from './TDT'
-import { LayerSewersPoint } from './layers/LayerSewers'
import { LayerTopic } from './LayerTopic'
import { LayerBasin } from './layers/LayerBasin'
@@ -12,7 +11,7 @@
// service涓绘満閰嶇疆
// const APP_GIS_HOST = 'http://xearth.cn:6299'
const APP_GIS_HOST = 'http://xearth.cn:8088'
-
+const PIPELINE_WFS = APP_GIS_HOST + '/server/ogcserver/PipeLine2/wfs'
// 鑷畾涔変富鏈洪厤缃�
const BLUEMAP_HOST = APP_GIS_HOST // 鍏徃鍙戝竷鐨勫湴鍥炬湇鍔★紝鐢ㄤ簬娴嬭瘯鐨勫湴鍧�
@@ -22,7 +21,7 @@
const mapOptions = {
crs: L.CRS.EPSG4326,
minZoom: 3,
- maxZoom: 18,
+ maxZoom: 17,
// center: [26, 104],
center: [38.828558921813965, 117.41676807403564],
// center: [29.454345703125, 113.40362548828125],
@@ -42,15 +41,10 @@
IntranetBaseMaps: TDT.intranet,
InternetBaseMaps: TDT.internet,
Layers: {
- LayerSewersLine: [LayerBasin, LayerTopic],
- layerSewersPoint: LayerSewersPoint
+ LayerSewersLine: [LayerBasin, LayerTopic]
} // 姹￠洦姘村浘灞傞厤缃�
}
-const mapTokenArray = ['5d76218063082952d18b76da5005f490',
- 'f1b72b5e7cb1175acddfa485f1bc9770',
- 'ac8bbce8119b337d75d4b06696f6186d',
- '9bf834ce1ba3ba01c568147e9bfcab7c']
/**
* 鍐呯綉GIS锛岃幏鍙杢oken鍙傛暟
*/
@@ -87,6 +81,7 @@
mapConfig,
TokenConfig,
BLUEMAP_HOST,
- mapTokenArray
+ PIPELINE_WFS
+ // mapTokenArray
// MagicMaker
}
--
Gitblit v1.8.0