From 896776bdfb2435ba9ed49996e39f007cc487ffe0 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期二, 11 五月 2021 10:48:04 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

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

diff --git a/src/conf/layers/LayerPipeLines.js b/src/conf/layers/LayerPipeLines.js
index 4686fd6..d3de90e 100644
--- a/src/conf/layers/LayerPipeLines.js
+++ b/src/conf/layers/LayerPipeLines.js
@@ -4,13 +4,13 @@
 import { LayerHbss } from './LayerHbss'
 import { LayerFsss } from './LayerFsss'
 
-import { PIPELINE_WFS } from '../Constants'
-const WFS_URL = PIPELINE_WFS
+import { SERVICE_TYPE } from '../Constants'
 
 export const LayerPipeLines = {
   code: 'sewersPipeLines',
   name: '绠＄嚎',
   checked: false,
+  type: 0,
   childLayer: [LayerFsss, LayerHbss],
   layers: [
     {
@@ -18,89 +18,126 @@
       name: '闆ㄦ按绾�',
       sname: '绠＄綉',
       checked: false,
-      // 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=\'闆ㄦ按绠＄嚎\'',
+      type: SERVICE_TYPE.WMS,
+      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
       icon: 'sewers/闆ㄦ按绾�.png',
       color: '#0070ff',
       minZoom: 13,
       styles: {
         COLOR: '#0070ff',
         FILL_COLOR: '#0070ff'
-      }
+      },
+      filter: 'mediumtype = \'闆ㄦ按\'',
+      index: 1
     },
     {
       code: 'accidentline',
-      name: '浜嬫晠姘寸嚎',
+      name: '浜嬫晠姘�',
       sname: '浜嬫晠姘�',
       checked: false,
+      type: SERVICE_TYPE.WMS,
+      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
       minZoom: 13,
-      wfs: WFS_URL + '?TYPENAME=浜嬫晠姘�'
+      filter: 'mediumtype = \'浜嬫晠姘碶'',
+      index: 1
     },
     {
       code: 'oilline',
-      name: '鍚补姹℃按绾�',
+      name: '鍚补姹℃按',
       sname: '鍚补姹℃按',
       checked: false,
+      type: SERVICE_TYPE.WMS,
+      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
       minZoom: 13,
       color: '#ffaa00',
-      wfs: 'http://xearth.cn:6240/geoserver/sewer/wfs?typeName=sewer:pipeline&maxFeatures=50&outputFormat=application%2Fjson&cql_filter=mediumtype=\'鍚补姹℃按\'',
+      filter: 'mediumtype = \'鍚补姹℃按\'',
       styles: {
         COLOR: '#ffaa00',
         FILL_COLOR: '#ffaa00'
-      }
+      },
+      index: 1
     },
     {
       code: 'saltline',
-      name: '鍚洂姹℃按绾�',
+      name: '鍚洂姹℃按',
       sname: '鍚洂姹℃按',
       checked: false,
+      type: SERVICE_TYPE.WMS,
+      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
       minZoom: 13,
-      wfs: WFS_URL + '?TYPENAME=鍚洂姹℃按'
+      filter: 'mediumtype = \'鍚洂姹℃按\'',
+      index: 1
     },
     {
       code: 'alkaliline',
-      name: '鍚⒈姹℃按绾�',
+      name: '鍚⒈姹℃按',
       sname: '鍚⒈姹℃按',
       checked: false,
-      wfs: WFS_URL + '?TYPENAME=鍚⒈姹℃按',
-      minZoom: 10
+      type: SERVICE_TYPE.WMS,
+      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
+      filter: 'mediumtype = \'鍚⒈姹℃按\'',
+      minZoom: 10,
+      index: 1
+    },
+    {
+      code: 'sulfurline',
+      name: '鍚～姹℃按',
+      sname: '鍚～姹℃按',
+      checked: false,
+      type: SERVICE_TYPE.WMS,
+      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
+      filter: 'mediumtype = \'鍚～姹℃按\'',
+      minZoom: 10,
+      index: 1
     },
     {
       code: 'lifeline',
       name: '鐢熸椿姹℃按',
       sname: '鐢熸椿姹℃按',
       checked: false,
+      type: SERVICE_TYPE.WMS,
+      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
+      filter: 'mediumtype = \'鐢熸椿姹℃按\'',
       minZoom: 13,
-      wfs: WFS_URL + '?TYPENAME=鐢熸椿姹℃按'
+      index: 1
     },
     {
       code: 'purifyline',
-      name: '鍑�鍖栨按绾�',
+      name: '鍑�鍖栨按',
       sname: '鍑�鍖栨按',
       checked: false,
+      type: SERVICE_TYPE.WMS,
+      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
+      filter: 'mediumtype = \'鍑�鍖栨按\'',
       minZoom: 13,
-      wfs: WFS_URL + '?TYPENAME=鍑�鍖栨按'
+      index: 1
     },
     {
       code: 'loopline',
-      name: '寰幆姘寸嚎',
+      name: '寰幆姘�',
       sname: '寰幆姘�',
+      type: SERVICE_TYPE.WMS,
+      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
+      filter: 'mediumtype = \'寰幆姘碶'',
       checked: false,
       minZoom: 13,
-      wfs: WFS_URL + '?TYPENAME=寰幆姘�'
+      index: 1
     },
     {
       code: 'buildline',
       name: '鐢熶骇姹℃按',
       sname: '鐢熶骇姹℃按',
       checked: false,
+      type: SERVICE_TYPE.WMS,
+      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
+      filter: 'mediumtype = \'鐢熶骇姹℃按\'',
       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'
-      }
+      },
+      index: 1
     }
   ]
 }

--
Gitblit v1.8.0