From 0e58385d0deafd7a7f45fbfd801d39703f230f2f Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期日, 18 四月 2021 22:49:51 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/conf/layers/LayerPipeLines.js | 54 +++++++++++++++++++-------
src/conf/layers/LayerFsss.js | 13 +++---
src/components/LayerController/service/WfsLayerService.js | 6 ++-
src/conf/layers/LayerHbss.js | 12 +++---
src/conf/Constants.js | 4 +-
5 files changed, 57 insertions(+), 32 deletions(-)
diff --git a/src/components/LayerController/service/WfsLayerService.js b/src/components/LayerController/service/WfsLayerService.js
index f00eaeb..e1bd4a5 100644
--- a/src/components/LayerController/service/WfsLayerService.js
+++ b/src/components/LayerController/service/WfsLayerService.js
@@ -10,8 +10,8 @@
this.params = {
version: '1.0.0',
REQUEST: 'getfeature',
- OUTPUTFORMAT: 'json',
- maxFeatures: 20000
+ OUTPUTFORMAT: 'json'
+ // maxFeatures: 20000
}
this.popupComp = window.popupComp
this.L = window.L
@@ -35,6 +35,8 @@
draw (features) {
const icon = this.config.icon
+ const styles = this.config.styles
+ Object.assign(STYLES, styles)
const geojsonLayer = this.L.geoJSON(features, {
style: function (feature) {
return {
diff --git a/src/conf/Constants.js b/src/conf/Constants.js
index 2b25457..debe021 100644
--- a/src/conf/Constants.js
+++ b/src/conf/Constants.js
@@ -4,7 +4,7 @@
POLYGON: 'polygon'
}
-export const PIPELINE_WFS = 'http://xearth.cn:8088/server/ogcserver/PipeLine/wfs'
+export const PIPELINE_WFS = 'http://xearth.cn:8088/server/ogcserver/PipeLine2/wfs'
export const logicMapper = {
wasteGasPfk: 'WasteGas.js',
@@ -17,7 +17,7 @@
export const STYLES = {
FILL: true,
WEIGHT: 3,
- FILL_COLOR: '#73b2ff',
+ FILL_COLOR: '#0070ff',
COLOR: '#73b2ff',
FILL_OPACITY: 0.2,
OPACITY: 1,
diff --git a/src/conf/layers/LayerFsss.js b/src/conf/layers/LayerFsss.js
index 0edef60..0e5db5b 100644
--- a/src/conf/layers/LayerFsss.js
+++ b/src/conf/layers/LayerFsss.js
@@ -13,15 +13,14 @@
name: '绠℃',
sname: '绠℃',
checked: false,
- minZoom: 15,
- wfs: WFS_URL + '?TYPENAME=绠℃'
+ wfs: 'http://xearth.cn:6240/geoserver/sewer/wfs?typeName=sewer:pipesegment&maxFeatures=50&outputFormat=application%2Fjson&cql_filter=orgname=\'宸撮櫟鐭冲寲\''
},
{
code: 'fourlink',
name: '鍥涢��',
sname: '鍥涢��',
checked: true,
- minZoom: 15,
+ minZoom: 16,
wfs: WFS_URL + '?TYPENAME=鍥涢��',
icon: 'sewers/鍥涢��.png'
},
@@ -30,7 +29,7 @@
name: '涓夐��',
sname: '涓夐��',
checked: false,
- minZoom: 15,
+ minZoom: 16,
wfs: WFS_URL + '?TYPENAME=涓夐��',
icon: 'sewers/涓夐��.png'
},
@@ -38,7 +37,7 @@
code: 'piperack',
name: '绠℃灦(澧�)',
sname: 'PipeRack',
- minZoom: 10,
+ minZoom: 16,
wfs: WFS_URL + '?TYPENAME=绠℃灦',
checked: false
},
@@ -46,7 +45,7 @@
code: 'pipegallery',
name: '绠″粖(甯�)',
sname: 'PipeGallery',
- minZoom: 10,
+ minZoom: 16,
wfs: WFS_URL + '?TYPENAME=绠″粖',
checked: false
},
@@ -69,7 +68,7 @@
code: 'elbow',
name: '寮ご',
sname: '寮ご',
- minZoom: 10,
+ minZoom: 16,
checked: false,
wfs: WFS_URL + '?TYPENAME=寮ご',
icon: 'sewers/寮ご.png'
diff --git a/src/conf/layers/LayerHbss.js b/src/conf/layers/LayerHbss.js
index fe105f7..5fdeca9 100644
--- a/src/conf/layers/LayerHbss.js
+++ b/src/conf/layers/LayerHbss.js
@@ -13,7 +13,7 @@
name: '绐ㄤ簳',
sname: '绐ㄤ簳',
checked: true,
- minZoom: 10,
+ minZoom: 16,
wfs: WFS_URL + '?TYPENAME=绐ㄤ簳',
icon: 'sewers/绐ㄤ簳.png'
},
@@ -22,7 +22,7 @@
name: '闆ㄧ瀛�',
sname: '闆ㄧ瀛�',
checked: false,
- minZoom: 10,
+ minZoom: 16,
wfs: WFS_URL + '?TYPENAME=闆ㄧ瀛�',
icon: 'sewers/闆ㄧ瀛�.png'
},
@@ -30,7 +30,7 @@
code: 'fht',
name: '闃茬伀鍫�',
sname: '闃茬伀鍫�',
- minZoom: 10,
+ minZoom: 16,
wfs: WFS_URL + '?TYPENAME=闃茬伀鍫�',
checked: false
},
@@ -38,7 +38,7 @@
code: 'jsc',
name: '闆嗘按姹�',
sname: '闆嗘按姹�',
- minZoom: 10,
+ minZoom: 16,
wfs: WFS_URL + '?TYPENAME=闆嗘按姹�',
checked: false,
icon: 'sewers/闆嗘按姹�.png'
@@ -54,7 +54,7 @@
code: 'yly',
name: '婧㈡祦鍫�',
sname: '婧㈡祦鍫�',
- minZoom: 10,
+ minZoom: 16,
wfs: WFS_URL + '?TYPENAME=婧㈡祦鍫�',
checked: false
},
@@ -62,7 +62,7 @@
code: 'gyd',
name: '闅旀补姹�',
sname: '闅旀补姹�',
- minZoom: 10,
+ minZoom: 16,
checked: false,
wfs: WFS_URL + '?TYPENAME=闅旀补姹�',
icon: 'sewers/闅旀补姹�.png'
diff --git a/src/conf/layers/LayerPipeLines.js b/src/conf/layers/LayerPipeLines.js
index 9758fce..4686fd6 100644
--- a/src/conf/layers/LayerPipeLines.js
+++ b/src/conf/layers/LayerPipeLines.js
@@ -18,33 +18,44 @@
name: '闆ㄦ按绾�',
sname: '绠＄綉',
checked: false,
- wfs: WFS_URL + '?TYPENAME=绠＄綉',
- minZoom: 10,
- icon: 'sewers/闆ㄦ按绾�.png'
+ // 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=50&outputFormat=application%2Fjson&cql_filter=linenumtype=\'闆ㄦ按绠＄嚎\'',
+ icon: 'sewers/闆ㄦ按绾�.png',
+ color: '#0070ff',
+ minZoom: 13,
+ styles: {
+ COLOR: '#0070ff',
+ FILL_COLOR: '#0070ff'
+ }
},
{
code: 'accidentline',
name: '浜嬫晠姘寸嚎',
sname: '浜嬫晠姘�',
checked: false,
- wfs: WFS_URL + '?TYPENAME=浜嬫晠姘�',
- minZoom: 10
+ minZoom: 13,
+ wfs: WFS_URL + '?TYPENAME=浜嬫晠姘�'
},
{
code: 'oilline',
name: '鍚补姹℃按绾�',
sname: '鍚补姹℃按',
checked: false,
- wfs: WFS_URL + '?TYPENAME=鍚补姹℃按',
- minZoom: 10
+ minZoom: 13,
+ color: '#ffaa00',
+ wfs: 'http://xearth.cn:6240/geoserver/sewer/wfs?typeName=sewer:pipeline&maxFeatures=50&outputFormat=application%2Fjson&cql_filter=mediumtype=\'鍚补姹℃按\'',
+ styles: {
+ COLOR: '#ffaa00',
+ FILL_COLOR: '#ffaa00'
+ }
},
{
code: 'saltline',
name: '鍚洂姹℃按绾�',
sname: '鍚洂姹℃按',
checked: false,
- wfs: WFS_URL + '?TYPENAME=鍚洂姹℃按',
- minZoom: 10
+ minZoom: 13,
+ wfs: WFS_URL + '?TYPENAME=鍚洂姹℃按'
},
{
code: 'alkaliline',
@@ -59,24 +70,37 @@
name: '鐢熸椿姹℃按',
sname: '鐢熸椿姹℃按',
checked: false,
- wfs: WFS_URL + '?TYPENAME=鐢熸椿姹℃按',
- minZoom: 10
+ minZoom: 13,
+ wfs: WFS_URL + '?TYPENAME=鐢熸椿姹℃按'
},
{
code: 'purifyline',
name: '鍑�鍖栨按绾�',
sname: '鍑�鍖栨按',
checked: false,
- wfs: WFS_URL + '?TYPENAME=鍑�鍖栨按',
- minZoom: 10
+ minZoom: 13,
+ wfs: WFS_URL + '?TYPENAME=鍑�鍖栨按'
},
{
code: 'loopline',
name: '寰幆姘寸嚎',
sname: '寰幆姘�',
checked: false,
- wfs: WFS_URL + '?TYPENAME=寰幆姘�',
- minZoom: 10
+ minZoom: 13,
+ wfs: WFS_URL + '?TYPENAME=寰幆姘�'
+ },
+ {
+ code: 'buildline',
+ name: '鐢熶骇姹℃按',
+ sname: '鐢熶骇姹℃按',
+ checked: false,
+ minZoom: 13,
+ color: '#a8a800',
+ wfs: 'http://xearth.cn:6240/geoserver/sewer/wfs?typeName=sewer:pipeline&maxFeatures=50&outputFormat=application%2Fjson&cql_filter=mediumtype=\'鐢熶骇姹℃按\'',
+ styles: {
+ COLOR: '#a8a800',
+ FILL_COLOR: '#a8a800'
+ }
}
]
}
--
Gitblit v1.8.0