From bba9dae2c534caefd1009f3cc7b3889b58566de9 Mon Sep 17 00:00:00 2001
From: 陈泽平 <qibolin02429@126.com>
Date: 星期一, 17 五月 2021 10:31:07 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

---
 src/conf/layers/LayerPipeLines.js |   33 ++++++++++++++++++++++-----------
 1 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/conf/layers/LayerPipeLines.js b/src/conf/layers/LayerPipeLines.js
index d3de90e..ff746f1 100644
--- a/src/conf/layers/LayerPipeLines.js
+++ b/src/conf/layers/LayerPipeLines.js
@@ -17,10 +17,12 @@
       code: 'rainline',
       name: '闆ㄦ按绾�',
       sname: '绠$綉',
-      checked: false,
+      checked: true,
       type: SERVICE_TYPE.WMS,
-      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
+      layerGroup: 'sewer:pipeline_group',
+      typeName: 'sewer:pipeline',
       icon: 'sewers/闆ㄦ按绾�.png',
+      legendImage: '../.././assets/images/map/sewers/闆ㄦ按绾�.png',
       color: '#0070ff',
       minZoom: 13,
       styles: {
@@ -36,7 +38,8 @@
       sname: '浜嬫晠姘�',
       checked: false,
       type: SERVICE_TYPE.WMS,
-      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
+      layerGroup: 'sewer:pipeline_group',
+      typeName: 'sewer:pipeline',
       minZoom: 13,
       filter: 'mediumtype = \'浜嬫晠姘碶'',
       index: 1
@@ -47,7 +50,8 @@
       sname: '鍚补姹℃按',
       checked: false,
       type: SERVICE_TYPE.WMS,
-      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
+      layerGroup: 'sewer:pipeline_group',
+      typeName: 'sewer:pipeline',
       minZoom: 13,
       color: '#ffaa00',
       filter: 'mediumtype = \'鍚补姹℃按\'',
@@ -63,7 +67,8 @@
       sname: '鍚洂姹℃按',
       checked: false,
       type: SERVICE_TYPE.WMS,
-      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
+      layerGroup: 'sewer:pipeline_group',
+      typeName: 'sewer:pipeline',
       minZoom: 13,
       filter: 'mediumtype = \'鍚洂姹℃按\'',
       index: 1
@@ -74,7 +79,8 @@
       sname: '鍚⒈姹℃按',
       checked: false,
       type: SERVICE_TYPE.WMS,
-      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
+      layerGroup: 'sewer:pipeline_group',
+      typeName: 'sewer:pipeline',
       filter: 'mediumtype = \'鍚⒈姹℃按\'',
       minZoom: 10,
       index: 1
@@ -85,7 +91,8 @@
       sname: '鍚~姹℃按',
       checked: false,
       type: SERVICE_TYPE.WMS,
-      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
+      layerGroup: 'sewer:pipeline_group',
+      typeName: 'sewer:pipeline',
       filter: 'mediumtype = \'鍚~姹℃按\'',
       minZoom: 10,
       index: 1
@@ -96,7 +103,8 @@
       sname: '鐢熸椿姹℃按',
       checked: false,
       type: SERVICE_TYPE.WMS,
-      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
+      layerGroup: 'sewer:pipeline_group',
+      typeName: 'sewer:pipeline',
       filter: 'mediumtype = \'鐢熸椿姹℃按\'',
       minZoom: 13,
       index: 1
@@ -107,7 +115,8 @@
       sname: '鍑�鍖栨按',
       checked: false,
       type: SERVICE_TYPE.WMS,
-      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
+      layerGroup: 'sewer:pipeline_group',
+      typeName: 'sewer:pipeline',
       filter: 'mediumtype = \'鍑�鍖栨按\'',
       minZoom: 13,
       index: 1
@@ -117,7 +126,8 @@
       name: '寰幆姘�',
       sname: '寰幆姘�',
       type: SERVICE_TYPE.WMS,
-      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
+      layerGroup: 'sewer:pipeline_group',
+      typeName: 'sewer:pipeline',
       filter: 'mediumtype = \'寰幆姘碶'',
       checked: false,
       minZoom: 13,
@@ -129,7 +139,8 @@
       sname: '鐢熶骇姹℃按',
       checked: false,
       type: SERVICE_TYPE.WMS,
-      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
+      layerGroup: 'sewer:pipeline_group',
+      typeName: 'sewer:pipeline',
       filter: 'mediumtype = \'鐢熶骇姹℃按\'',
       minZoom: 13,
       color: '#a8a800',

--
Gitblit v1.8.0