From 70fd7ce1af45948ab2080d2036d345fd3b4c15a6 Mon Sep 17 00:00:00 2001
From: ChenZeping <chenzeping>
Date: 星期四, 29 四月 2021 17:55:09 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/conf/layers/LayerPipeLines.js | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/src/conf/layers/LayerPipeLines.js b/src/conf/layers/LayerPipeLines.js
index dc24179..bb746d9 100644
--- a/src/conf/layers/LayerPipeLines.js
+++ b/src/conf/layers/LayerPipeLines.js
@@ -20,8 +20,8 @@
sname: '绠＄綉',
checked: false,
type: 0,
+ wmsLayers: 'sewer:pipeline_rain',
// wfs: WFS_URL + '?TYPENAME=绠＄綉&FILTER=<Filter xmlns="http://www.opengis.net/ogc"><PropertyIsEqualTo><PropertyName>mediumtype</PropertyName><Literal>闆ㄦ按绠＄嚎</Literal></PropertyIsEqualTo></Filter>',
- wfs: 'http://xearth.cn:6240/geoserver/sewer/wfs?typeName=sewer:pipeline&maxFeatures=500&outputFormat=application%2Fjson&cql_filter=linenumtype=\'闆ㄦ按绠＄嚎\'',
icon: 'sewers/闆ㄦ按绾�.png',
color: '#0070ff',
minZoom: 13,
@@ -32,22 +32,24 @@
},
{
code: 'accidentline',
- name: '浜嬫晠姘寸嚎',
+ name: '浜嬫晠姘�',
sname: '浜嬫晠姘�',
checked: false,
+ // wmsLayers: 'sewer:pipeline_accident',
type: 0,
minZoom: 13,
wfs: WFS_URL + '?TYPENAME=浜嬫晠姘�'
},
{
code: 'oilline',
- name: '鍚补姹℃按绾�',
+ name: '鍚补姹℃按',
sname: '鍚补姹℃按',
checked: false,
type: 0,
minZoom: 13,
color: '#ffaa00',
- wfs: 'http://xearth.cn:6240/geoserver/sewer/wfs?typeName=sewer:pipeline&maxFeatures=500&outputFormat=application%2Fjson&cql_filter=mediumtype=\'鍚补姹℃按\'',
+ wmsLayers: 'sewer:pipeline_sewer',
+ // wfs: 'http://xearth.cn:6240/geoserver/sewer/wfs?typeName=sewer:pipeline&maxFeatures=500&outputFormat=application%2Fjson&cql_filter=mediumtype=\'鍚补姹℃按\'',
styles: {
COLOR: '#ffaa00',
FILL_COLOR: '#ffaa00'
@@ -55,7 +57,7 @@
},
{
code: 'saltline',
- name: '鍚洂姹℃按绾�',
+ name: '鍚洂姹℃按',
sname: '鍚洂姹℃按',
checked: false,
type: 0,
@@ -64,11 +66,21 @@
},
{
code: 'alkaliline',
- name: '鍚⒈姹℃按绾�',
+ name: '鍚⒈姹℃按',
sname: '鍚⒈姹℃按',
checked: false,
type: 0,
wfs: WFS_URL + '?TYPENAME=鍚⒈姹℃按',
+ minZoom: 10
+ },
+ {
+ code: 'sulfurline',
+ name: '鍚～姹℃按',
+ sname: '鍚～姹℃按',
+ checked: false,
+ type: 0,
+ wmsLayers: 'sewer:pipeline_sulfur',
+ // wfs: WFS_URL + '?TYPENAME=鍚⒈姹℃按',
minZoom: 10
},
{
@@ -82,7 +94,7 @@
},
{
code: 'purifyline',
- name: '鍑�鍖栨按绾�',
+ name: '鍑�鍖栨按',
sname: '鍑�鍖栨按',
checked: false,
type: 0,
@@ -91,7 +103,7 @@
},
{
code: 'loopline',
- name: '寰幆姘寸嚎',
+ name: '寰幆姘�',
sname: '寰幆姘�',
type: 0,
checked: false,
--
Gitblit v1.8.0