diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json
index 1203b73..fa5246e 100644
--- a/public/static/libs/mapbox/style/HaiMianScreen.json
+++ b/public/static/libs/mapbox/style/HaiMianScreen.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.979,
- 30.886
+ 114.312,
+ 34.802
],
"zoom": 11.451412188068154,
"pitch": 40,
diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json
index 1203b73..fa5246e 100644
--- a/public/static/libs/mapbox/style/HaiMianScreen.json
+++ b/public/static/libs/mapbox/style/HaiMianScreen.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.979,
- 30.886
+ 114.312,
+ 34.802
],
"zoom": 11.451412188068154,
"pitch": 40,
diff --git a/public/static/libs/mapbox/style/floodPipe.json b/public/static/libs/mapbox/style/floodPipe.json
index b3ccada..68e87f1 100644
--- a/public/static/libs/mapbox/style/floodPipe.json
+++ b/public/static/libs/mapbox/style/floodPipe.json
@@ -7,10 +7,10 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
- "zoom": 13.6,
+ "zoom": 12.9,
"pitch": 55,
"style": "/static/libs/mapbox/style/customs/night-style.json"
},
diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json
index 1203b73..fa5246e 100644
--- a/public/static/libs/mapbox/style/HaiMianScreen.json
+++ b/public/static/libs/mapbox/style/HaiMianScreen.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.979,
- 30.886
+ 114.312,
+ 34.802
],
"zoom": 11.451412188068154,
"pitch": 40,
diff --git a/public/static/libs/mapbox/style/floodPipe.json b/public/static/libs/mapbox/style/floodPipe.json
index b3ccada..68e87f1 100644
--- a/public/static/libs/mapbox/style/floodPipe.json
+++ b/public/static/libs/mapbox/style/floodPipe.json
@@ -7,10 +7,10 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
- "zoom": 13.6,
+ "zoom": 12.9,
"pitch": 55,
"style": "/static/libs/mapbox/style/customs/night-style.json"
},
diff --git a/public/static/libs/mapbox/style/lateWarn.json b/public/static/libs/mapbox/style/lateWarn.json
index 94dc0b5..7813b68 100644
--- a/public/static/libs/mapbox/style/lateWarn.json
+++ b/public/static/libs/mapbox/style/lateWarn.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
"zoom": 13.6,
"pitch": 55,
diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json
index 1203b73..fa5246e 100644
--- a/public/static/libs/mapbox/style/HaiMianScreen.json
+++ b/public/static/libs/mapbox/style/HaiMianScreen.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.979,
- 30.886
+ 114.312,
+ 34.802
],
"zoom": 11.451412188068154,
"pitch": 40,
diff --git a/public/static/libs/mapbox/style/floodPipe.json b/public/static/libs/mapbox/style/floodPipe.json
index b3ccada..68e87f1 100644
--- a/public/static/libs/mapbox/style/floodPipe.json
+++ b/public/static/libs/mapbox/style/floodPipe.json
@@ -7,10 +7,10 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
- "zoom": 13.6,
+ "zoom": 12.9,
"pitch": 55,
"style": "/static/libs/mapbox/style/customs/night-style.json"
},
diff --git a/public/static/libs/mapbox/style/lateWarn.json b/public/static/libs/mapbox/style/lateWarn.json
index 94dc0b5..7813b68 100644
--- a/public/static/libs/mapbox/style/lateWarn.json
+++ b/public/static/libs/mapbox/style/lateWarn.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
"zoom": 13.6,
"pitch": 55,
diff --git a/public/static/libs/mapbox/style/overflowBlack.json b/public/static/libs/mapbox/style/overflowBlack.json
index 57573ee..c7c9151 100644
--- a/public/static/libs/mapbox/style/overflowBlack.json
+++ b/public/static/libs/mapbox/style/overflowBlack.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.96947488906668,
- 30.920599374920492
+ 114.312,
+ 34.8022
],
"zoom": 12.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json
index 1203b73..fa5246e 100644
--- a/public/static/libs/mapbox/style/HaiMianScreen.json
+++ b/public/static/libs/mapbox/style/HaiMianScreen.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.979,
- 30.886
+ 114.312,
+ 34.802
],
"zoom": 11.451412188068154,
"pitch": 40,
diff --git a/public/static/libs/mapbox/style/floodPipe.json b/public/static/libs/mapbox/style/floodPipe.json
index b3ccada..68e87f1 100644
--- a/public/static/libs/mapbox/style/floodPipe.json
+++ b/public/static/libs/mapbox/style/floodPipe.json
@@ -7,10 +7,10 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
- "zoom": 13.6,
+ "zoom": 12.9,
"pitch": 55,
"style": "/static/libs/mapbox/style/customs/night-style.json"
},
diff --git a/public/static/libs/mapbox/style/lateWarn.json b/public/static/libs/mapbox/style/lateWarn.json
index 94dc0b5..7813b68 100644
--- a/public/static/libs/mapbox/style/lateWarn.json
+++ b/public/static/libs/mapbox/style/lateWarn.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
"zoom": 13.6,
"pitch": 55,
diff --git a/public/static/libs/mapbox/style/overflowBlack.json b/public/static/libs/mapbox/style/overflowBlack.json
index 57573ee..c7c9151 100644
--- a/public/static/libs/mapbox/style/overflowBlack.json
+++ b/public/static/libs/mapbox/style/overflowBlack.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.96947488906668,
- 30.920599374920492
+ 114.312,
+ 34.8022
],
"zoom": 12.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
diff --git a/public/static/libs/mapbox/style/permeableGroundAreaCX.json b/public/static/libs/mapbox/style/permeableGroundAreaCX.json
index 57573ee..e0bdfb5 100644
--- a/public/static/libs/mapbox/style/permeableGroundAreaCX.json
+++ b/public/static/libs/mapbox/style/permeableGroundAreaCX.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.96947488906668,
- 30.920599374920492
+ 114.312,
+ 34.802
],
"zoom": 12.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json
index 1203b73..fa5246e 100644
--- a/public/static/libs/mapbox/style/HaiMianScreen.json
+++ b/public/static/libs/mapbox/style/HaiMianScreen.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.979,
- 30.886
+ 114.312,
+ 34.802
],
"zoom": 11.451412188068154,
"pitch": 40,
diff --git a/public/static/libs/mapbox/style/floodPipe.json b/public/static/libs/mapbox/style/floodPipe.json
index b3ccada..68e87f1 100644
--- a/public/static/libs/mapbox/style/floodPipe.json
+++ b/public/static/libs/mapbox/style/floodPipe.json
@@ -7,10 +7,10 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
- "zoom": 13.6,
+ "zoom": 12.9,
"pitch": 55,
"style": "/static/libs/mapbox/style/customs/night-style.json"
},
diff --git a/public/static/libs/mapbox/style/lateWarn.json b/public/static/libs/mapbox/style/lateWarn.json
index 94dc0b5..7813b68 100644
--- a/public/static/libs/mapbox/style/lateWarn.json
+++ b/public/static/libs/mapbox/style/lateWarn.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
"zoom": 13.6,
"pitch": 55,
diff --git a/public/static/libs/mapbox/style/overflowBlack.json b/public/static/libs/mapbox/style/overflowBlack.json
index 57573ee..c7c9151 100644
--- a/public/static/libs/mapbox/style/overflowBlack.json
+++ b/public/static/libs/mapbox/style/overflowBlack.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.96947488906668,
- 30.920599374920492
+ 114.312,
+ 34.8022
],
"zoom": 12.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
diff --git a/public/static/libs/mapbox/style/permeableGroundAreaCX.json b/public/static/libs/mapbox/style/permeableGroundAreaCX.json
index 57573ee..e0bdfb5 100644
--- a/public/static/libs/mapbox/style/permeableGroundAreaCX.json
+++ b/public/static/libs/mapbox/style/permeableGroundAreaCX.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.96947488906668,
- 30.920599374920492
+ 114.312,
+ 34.802
],
"zoom": 12.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
diff --git a/public/static/libs/mapbox/style/pipeHealthy.json b/public/static/libs/mapbox/style/pipeHealthy.json
index 2b89593..f85c63a 100644
--- a/public/static/libs/mapbox/style/pipeHealthy.json
+++ b/public/static/libs/mapbox/style/pipeHealthy.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
"zoom": 13.6,
"pitch": 55,
diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json
index 1203b73..fa5246e 100644
--- a/public/static/libs/mapbox/style/HaiMianScreen.json
+++ b/public/static/libs/mapbox/style/HaiMianScreen.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.979,
- 30.886
+ 114.312,
+ 34.802
],
"zoom": 11.451412188068154,
"pitch": 40,
diff --git a/public/static/libs/mapbox/style/floodPipe.json b/public/static/libs/mapbox/style/floodPipe.json
index b3ccada..68e87f1 100644
--- a/public/static/libs/mapbox/style/floodPipe.json
+++ b/public/static/libs/mapbox/style/floodPipe.json
@@ -7,10 +7,10 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
- "zoom": 13.6,
+ "zoom": 12.9,
"pitch": 55,
"style": "/static/libs/mapbox/style/customs/night-style.json"
},
diff --git a/public/static/libs/mapbox/style/lateWarn.json b/public/static/libs/mapbox/style/lateWarn.json
index 94dc0b5..7813b68 100644
--- a/public/static/libs/mapbox/style/lateWarn.json
+++ b/public/static/libs/mapbox/style/lateWarn.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
"zoom": 13.6,
"pitch": 55,
diff --git a/public/static/libs/mapbox/style/overflowBlack.json b/public/static/libs/mapbox/style/overflowBlack.json
index 57573ee..c7c9151 100644
--- a/public/static/libs/mapbox/style/overflowBlack.json
+++ b/public/static/libs/mapbox/style/overflowBlack.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.96947488906668,
- 30.920599374920492
+ 114.312,
+ 34.8022
],
"zoom": 12.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
diff --git a/public/static/libs/mapbox/style/permeableGroundAreaCX.json b/public/static/libs/mapbox/style/permeableGroundAreaCX.json
index 57573ee..e0bdfb5 100644
--- a/public/static/libs/mapbox/style/permeableGroundAreaCX.json
+++ b/public/static/libs/mapbox/style/permeableGroundAreaCX.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.96947488906668,
- 30.920599374920492
+ 114.312,
+ 34.802
],
"zoom": 12.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
diff --git a/public/static/libs/mapbox/style/pipeHealthy.json b/public/static/libs/mapbox/style/pipeHealthy.json
index 2b89593..f85c63a 100644
--- a/public/static/libs/mapbox/style/pipeHealthy.json
+++ b/public/static/libs/mapbox/style/pipeHealthy.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
"zoom": 13.6,
"pitch": 55,
diff --git a/public/static/libs/mapbox/style/planningcontrolCX.json b/public/static/libs/mapbox/style/planningcontrolCX.json
index 34dad91..99829c0 100644
--- a/public/static/libs/mapbox/style/planningcontrolCX.json
+++ b/public/static/libs/mapbox/style/planningcontrolCX.json
@@ -2,9 +2,14 @@
"params": {
"basemap": "https://supermap2.wh-nf.cn:8090/bm",
"mvt": "https://supermap0.wh-nf.cn:8090/vt",
- "sprites": ["/static/libs/mapbox/style/sprite/sprite4"],
+ "sprites": [
+ "/static/libs/mapbox/style/sprite/sprite4"
+ ],
"init": {
- "center": [113.96947488906668, 30.920599374920492],
+ "center": [
+ 114.312,
+ 34.802
+ ],
"zoom": 12.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
},
@@ -17,51 +22,124 @@
]
}
},
- "orders": [["poi_label"], ["place_label_city"], ["road_major_label"], ["place_label_other"], ["point"]],
+ "orders": [
+ [
+ "poi_label"
+ ],
+ [
+ "place_label_city"
+ ],
+ [
+ "road_major_label"
+ ],
+ [
+ "place_label_other"
+ ],
+ [
+ "point"
+ ]
+ ],
"filter": {
"wsLine1": {
- "layerName": ["pipeline_info", "pipeline_point"],
+ "layerName": [
+ "pipeline_info",
+ "pipeline_point"
+ ],
"filter": [
- ["WS", "HS"],
- ["污水点", "合流点"]
+ [
+ "WS",
+ "HS"
+ ],
+ [
+ "污水点",
+ "合流点"
+ ]
]
},
"ysLine1": {
- "layerName": ["pipeline_info", "pipeline_point"],
- "filter": [["YS"], ["雨水点"]]
+ "layerName": [
+ "pipeline_info",
+ "pipeline_point"
+ ],
+ "filter": [
+ [
+ "YS"
+ ],
+ [
+ "雨水点"
+ ]
+ ]
},
"oldCity": {
- "layerName": ["city_boundary"],
- "filter": [["老城区"]],
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "老城区"
+ ]
+ ],
"easeTo": {
- "center": [113.933, 30.926],
+ "center": [
+ 113.933,
+ 30.926
+ ],
"zoom": 13.6,
"pitch": 55
}
},
"southCity": {
- "layerName": ["city_boundary"],
- "filter": [["南城新区"]],
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "南城新区"
+ ]
+ ],
"easeTo": {
- "center": [113.933, 30.886],
+ "center": [
+ 113.933,
+ 30.886
+ ],
"zoom": 13.6,
"pitch": 55
}
},
"newCity": {
- "layerName": ["city_boundary"],
- "filter": [["东城新区"]],
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "东城新区"
+ ]
+ ],
"easeTo": {
- "center": [113.983, 30.896],
+ "center": [
+ 113.983,
+ 30.896
+ ],
"zoom": 13.6,
"pitch": 55
}
},
"allCity": {
- "layerName": ["city_boundary"],
- "filter": [["东城新区", "南城新区", "老城区"]],
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "东城新区",
+ "南城新区",
+ "老城区"
+ ]
+ ],
"easeTo": {
- "center": [113.953, 30.906],
+ "center": [
+ 113.953,
+ 30.906
+ ],
"zoom": 13.6,
"pitch": 55
}
@@ -86,7 +164,11 @@
"id": "hubei_xiaogan_hm_psfq_text",
"key": "hubei_xiaogan_hm_psfq",
"source-layer": "hubei_xiaogan_hm_psfq",
- "filter": ["in", "type", "YS"],
+ "filter": [
+ "in",
+ "type",
+ "YS"
+ ],
"type": "symbol",
"paint": {
"text-color": "#ffffff",
@@ -96,7 +178,9 @@
},
"layout": {
"text-field": "{name}",
- "text-font": ["KlokanTech Noto Sans Regular"],
+ "text-font": [
+ "KlokanTech Noto Sans Regular"
+ ],
"text-size": 18,
"text-line-height": 1.5,
"text-anchor": "top",
@@ -112,7 +196,11 @@
"id": "point",
"key": "point",
"type": "symbol",
- "filter": ["in", "type", ""],
+ "filter": [
+ "in",
+ "type",
+ ""
+ ],
"paint": {
"text-color": "#ffffff",
"text-halo-color": "rgba(0,0,0,1)",
@@ -120,12 +208,25 @@
"text-halo-blur": 1
},
"layout": {
- "icon-image": ["match", ["get", "type"], "success_zishui", "ysj", "error_zishui", "error_zishui", "wsj"],
+ "icon-image": [
+ "match",
+ [
+ "get",
+ "type"
+ ],
+ "success_zishui",
+ "ysj",
+ "error_zishui",
+ "error_zishui",
+ "wsj"
+ ],
"icon-allow-overlap": true,
"text-allow-overlap": true,
"icon-size": 0.7,
"text-field": "{name}",
- "text-font": ["KlokanTech Noto Sans Regular"],
+ "text-font": [
+ "KlokanTech Noto Sans Regular"
+ ],
"text-size": 13,
"text-line-height": 1.5,
"text-anchor": "top",
@@ -138,4 +239,4 @@
"mType": "geojson"
}
]
-}
+}
\ No newline at end of file
diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json
index 1203b73..fa5246e 100644
--- a/public/static/libs/mapbox/style/HaiMianScreen.json
+++ b/public/static/libs/mapbox/style/HaiMianScreen.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.979,
- 30.886
+ 114.312,
+ 34.802
],
"zoom": 11.451412188068154,
"pitch": 40,
diff --git a/public/static/libs/mapbox/style/floodPipe.json b/public/static/libs/mapbox/style/floodPipe.json
index b3ccada..68e87f1 100644
--- a/public/static/libs/mapbox/style/floodPipe.json
+++ b/public/static/libs/mapbox/style/floodPipe.json
@@ -7,10 +7,10 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
- "zoom": 13.6,
+ "zoom": 12.9,
"pitch": 55,
"style": "/static/libs/mapbox/style/customs/night-style.json"
},
diff --git a/public/static/libs/mapbox/style/lateWarn.json b/public/static/libs/mapbox/style/lateWarn.json
index 94dc0b5..7813b68 100644
--- a/public/static/libs/mapbox/style/lateWarn.json
+++ b/public/static/libs/mapbox/style/lateWarn.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
"zoom": 13.6,
"pitch": 55,
diff --git a/public/static/libs/mapbox/style/overflowBlack.json b/public/static/libs/mapbox/style/overflowBlack.json
index 57573ee..c7c9151 100644
--- a/public/static/libs/mapbox/style/overflowBlack.json
+++ b/public/static/libs/mapbox/style/overflowBlack.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.96947488906668,
- 30.920599374920492
+ 114.312,
+ 34.8022
],
"zoom": 12.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
diff --git a/public/static/libs/mapbox/style/permeableGroundAreaCX.json b/public/static/libs/mapbox/style/permeableGroundAreaCX.json
index 57573ee..e0bdfb5 100644
--- a/public/static/libs/mapbox/style/permeableGroundAreaCX.json
+++ b/public/static/libs/mapbox/style/permeableGroundAreaCX.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.96947488906668,
- 30.920599374920492
+ 114.312,
+ 34.802
],
"zoom": 12.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
diff --git a/public/static/libs/mapbox/style/pipeHealthy.json b/public/static/libs/mapbox/style/pipeHealthy.json
index 2b89593..f85c63a 100644
--- a/public/static/libs/mapbox/style/pipeHealthy.json
+++ b/public/static/libs/mapbox/style/pipeHealthy.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
"zoom": 13.6,
"pitch": 55,
diff --git a/public/static/libs/mapbox/style/planningcontrolCX.json b/public/static/libs/mapbox/style/planningcontrolCX.json
index 34dad91..99829c0 100644
--- a/public/static/libs/mapbox/style/planningcontrolCX.json
+++ b/public/static/libs/mapbox/style/planningcontrolCX.json
@@ -2,9 +2,14 @@
"params": {
"basemap": "https://supermap2.wh-nf.cn:8090/bm",
"mvt": "https://supermap0.wh-nf.cn:8090/vt",
- "sprites": ["/static/libs/mapbox/style/sprite/sprite4"],
+ "sprites": [
+ "/static/libs/mapbox/style/sprite/sprite4"
+ ],
"init": {
- "center": [113.96947488906668, 30.920599374920492],
+ "center": [
+ 114.312,
+ 34.802
+ ],
"zoom": 12.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
},
@@ -17,51 +22,124 @@
]
}
},
- "orders": [["poi_label"], ["place_label_city"], ["road_major_label"], ["place_label_other"], ["point"]],
+ "orders": [
+ [
+ "poi_label"
+ ],
+ [
+ "place_label_city"
+ ],
+ [
+ "road_major_label"
+ ],
+ [
+ "place_label_other"
+ ],
+ [
+ "point"
+ ]
+ ],
"filter": {
"wsLine1": {
- "layerName": ["pipeline_info", "pipeline_point"],
+ "layerName": [
+ "pipeline_info",
+ "pipeline_point"
+ ],
"filter": [
- ["WS", "HS"],
- ["污水点", "合流点"]
+ [
+ "WS",
+ "HS"
+ ],
+ [
+ "污水点",
+ "合流点"
+ ]
]
},
"ysLine1": {
- "layerName": ["pipeline_info", "pipeline_point"],
- "filter": [["YS"], ["雨水点"]]
+ "layerName": [
+ "pipeline_info",
+ "pipeline_point"
+ ],
+ "filter": [
+ [
+ "YS"
+ ],
+ [
+ "雨水点"
+ ]
+ ]
},
"oldCity": {
- "layerName": ["city_boundary"],
- "filter": [["老城区"]],
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "老城区"
+ ]
+ ],
"easeTo": {
- "center": [113.933, 30.926],
+ "center": [
+ 113.933,
+ 30.926
+ ],
"zoom": 13.6,
"pitch": 55
}
},
"southCity": {
- "layerName": ["city_boundary"],
- "filter": [["南城新区"]],
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "南城新区"
+ ]
+ ],
"easeTo": {
- "center": [113.933, 30.886],
+ "center": [
+ 113.933,
+ 30.886
+ ],
"zoom": 13.6,
"pitch": 55
}
},
"newCity": {
- "layerName": ["city_boundary"],
- "filter": [["东城新区"]],
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "东城新区"
+ ]
+ ],
"easeTo": {
- "center": [113.983, 30.896],
+ "center": [
+ 113.983,
+ 30.896
+ ],
"zoom": 13.6,
"pitch": 55
}
},
"allCity": {
- "layerName": ["city_boundary"],
- "filter": [["东城新区", "南城新区", "老城区"]],
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "东城新区",
+ "南城新区",
+ "老城区"
+ ]
+ ],
"easeTo": {
- "center": [113.953, 30.906],
+ "center": [
+ 113.953,
+ 30.906
+ ],
"zoom": 13.6,
"pitch": 55
}
@@ -86,7 +164,11 @@
"id": "hubei_xiaogan_hm_psfq_text",
"key": "hubei_xiaogan_hm_psfq",
"source-layer": "hubei_xiaogan_hm_psfq",
- "filter": ["in", "type", "YS"],
+ "filter": [
+ "in",
+ "type",
+ "YS"
+ ],
"type": "symbol",
"paint": {
"text-color": "#ffffff",
@@ -96,7 +178,9 @@
},
"layout": {
"text-field": "{name}",
- "text-font": ["KlokanTech Noto Sans Regular"],
+ "text-font": [
+ "KlokanTech Noto Sans Regular"
+ ],
"text-size": 18,
"text-line-height": 1.5,
"text-anchor": "top",
@@ -112,7 +196,11 @@
"id": "point",
"key": "point",
"type": "symbol",
- "filter": ["in", "type", ""],
+ "filter": [
+ "in",
+ "type",
+ ""
+ ],
"paint": {
"text-color": "#ffffff",
"text-halo-color": "rgba(0,0,0,1)",
@@ -120,12 +208,25 @@
"text-halo-blur": 1
},
"layout": {
- "icon-image": ["match", ["get", "type"], "success_zishui", "ysj", "error_zishui", "error_zishui", "wsj"],
+ "icon-image": [
+ "match",
+ [
+ "get",
+ "type"
+ ],
+ "success_zishui",
+ "ysj",
+ "error_zishui",
+ "error_zishui",
+ "wsj"
+ ],
"icon-allow-overlap": true,
"text-allow-overlap": true,
"icon-size": 0.7,
"text-field": "{name}",
- "text-font": ["KlokanTech Noto Sans Regular"],
+ "text-font": [
+ "KlokanTech Noto Sans Regular"
+ ],
"text-size": 13,
"text-line-height": 1.5,
"text-anchor": "top",
@@ -138,4 +239,4 @@
"mType": "geojson"
}
]
-}
+}
\ No newline at end of file
diff --git a/public/static/libs/mapbox/style/preventionCX.json b/public/static/libs/mapbox/style/preventionCX.json
index 00e5bb3..0267ba0 100644
--- a/public/static/libs/mapbox/style/preventionCX.json
+++ b/public/static/libs/mapbox/style/preventionCX.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.96947488906668,
- 30.920599374920492
+ 114.312,
+ 34.802
],
"zoom": 12.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json
index 1203b73..fa5246e 100644
--- a/public/static/libs/mapbox/style/HaiMianScreen.json
+++ b/public/static/libs/mapbox/style/HaiMianScreen.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.979,
- 30.886
+ 114.312,
+ 34.802
],
"zoom": 11.451412188068154,
"pitch": 40,
diff --git a/public/static/libs/mapbox/style/floodPipe.json b/public/static/libs/mapbox/style/floodPipe.json
index b3ccada..68e87f1 100644
--- a/public/static/libs/mapbox/style/floodPipe.json
+++ b/public/static/libs/mapbox/style/floodPipe.json
@@ -7,10 +7,10 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
- "zoom": 13.6,
+ "zoom": 12.9,
"pitch": 55,
"style": "/static/libs/mapbox/style/customs/night-style.json"
},
diff --git a/public/static/libs/mapbox/style/lateWarn.json b/public/static/libs/mapbox/style/lateWarn.json
index 94dc0b5..7813b68 100644
--- a/public/static/libs/mapbox/style/lateWarn.json
+++ b/public/static/libs/mapbox/style/lateWarn.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
"zoom": 13.6,
"pitch": 55,
diff --git a/public/static/libs/mapbox/style/overflowBlack.json b/public/static/libs/mapbox/style/overflowBlack.json
index 57573ee..c7c9151 100644
--- a/public/static/libs/mapbox/style/overflowBlack.json
+++ b/public/static/libs/mapbox/style/overflowBlack.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.96947488906668,
- 30.920599374920492
+ 114.312,
+ 34.8022
],
"zoom": 12.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
diff --git a/public/static/libs/mapbox/style/permeableGroundAreaCX.json b/public/static/libs/mapbox/style/permeableGroundAreaCX.json
index 57573ee..e0bdfb5 100644
--- a/public/static/libs/mapbox/style/permeableGroundAreaCX.json
+++ b/public/static/libs/mapbox/style/permeableGroundAreaCX.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.96947488906668,
- 30.920599374920492
+ 114.312,
+ 34.802
],
"zoom": 12.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
diff --git a/public/static/libs/mapbox/style/pipeHealthy.json b/public/static/libs/mapbox/style/pipeHealthy.json
index 2b89593..f85c63a 100644
--- a/public/static/libs/mapbox/style/pipeHealthy.json
+++ b/public/static/libs/mapbox/style/pipeHealthy.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
"zoom": 13.6,
"pitch": 55,
diff --git a/public/static/libs/mapbox/style/planningcontrolCX.json b/public/static/libs/mapbox/style/planningcontrolCX.json
index 34dad91..99829c0 100644
--- a/public/static/libs/mapbox/style/planningcontrolCX.json
+++ b/public/static/libs/mapbox/style/planningcontrolCX.json
@@ -2,9 +2,14 @@
"params": {
"basemap": "https://supermap2.wh-nf.cn:8090/bm",
"mvt": "https://supermap0.wh-nf.cn:8090/vt",
- "sprites": ["/static/libs/mapbox/style/sprite/sprite4"],
+ "sprites": [
+ "/static/libs/mapbox/style/sprite/sprite4"
+ ],
"init": {
- "center": [113.96947488906668, 30.920599374920492],
+ "center": [
+ 114.312,
+ 34.802
+ ],
"zoom": 12.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
},
@@ -17,51 +22,124 @@
]
}
},
- "orders": [["poi_label"], ["place_label_city"], ["road_major_label"], ["place_label_other"], ["point"]],
+ "orders": [
+ [
+ "poi_label"
+ ],
+ [
+ "place_label_city"
+ ],
+ [
+ "road_major_label"
+ ],
+ [
+ "place_label_other"
+ ],
+ [
+ "point"
+ ]
+ ],
"filter": {
"wsLine1": {
- "layerName": ["pipeline_info", "pipeline_point"],
+ "layerName": [
+ "pipeline_info",
+ "pipeline_point"
+ ],
"filter": [
- ["WS", "HS"],
- ["污水点", "合流点"]
+ [
+ "WS",
+ "HS"
+ ],
+ [
+ "污水点",
+ "合流点"
+ ]
]
},
"ysLine1": {
- "layerName": ["pipeline_info", "pipeline_point"],
- "filter": [["YS"], ["雨水点"]]
+ "layerName": [
+ "pipeline_info",
+ "pipeline_point"
+ ],
+ "filter": [
+ [
+ "YS"
+ ],
+ [
+ "雨水点"
+ ]
+ ]
},
"oldCity": {
- "layerName": ["city_boundary"],
- "filter": [["老城区"]],
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "老城区"
+ ]
+ ],
"easeTo": {
- "center": [113.933, 30.926],
+ "center": [
+ 113.933,
+ 30.926
+ ],
"zoom": 13.6,
"pitch": 55
}
},
"southCity": {
- "layerName": ["city_boundary"],
- "filter": [["南城新区"]],
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "南城新区"
+ ]
+ ],
"easeTo": {
- "center": [113.933, 30.886],
+ "center": [
+ 113.933,
+ 30.886
+ ],
"zoom": 13.6,
"pitch": 55
}
},
"newCity": {
- "layerName": ["city_boundary"],
- "filter": [["东城新区"]],
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "东城新区"
+ ]
+ ],
"easeTo": {
- "center": [113.983, 30.896],
+ "center": [
+ 113.983,
+ 30.896
+ ],
"zoom": 13.6,
"pitch": 55
}
},
"allCity": {
- "layerName": ["city_boundary"],
- "filter": [["东城新区", "南城新区", "老城区"]],
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "东城新区",
+ "南城新区",
+ "老城区"
+ ]
+ ],
"easeTo": {
- "center": [113.953, 30.906],
+ "center": [
+ 113.953,
+ 30.906
+ ],
"zoom": 13.6,
"pitch": 55
}
@@ -86,7 +164,11 @@
"id": "hubei_xiaogan_hm_psfq_text",
"key": "hubei_xiaogan_hm_psfq",
"source-layer": "hubei_xiaogan_hm_psfq",
- "filter": ["in", "type", "YS"],
+ "filter": [
+ "in",
+ "type",
+ "YS"
+ ],
"type": "symbol",
"paint": {
"text-color": "#ffffff",
@@ -96,7 +178,9 @@
},
"layout": {
"text-field": "{name}",
- "text-font": ["KlokanTech Noto Sans Regular"],
+ "text-font": [
+ "KlokanTech Noto Sans Regular"
+ ],
"text-size": 18,
"text-line-height": 1.5,
"text-anchor": "top",
@@ -112,7 +196,11 @@
"id": "point",
"key": "point",
"type": "symbol",
- "filter": ["in", "type", ""],
+ "filter": [
+ "in",
+ "type",
+ ""
+ ],
"paint": {
"text-color": "#ffffff",
"text-halo-color": "rgba(0,0,0,1)",
@@ -120,12 +208,25 @@
"text-halo-blur": 1
},
"layout": {
- "icon-image": ["match", ["get", "type"], "success_zishui", "ysj", "error_zishui", "error_zishui", "wsj"],
+ "icon-image": [
+ "match",
+ [
+ "get",
+ "type"
+ ],
+ "success_zishui",
+ "ysj",
+ "error_zishui",
+ "error_zishui",
+ "wsj"
+ ],
"icon-allow-overlap": true,
"text-allow-overlap": true,
"icon-size": 0.7,
"text-field": "{name}",
- "text-font": ["KlokanTech Noto Sans Regular"],
+ "text-font": [
+ "KlokanTech Noto Sans Regular"
+ ],
"text-size": 13,
"text-line-height": 1.5,
"text-anchor": "top",
@@ -138,4 +239,4 @@
"mType": "geojson"
}
]
-}
+}
\ No newline at end of file
diff --git a/public/static/libs/mapbox/style/preventionCX.json b/public/static/libs/mapbox/style/preventionCX.json
index 00e5bb3..0267ba0 100644
--- a/public/static/libs/mapbox/style/preventionCX.json
+++ b/public/static/libs/mapbox/style/preventionCX.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.96947488906668,
- 30.920599374920492
+ 114.312,
+ 34.802
],
"zoom": 12.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
diff --git a/public/static/libs/mapbox/style/preventionSFQ.json b/public/static/libs/mapbox/style/preventionSFQ.json
index cc380cb..45e5a5b 100644
--- a/public/static/libs/mapbox/style/preventionSFQ.json
+++ b/public/static/libs/mapbox/style/preventionSFQ.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.953,
- 30.938
+ 114.312,
+ 34.802
],
"zoom": 12.6,
"style": "/static/libs/mapbox/style/customs/night-style.json"
diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json
index 1203b73..fa5246e 100644
--- a/public/static/libs/mapbox/style/HaiMianScreen.json
+++ b/public/static/libs/mapbox/style/HaiMianScreen.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.979,
- 30.886
+ 114.312,
+ 34.802
],
"zoom": 11.451412188068154,
"pitch": 40,
diff --git a/public/static/libs/mapbox/style/floodPipe.json b/public/static/libs/mapbox/style/floodPipe.json
index b3ccada..68e87f1 100644
--- a/public/static/libs/mapbox/style/floodPipe.json
+++ b/public/static/libs/mapbox/style/floodPipe.json
@@ -7,10 +7,10 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
- "zoom": 13.6,
+ "zoom": 12.9,
"pitch": 55,
"style": "/static/libs/mapbox/style/customs/night-style.json"
},
diff --git a/public/static/libs/mapbox/style/lateWarn.json b/public/static/libs/mapbox/style/lateWarn.json
index 94dc0b5..7813b68 100644
--- a/public/static/libs/mapbox/style/lateWarn.json
+++ b/public/static/libs/mapbox/style/lateWarn.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
"zoom": 13.6,
"pitch": 55,
diff --git a/public/static/libs/mapbox/style/overflowBlack.json b/public/static/libs/mapbox/style/overflowBlack.json
index 57573ee..c7c9151 100644
--- a/public/static/libs/mapbox/style/overflowBlack.json
+++ b/public/static/libs/mapbox/style/overflowBlack.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.96947488906668,
- 30.920599374920492
+ 114.312,
+ 34.8022
],
"zoom": 12.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
diff --git a/public/static/libs/mapbox/style/permeableGroundAreaCX.json b/public/static/libs/mapbox/style/permeableGroundAreaCX.json
index 57573ee..e0bdfb5 100644
--- a/public/static/libs/mapbox/style/permeableGroundAreaCX.json
+++ b/public/static/libs/mapbox/style/permeableGroundAreaCX.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.96947488906668,
- 30.920599374920492
+ 114.312,
+ 34.802
],
"zoom": 12.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
diff --git a/public/static/libs/mapbox/style/pipeHealthy.json b/public/static/libs/mapbox/style/pipeHealthy.json
index 2b89593..f85c63a 100644
--- a/public/static/libs/mapbox/style/pipeHealthy.json
+++ b/public/static/libs/mapbox/style/pipeHealthy.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
"zoom": 13.6,
"pitch": 55,
diff --git a/public/static/libs/mapbox/style/planningcontrolCX.json b/public/static/libs/mapbox/style/planningcontrolCX.json
index 34dad91..99829c0 100644
--- a/public/static/libs/mapbox/style/planningcontrolCX.json
+++ b/public/static/libs/mapbox/style/planningcontrolCX.json
@@ -2,9 +2,14 @@
"params": {
"basemap": "https://supermap2.wh-nf.cn:8090/bm",
"mvt": "https://supermap0.wh-nf.cn:8090/vt",
- "sprites": ["/static/libs/mapbox/style/sprite/sprite4"],
+ "sprites": [
+ "/static/libs/mapbox/style/sprite/sprite4"
+ ],
"init": {
- "center": [113.96947488906668, 30.920599374920492],
+ "center": [
+ 114.312,
+ 34.802
+ ],
"zoom": 12.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
},
@@ -17,51 +22,124 @@
]
}
},
- "orders": [["poi_label"], ["place_label_city"], ["road_major_label"], ["place_label_other"], ["point"]],
+ "orders": [
+ [
+ "poi_label"
+ ],
+ [
+ "place_label_city"
+ ],
+ [
+ "road_major_label"
+ ],
+ [
+ "place_label_other"
+ ],
+ [
+ "point"
+ ]
+ ],
"filter": {
"wsLine1": {
- "layerName": ["pipeline_info", "pipeline_point"],
+ "layerName": [
+ "pipeline_info",
+ "pipeline_point"
+ ],
"filter": [
- ["WS", "HS"],
- ["污水点", "合流点"]
+ [
+ "WS",
+ "HS"
+ ],
+ [
+ "污水点",
+ "合流点"
+ ]
]
},
"ysLine1": {
- "layerName": ["pipeline_info", "pipeline_point"],
- "filter": [["YS"], ["雨水点"]]
+ "layerName": [
+ "pipeline_info",
+ "pipeline_point"
+ ],
+ "filter": [
+ [
+ "YS"
+ ],
+ [
+ "雨水点"
+ ]
+ ]
},
"oldCity": {
- "layerName": ["city_boundary"],
- "filter": [["老城区"]],
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "老城区"
+ ]
+ ],
"easeTo": {
- "center": [113.933, 30.926],
+ "center": [
+ 113.933,
+ 30.926
+ ],
"zoom": 13.6,
"pitch": 55
}
},
"southCity": {
- "layerName": ["city_boundary"],
- "filter": [["南城新区"]],
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "南城新区"
+ ]
+ ],
"easeTo": {
- "center": [113.933, 30.886],
+ "center": [
+ 113.933,
+ 30.886
+ ],
"zoom": 13.6,
"pitch": 55
}
},
"newCity": {
- "layerName": ["city_boundary"],
- "filter": [["东城新区"]],
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "东城新区"
+ ]
+ ],
"easeTo": {
- "center": [113.983, 30.896],
+ "center": [
+ 113.983,
+ 30.896
+ ],
"zoom": 13.6,
"pitch": 55
}
},
"allCity": {
- "layerName": ["city_boundary"],
- "filter": [["东城新区", "南城新区", "老城区"]],
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "东城新区",
+ "南城新区",
+ "老城区"
+ ]
+ ],
"easeTo": {
- "center": [113.953, 30.906],
+ "center": [
+ 113.953,
+ 30.906
+ ],
"zoom": 13.6,
"pitch": 55
}
@@ -86,7 +164,11 @@
"id": "hubei_xiaogan_hm_psfq_text",
"key": "hubei_xiaogan_hm_psfq",
"source-layer": "hubei_xiaogan_hm_psfq",
- "filter": ["in", "type", "YS"],
+ "filter": [
+ "in",
+ "type",
+ "YS"
+ ],
"type": "symbol",
"paint": {
"text-color": "#ffffff",
@@ -96,7 +178,9 @@
},
"layout": {
"text-field": "{name}",
- "text-font": ["KlokanTech Noto Sans Regular"],
+ "text-font": [
+ "KlokanTech Noto Sans Regular"
+ ],
"text-size": 18,
"text-line-height": 1.5,
"text-anchor": "top",
@@ -112,7 +196,11 @@
"id": "point",
"key": "point",
"type": "symbol",
- "filter": ["in", "type", ""],
+ "filter": [
+ "in",
+ "type",
+ ""
+ ],
"paint": {
"text-color": "#ffffff",
"text-halo-color": "rgba(0,0,0,1)",
@@ -120,12 +208,25 @@
"text-halo-blur": 1
},
"layout": {
- "icon-image": ["match", ["get", "type"], "success_zishui", "ysj", "error_zishui", "error_zishui", "wsj"],
+ "icon-image": [
+ "match",
+ [
+ "get",
+ "type"
+ ],
+ "success_zishui",
+ "ysj",
+ "error_zishui",
+ "error_zishui",
+ "wsj"
+ ],
"icon-allow-overlap": true,
"text-allow-overlap": true,
"icon-size": 0.7,
"text-field": "{name}",
- "text-font": ["KlokanTech Noto Sans Regular"],
+ "text-font": [
+ "KlokanTech Noto Sans Regular"
+ ],
"text-size": 13,
"text-line-height": 1.5,
"text-anchor": "top",
@@ -138,4 +239,4 @@
"mType": "geojson"
}
]
-}
+}
\ No newline at end of file
diff --git a/public/static/libs/mapbox/style/preventionCX.json b/public/static/libs/mapbox/style/preventionCX.json
index 00e5bb3..0267ba0 100644
--- a/public/static/libs/mapbox/style/preventionCX.json
+++ b/public/static/libs/mapbox/style/preventionCX.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.96947488906668,
- 30.920599374920492
+ 114.312,
+ 34.802
],
"zoom": 12.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
diff --git a/public/static/libs/mapbox/style/preventionSFQ.json b/public/static/libs/mapbox/style/preventionSFQ.json
index cc380cb..45e5a5b 100644
--- a/public/static/libs/mapbox/style/preventionSFQ.json
+++ b/public/static/libs/mapbox/style/preventionSFQ.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.953,
- 30.938
+ 114.312,
+ 34.802
],
"zoom": 12.6,
"style": "/static/libs/mapbox/style/customs/night-style.json"
diff --git a/public/static/libs/mapbox/style/projectIndex.json b/public/static/libs/mapbox/style/projectIndex.json
index 98041c4..7159947 100644
--- a/public/static/libs/mapbox/style/projectIndex.json
+++ b/public/static/libs/mapbox/style/projectIndex.json
@@ -7,10 +7,10 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
- "zoom": 11.6,
+ "zoom": 12.9,
"pitch": 55,
"style": "/static/libs/mapbox/style/customs/night-style.json"
},
diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json
index 1203b73..fa5246e 100644
--- a/public/static/libs/mapbox/style/HaiMianScreen.json
+++ b/public/static/libs/mapbox/style/HaiMianScreen.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.979,
- 30.886
+ 114.312,
+ 34.802
],
"zoom": 11.451412188068154,
"pitch": 40,
diff --git a/public/static/libs/mapbox/style/floodPipe.json b/public/static/libs/mapbox/style/floodPipe.json
index b3ccada..68e87f1 100644
--- a/public/static/libs/mapbox/style/floodPipe.json
+++ b/public/static/libs/mapbox/style/floodPipe.json
@@ -7,10 +7,10 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
- "zoom": 13.6,
+ "zoom": 12.9,
"pitch": 55,
"style": "/static/libs/mapbox/style/customs/night-style.json"
},
diff --git a/public/static/libs/mapbox/style/lateWarn.json b/public/static/libs/mapbox/style/lateWarn.json
index 94dc0b5..7813b68 100644
--- a/public/static/libs/mapbox/style/lateWarn.json
+++ b/public/static/libs/mapbox/style/lateWarn.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
"zoom": 13.6,
"pitch": 55,
diff --git a/public/static/libs/mapbox/style/overflowBlack.json b/public/static/libs/mapbox/style/overflowBlack.json
index 57573ee..c7c9151 100644
--- a/public/static/libs/mapbox/style/overflowBlack.json
+++ b/public/static/libs/mapbox/style/overflowBlack.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.96947488906668,
- 30.920599374920492
+ 114.312,
+ 34.8022
],
"zoom": 12.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
diff --git a/public/static/libs/mapbox/style/permeableGroundAreaCX.json b/public/static/libs/mapbox/style/permeableGroundAreaCX.json
index 57573ee..e0bdfb5 100644
--- a/public/static/libs/mapbox/style/permeableGroundAreaCX.json
+++ b/public/static/libs/mapbox/style/permeableGroundAreaCX.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.96947488906668,
- 30.920599374920492
+ 114.312,
+ 34.802
],
"zoom": 12.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
diff --git a/public/static/libs/mapbox/style/pipeHealthy.json b/public/static/libs/mapbox/style/pipeHealthy.json
index 2b89593..f85c63a 100644
--- a/public/static/libs/mapbox/style/pipeHealthy.json
+++ b/public/static/libs/mapbox/style/pipeHealthy.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
"zoom": 13.6,
"pitch": 55,
diff --git a/public/static/libs/mapbox/style/planningcontrolCX.json b/public/static/libs/mapbox/style/planningcontrolCX.json
index 34dad91..99829c0 100644
--- a/public/static/libs/mapbox/style/planningcontrolCX.json
+++ b/public/static/libs/mapbox/style/planningcontrolCX.json
@@ -2,9 +2,14 @@
"params": {
"basemap": "https://supermap2.wh-nf.cn:8090/bm",
"mvt": "https://supermap0.wh-nf.cn:8090/vt",
- "sprites": ["/static/libs/mapbox/style/sprite/sprite4"],
+ "sprites": [
+ "/static/libs/mapbox/style/sprite/sprite4"
+ ],
"init": {
- "center": [113.96947488906668, 30.920599374920492],
+ "center": [
+ 114.312,
+ 34.802
+ ],
"zoom": 12.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
},
@@ -17,51 +22,124 @@
]
}
},
- "orders": [["poi_label"], ["place_label_city"], ["road_major_label"], ["place_label_other"], ["point"]],
+ "orders": [
+ [
+ "poi_label"
+ ],
+ [
+ "place_label_city"
+ ],
+ [
+ "road_major_label"
+ ],
+ [
+ "place_label_other"
+ ],
+ [
+ "point"
+ ]
+ ],
"filter": {
"wsLine1": {
- "layerName": ["pipeline_info", "pipeline_point"],
+ "layerName": [
+ "pipeline_info",
+ "pipeline_point"
+ ],
"filter": [
- ["WS", "HS"],
- ["污水点", "合流点"]
+ [
+ "WS",
+ "HS"
+ ],
+ [
+ "污水点",
+ "合流点"
+ ]
]
},
"ysLine1": {
- "layerName": ["pipeline_info", "pipeline_point"],
- "filter": [["YS"], ["雨水点"]]
+ "layerName": [
+ "pipeline_info",
+ "pipeline_point"
+ ],
+ "filter": [
+ [
+ "YS"
+ ],
+ [
+ "雨水点"
+ ]
+ ]
},
"oldCity": {
- "layerName": ["city_boundary"],
- "filter": [["老城区"]],
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "老城区"
+ ]
+ ],
"easeTo": {
- "center": [113.933, 30.926],
+ "center": [
+ 113.933,
+ 30.926
+ ],
"zoom": 13.6,
"pitch": 55
}
},
"southCity": {
- "layerName": ["city_boundary"],
- "filter": [["南城新区"]],
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "南城新区"
+ ]
+ ],
"easeTo": {
- "center": [113.933, 30.886],
+ "center": [
+ 113.933,
+ 30.886
+ ],
"zoom": 13.6,
"pitch": 55
}
},
"newCity": {
- "layerName": ["city_boundary"],
- "filter": [["东城新区"]],
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "东城新区"
+ ]
+ ],
"easeTo": {
- "center": [113.983, 30.896],
+ "center": [
+ 113.983,
+ 30.896
+ ],
"zoom": 13.6,
"pitch": 55
}
},
"allCity": {
- "layerName": ["city_boundary"],
- "filter": [["东城新区", "南城新区", "老城区"]],
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "东城新区",
+ "南城新区",
+ "老城区"
+ ]
+ ],
"easeTo": {
- "center": [113.953, 30.906],
+ "center": [
+ 113.953,
+ 30.906
+ ],
"zoom": 13.6,
"pitch": 55
}
@@ -86,7 +164,11 @@
"id": "hubei_xiaogan_hm_psfq_text",
"key": "hubei_xiaogan_hm_psfq",
"source-layer": "hubei_xiaogan_hm_psfq",
- "filter": ["in", "type", "YS"],
+ "filter": [
+ "in",
+ "type",
+ "YS"
+ ],
"type": "symbol",
"paint": {
"text-color": "#ffffff",
@@ -96,7 +178,9 @@
},
"layout": {
"text-field": "{name}",
- "text-font": ["KlokanTech Noto Sans Regular"],
+ "text-font": [
+ "KlokanTech Noto Sans Regular"
+ ],
"text-size": 18,
"text-line-height": 1.5,
"text-anchor": "top",
@@ -112,7 +196,11 @@
"id": "point",
"key": "point",
"type": "symbol",
- "filter": ["in", "type", ""],
+ "filter": [
+ "in",
+ "type",
+ ""
+ ],
"paint": {
"text-color": "#ffffff",
"text-halo-color": "rgba(0,0,0,1)",
@@ -120,12 +208,25 @@
"text-halo-blur": 1
},
"layout": {
- "icon-image": ["match", ["get", "type"], "success_zishui", "ysj", "error_zishui", "error_zishui", "wsj"],
+ "icon-image": [
+ "match",
+ [
+ "get",
+ "type"
+ ],
+ "success_zishui",
+ "ysj",
+ "error_zishui",
+ "error_zishui",
+ "wsj"
+ ],
"icon-allow-overlap": true,
"text-allow-overlap": true,
"icon-size": 0.7,
"text-field": "{name}",
- "text-font": ["KlokanTech Noto Sans Regular"],
+ "text-font": [
+ "KlokanTech Noto Sans Regular"
+ ],
"text-size": 13,
"text-line-height": 1.5,
"text-anchor": "top",
@@ -138,4 +239,4 @@
"mType": "geojson"
}
]
-}
+}
\ No newline at end of file
diff --git a/public/static/libs/mapbox/style/preventionCX.json b/public/static/libs/mapbox/style/preventionCX.json
index 00e5bb3..0267ba0 100644
--- a/public/static/libs/mapbox/style/preventionCX.json
+++ b/public/static/libs/mapbox/style/preventionCX.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.96947488906668,
- 30.920599374920492
+ 114.312,
+ 34.802
],
"zoom": 12.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
diff --git a/public/static/libs/mapbox/style/preventionSFQ.json b/public/static/libs/mapbox/style/preventionSFQ.json
index cc380cb..45e5a5b 100644
--- a/public/static/libs/mapbox/style/preventionSFQ.json
+++ b/public/static/libs/mapbox/style/preventionSFQ.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.953,
- 30.938
+ 114.312,
+ 34.802
],
"zoom": 12.6,
"style": "/static/libs/mapbox/style/customs/night-style.json"
diff --git a/public/static/libs/mapbox/style/projectIndex.json b/public/static/libs/mapbox/style/projectIndex.json
index 98041c4..7159947 100644
--- a/public/static/libs/mapbox/style/projectIndex.json
+++ b/public/static/libs/mapbox/style/projectIndex.json
@@ -7,10 +7,10 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
- "zoom": 11.6,
+ "zoom": 12.9,
"pitch": 55,
"style": "/static/libs/mapbox/style/customs/night-style.json"
},
diff --git a/public/static/libs/mapbox/style/rainwaterResourceCX.json b/public/static/libs/mapbox/style/rainwaterResourceCX.json
index aa6ffb2..e233218 100644
--- a/public/static/libs/mapbox/style/rainwaterResourceCX.json
+++ b/public/static/libs/mapbox/style/rainwaterResourceCX.json
@@ -2,9 +2,14 @@
"params": {
"basemap": "https://supermap2.wh-nf.cn:8090/bm",
"mvt": "https://supermap0.wh-nf.cn:8090/vt",
- "sprites": ["/static/libs/mapbox/style/sprite/sprite4"],
+ "sprites": [
+ "/static/libs/mapbox/style/sprite/sprite4"
+ ],
"init": {
- "center": [113.94947488906668, 30.920599374920492],
+ "center": [
+ 114.312,
+ 34.802
+ ],
"zoom": 11.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
},
@@ -17,35 +22,127 @@
]
}
},
- "orders": [["poi_label"], ["place_label_city"], ["road_major_label"], ["place_label_other"], ["point"]],
+ "orders": [
+ [
+ "poi_label"
+ ],
+ [
+ "place_label_city"
+ ],
+ [
+ "road_major_label"
+ ],
+ [
+ "place_label_other"
+ ],
+ [
+ "point"
+ ]
+ ],
"filter": {
"wsLine1": {
- "layerName": ["pipeline_info", "pipeline_point"],
+ "layerName": [
+ "pipeline_info",
+ "pipeline_point"
+ ],
"filter": [
- ["WS", "HS"],
- ["污水点", "合流点"]
+ [
+ "WS",
+ "HS"
+ ],
+ [
+ "污水点",
+ "合流点"
+ ]
]
},
- "ysLine1": { "layerName": ["pipeline_info", "pipeline_point"], "filter": [["YS"], ["雨水点"]] },
+ "ysLine1": {
+ "layerName": [
+ "pipeline_info",
+ "pipeline_point"
+ ],
+ "filter": [
+ [
+ "YS"
+ ],
+ [
+ "雨水点"
+ ]
+ ]
+ },
"oldCity": {
- "layerName": ["city_boundary"],
- "filter": [["老城区"]],
- "easeTo": { "center": [113.933, 30.926], "zoom": 13.6, "pitch": 55 }
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "老城区"
+ ]
+ ],
+ "easeTo": {
+ "center": [
+ 113.933,
+ 30.926
+ ],
+ "zoom": 13.6,
+ "pitch": 55
+ }
},
"southCity": {
- "layerName": ["city_boundary"],
- "filter": [["南城新区"]],
- "easeTo": { "center": [113.933, 30.886], "zoom": 13.6, "pitch": 55 }
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "南城新区"
+ ]
+ ],
+ "easeTo": {
+ "center": [
+ 113.933,
+ 30.886
+ ],
+ "zoom": 13.6,
+ "pitch": 55
+ }
},
"newCity": {
- "layerName": ["city_boundary"],
- "filter": [["东城新区"]],
- "easeTo": { "center": [113.983, 30.896], "zoom": 13.6, "pitch": 55 }
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "东城新区"
+ ]
+ ],
+ "easeTo": {
+ "center": [
+ 113.983,
+ 30.896
+ ],
+ "zoom": 13.6,
+ "pitch": 55
+ }
},
"allCity": {
- "layerName": ["city_boundary"],
- "filter": [["东城新区", "南城新区", "老城区"]],
- "easeTo": { "center": [113.953, 30.906], "zoom": 13.6, "pitch": 55 }
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "东城新区",
+ "南城新区",
+ "老城区"
+ ]
+ ],
+ "easeTo": {
+ "center": [
+ 113.953,
+ 30.906
+ ],
+ "zoom": 13.6,
+ "pitch": 55
+ }
}
},
"mapbox": [
@@ -67,10 +164,17 @@
"id": "hubei_xiaogan_hm_psfq",
"key": "hubei_xiaogan_hm_psfq",
"source-layer": "hubei_xiaogan_hm_psfq",
- "filter": ["in", "type", "YS"],
+ "filter": [
+ "in",
+ "type",
+ "YS"
+ ],
"type": "fill",
"paint": {
- "fill-color": ["get", "fill_color"],
+ "fill-color": [
+ "get",
+ "fill_color"
+ ],
"fill-outline-color": "#ffffff"
},
"layout": {},
@@ -83,7 +187,11 @@
"id": "hubei_xiaogan_hm_psfq_text",
"key": "hubei_xiaogan_hm_psfq",
"source-layer": "hubei_xiaogan_hm_psfq",
- "filter": ["in", "type", "YS"],
+ "filter": [
+ "in",
+ "type",
+ "YS"
+ ],
"type": "symbol",
"paint": {
"text-color": "#ffffff",
@@ -93,7 +201,9 @@
},
"layout": {
"text-field": "{name}",
- "text-font": ["KlokanTech Noto Sans Regular"],
+ "text-font": [
+ "KlokanTech Noto Sans Regular"
+ ],
"text-size": 18,
"text-line-height": 1.5,
"text-anchor": "top",
@@ -106,4 +216,4 @@
"columns": "type,name"
}
]
-}
+}
\ No newline at end of file
diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json
index 1203b73..fa5246e 100644
--- a/public/static/libs/mapbox/style/HaiMianScreen.json
+++ b/public/static/libs/mapbox/style/HaiMianScreen.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.979,
- 30.886
+ 114.312,
+ 34.802
],
"zoom": 11.451412188068154,
"pitch": 40,
diff --git a/public/static/libs/mapbox/style/floodPipe.json b/public/static/libs/mapbox/style/floodPipe.json
index b3ccada..68e87f1 100644
--- a/public/static/libs/mapbox/style/floodPipe.json
+++ b/public/static/libs/mapbox/style/floodPipe.json
@@ -7,10 +7,10 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
- "zoom": 13.6,
+ "zoom": 12.9,
"pitch": 55,
"style": "/static/libs/mapbox/style/customs/night-style.json"
},
diff --git a/public/static/libs/mapbox/style/lateWarn.json b/public/static/libs/mapbox/style/lateWarn.json
index 94dc0b5..7813b68 100644
--- a/public/static/libs/mapbox/style/lateWarn.json
+++ b/public/static/libs/mapbox/style/lateWarn.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
"zoom": 13.6,
"pitch": 55,
diff --git a/public/static/libs/mapbox/style/overflowBlack.json b/public/static/libs/mapbox/style/overflowBlack.json
index 57573ee..c7c9151 100644
--- a/public/static/libs/mapbox/style/overflowBlack.json
+++ b/public/static/libs/mapbox/style/overflowBlack.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.96947488906668,
- 30.920599374920492
+ 114.312,
+ 34.8022
],
"zoom": 12.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
diff --git a/public/static/libs/mapbox/style/permeableGroundAreaCX.json b/public/static/libs/mapbox/style/permeableGroundAreaCX.json
index 57573ee..e0bdfb5 100644
--- a/public/static/libs/mapbox/style/permeableGroundAreaCX.json
+++ b/public/static/libs/mapbox/style/permeableGroundAreaCX.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.96947488906668,
- 30.920599374920492
+ 114.312,
+ 34.802
],
"zoom": 12.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
diff --git a/public/static/libs/mapbox/style/pipeHealthy.json b/public/static/libs/mapbox/style/pipeHealthy.json
index 2b89593..f85c63a 100644
--- a/public/static/libs/mapbox/style/pipeHealthy.json
+++ b/public/static/libs/mapbox/style/pipeHealthy.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
"zoom": 13.6,
"pitch": 55,
diff --git a/public/static/libs/mapbox/style/planningcontrolCX.json b/public/static/libs/mapbox/style/planningcontrolCX.json
index 34dad91..99829c0 100644
--- a/public/static/libs/mapbox/style/planningcontrolCX.json
+++ b/public/static/libs/mapbox/style/planningcontrolCX.json
@@ -2,9 +2,14 @@
"params": {
"basemap": "https://supermap2.wh-nf.cn:8090/bm",
"mvt": "https://supermap0.wh-nf.cn:8090/vt",
- "sprites": ["/static/libs/mapbox/style/sprite/sprite4"],
+ "sprites": [
+ "/static/libs/mapbox/style/sprite/sprite4"
+ ],
"init": {
- "center": [113.96947488906668, 30.920599374920492],
+ "center": [
+ 114.312,
+ 34.802
+ ],
"zoom": 12.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
},
@@ -17,51 +22,124 @@
]
}
},
- "orders": [["poi_label"], ["place_label_city"], ["road_major_label"], ["place_label_other"], ["point"]],
+ "orders": [
+ [
+ "poi_label"
+ ],
+ [
+ "place_label_city"
+ ],
+ [
+ "road_major_label"
+ ],
+ [
+ "place_label_other"
+ ],
+ [
+ "point"
+ ]
+ ],
"filter": {
"wsLine1": {
- "layerName": ["pipeline_info", "pipeline_point"],
+ "layerName": [
+ "pipeline_info",
+ "pipeline_point"
+ ],
"filter": [
- ["WS", "HS"],
- ["污水点", "合流点"]
+ [
+ "WS",
+ "HS"
+ ],
+ [
+ "污水点",
+ "合流点"
+ ]
]
},
"ysLine1": {
- "layerName": ["pipeline_info", "pipeline_point"],
- "filter": [["YS"], ["雨水点"]]
+ "layerName": [
+ "pipeline_info",
+ "pipeline_point"
+ ],
+ "filter": [
+ [
+ "YS"
+ ],
+ [
+ "雨水点"
+ ]
+ ]
},
"oldCity": {
- "layerName": ["city_boundary"],
- "filter": [["老城区"]],
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "老城区"
+ ]
+ ],
"easeTo": {
- "center": [113.933, 30.926],
+ "center": [
+ 113.933,
+ 30.926
+ ],
"zoom": 13.6,
"pitch": 55
}
},
"southCity": {
- "layerName": ["city_boundary"],
- "filter": [["南城新区"]],
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "南城新区"
+ ]
+ ],
"easeTo": {
- "center": [113.933, 30.886],
+ "center": [
+ 113.933,
+ 30.886
+ ],
"zoom": 13.6,
"pitch": 55
}
},
"newCity": {
- "layerName": ["city_boundary"],
- "filter": [["东城新区"]],
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "东城新区"
+ ]
+ ],
"easeTo": {
- "center": [113.983, 30.896],
+ "center": [
+ 113.983,
+ 30.896
+ ],
"zoom": 13.6,
"pitch": 55
}
},
"allCity": {
- "layerName": ["city_boundary"],
- "filter": [["东城新区", "南城新区", "老城区"]],
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "东城新区",
+ "南城新区",
+ "老城区"
+ ]
+ ],
"easeTo": {
- "center": [113.953, 30.906],
+ "center": [
+ 113.953,
+ 30.906
+ ],
"zoom": 13.6,
"pitch": 55
}
@@ -86,7 +164,11 @@
"id": "hubei_xiaogan_hm_psfq_text",
"key": "hubei_xiaogan_hm_psfq",
"source-layer": "hubei_xiaogan_hm_psfq",
- "filter": ["in", "type", "YS"],
+ "filter": [
+ "in",
+ "type",
+ "YS"
+ ],
"type": "symbol",
"paint": {
"text-color": "#ffffff",
@@ -96,7 +178,9 @@
},
"layout": {
"text-field": "{name}",
- "text-font": ["KlokanTech Noto Sans Regular"],
+ "text-font": [
+ "KlokanTech Noto Sans Regular"
+ ],
"text-size": 18,
"text-line-height": 1.5,
"text-anchor": "top",
@@ -112,7 +196,11 @@
"id": "point",
"key": "point",
"type": "symbol",
- "filter": ["in", "type", ""],
+ "filter": [
+ "in",
+ "type",
+ ""
+ ],
"paint": {
"text-color": "#ffffff",
"text-halo-color": "rgba(0,0,0,1)",
@@ -120,12 +208,25 @@
"text-halo-blur": 1
},
"layout": {
- "icon-image": ["match", ["get", "type"], "success_zishui", "ysj", "error_zishui", "error_zishui", "wsj"],
+ "icon-image": [
+ "match",
+ [
+ "get",
+ "type"
+ ],
+ "success_zishui",
+ "ysj",
+ "error_zishui",
+ "error_zishui",
+ "wsj"
+ ],
"icon-allow-overlap": true,
"text-allow-overlap": true,
"icon-size": 0.7,
"text-field": "{name}",
- "text-font": ["KlokanTech Noto Sans Regular"],
+ "text-font": [
+ "KlokanTech Noto Sans Regular"
+ ],
"text-size": 13,
"text-line-height": 1.5,
"text-anchor": "top",
@@ -138,4 +239,4 @@
"mType": "geojson"
}
]
-}
+}
\ No newline at end of file
diff --git a/public/static/libs/mapbox/style/preventionCX.json b/public/static/libs/mapbox/style/preventionCX.json
index 00e5bb3..0267ba0 100644
--- a/public/static/libs/mapbox/style/preventionCX.json
+++ b/public/static/libs/mapbox/style/preventionCX.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.96947488906668,
- 30.920599374920492
+ 114.312,
+ 34.802
],
"zoom": 12.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
diff --git a/public/static/libs/mapbox/style/preventionSFQ.json b/public/static/libs/mapbox/style/preventionSFQ.json
index cc380cb..45e5a5b 100644
--- a/public/static/libs/mapbox/style/preventionSFQ.json
+++ b/public/static/libs/mapbox/style/preventionSFQ.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.953,
- 30.938
+ 114.312,
+ 34.802
],
"zoom": 12.6,
"style": "/static/libs/mapbox/style/customs/night-style.json"
diff --git a/public/static/libs/mapbox/style/projectIndex.json b/public/static/libs/mapbox/style/projectIndex.json
index 98041c4..7159947 100644
--- a/public/static/libs/mapbox/style/projectIndex.json
+++ b/public/static/libs/mapbox/style/projectIndex.json
@@ -7,10 +7,10 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
- "zoom": 11.6,
+ "zoom": 12.9,
"pitch": 55,
"style": "/static/libs/mapbox/style/customs/night-style.json"
},
diff --git a/public/static/libs/mapbox/style/rainwaterResourceCX.json b/public/static/libs/mapbox/style/rainwaterResourceCX.json
index aa6ffb2..e233218 100644
--- a/public/static/libs/mapbox/style/rainwaterResourceCX.json
+++ b/public/static/libs/mapbox/style/rainwaterResourceCX.json
@@ -2,9 +2,14 @@
"params": {
"basemap": "https://supermap2.wh-nf.cn:8090/bm",
"mvt": "https://supermap0.wh-nf.cn:8090/vt",
- "sprites": ["/static/libs/mapbox/style/sprite/sprite4"],
+ "sprites": [
+ "/static/libs/mapbox/style/sprite/sprite4"
+ ],
"init": {
- "center": [113.94947488906668, 30.920599374920492],
+ "center": [
+ 114.312,
+ 34.802
+ ],
"zoom": 11.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
},
@@ -17,35 +22,127 @@
]
}
},
- "orders": [["poi_label"], ["place_label_city"], ["road_major_label"], ["place_label_other"], ["point"]],
+ "orders": [
+ [
+ "poi_label"
+ ],
+ [
+ "place_label_city"
+ ],
+ [
+ "road_major_label"
+ ],
+ [
+ "place_label_other"
+ ],
+ [
+ "point"
+ ]
+ ],
"filter": {
"wsLine1": {
- "layerName": ["pipeline_info", "pipeline_point"],
+ "layerName": [
+ "pipeline_info",
+ "pipeline_point"
+ ],
"filter": [
- ["WS", "HS"],
- ["污水点", "合流点"]
+ [
+ "WS",
+ "HS"
+ ],
+ [
+ "污水点",
+ "合流点"
+ ]
]
},
- "ysLine1": { "layerName": ["pipeline_info", "pipeline_point"], "filter": [["YS"], ["雨水点"]] },
+ "ysLine1": {
+ "layerName": [
+ "pipeline_info",
+ "pipeline_point"
+ ],
+ "filter": [
+ [
+ "YS"
+ ],
+ [
+ "雨水点"
+ ]
+ ]
+ },
"oldCity": {
- "layerName": ["city_boundary"],
- "filter": [["老城区"]],
- "easeTo": { "center": [113.933, 30.926], "zoom": 13.6, "pitch": 55 }
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "老城区"
+ ]
+ ],
+ "easeTo": {
+ "center": [
+ 113.933,
+ 30.926
+ ],
+ "zoom": 13.6,
+ "pitch": 55
+ }
},
"southCity": {
- "layerName": ["city_boundary"],
- "filter": [["南城新区"]],
- "easeTo": { "center": [113.933, 30.886], "zoom": 13.6, "pitch": 55 }
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "南城新区"
+ ]
+ ],
+ "easeTo": {
+ "center": [
+ 113.933,
+ 30.886
+ ],
+ "zoom": 13.6,
+ "pitch": 55
+ }
},
"newCity": {
- "layerName": ["city_boundary"],
- "filter": [["东城新区"]],
- "easeTo": { "center": [113.983, 30.896], "zoom": 13.6, "pitch": 55 }
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "东城新区"
+ ]
+ ],
+ "easeTo": {
+ "center": [
+ 113.983,
+ 30.896
+ ],
+ "zoom": 13.6,
+ "pitch": 55
+ }
},
"allCity": {
- "layerName": ["city_boundary"],
- "filter": [["东城新区", "南城新区", "老城区"]],
- "easeTo": { "center": [113.953, 30.906], "zoom": 13.6, "pitch": 55 }
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "东城新区",
+ "南城新区",
+ "老城区"
+ ]
+ ],
+ "easeTo": {
+ "center": [
+ 113.953,
+ 30.906
+ ],
+ "zoom": 13.6,
+ "pitch": 55
+ }
}
},
"mapbox": [
@@ -67,10 +164,17 @@
"id": "hubei_xiaogan_hm_psfq",
"key": "hubei_xiaogan_hm_psfq",
"source-layer": "hubei_xiaogan_hm_psfq",
- "filter": ["in", "type", "YS"],
+ "filter": [
+ "in",
+ "type",
+ "YS"
+ ],
"type": "fill",
"paint": {
- "fill-color": ["get", "fill_color"],
+ "fill-color": [
+ "get",
+ "fill_color"
+ ],
"fill-outline-color": "#ffffff"
},
"layout": {},
@@ -83,7 +187,11 @@
"id": "hubei_xiaogan_hm_psfq_text",
"key": "hubei_xiaogan_hm_psfq",
"source-layer": "hubei_xiaogan_hm_psfq",
- "filter": ["in", "type", "YS"],
+ "filter": [
+ "in",
+ "type",
+ "YS"
+ ],
"type": "symbol",
"paint": {
"text-color": "#ffffff",
@@ -93,7 +201,9 @@
},
"layout": {
"text-field": "{name}",
- "text-font": ["KlokanTech Noto Sans Regular"],
+ "text-font": [
+ "KlokanTech Noto Sans Regular"
+ ],
"text-size": 18,
"text-line-height": 1.5,
"text-anchor": "top",
@@ -106,4 +216,4 @@
"columns": "type,name"
}
]
-}
+}
\ No newline at end of file
diff --git a/public/static/libs/mapbox/style/syntheticDataMain.json b/public/static/libs/mapbox/style/syntheticDataMain.json
index d057767..af0eb84 100644
--- a/public/static/libs/mapbox/style/syntheticDataMain.json
+++ b/public/static/libs/mapbox/style/syntheticDataMain.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
"zoom": 13.6,
"pitch": 55,
diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json
index 1203b73..fa5246e 100644
--- a/public/static/libs/mapbox/style/HaiMianScreen.json
+++ b/public/static/libs/mapbox/style/HaiMianScreen.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.979,
- 30.886
+ 114.312,
+ 34.802
],
"zoom": 11.451412188068154,
"pitch": 40,
diff --git a/public/static/libs/mapbox/style/floodPipe.json b/public/static/libs/mapbox/style/floodPipe.json
index b3ccada..68e87f1 100644
--- a/public/static/libs/mapbox/style/floodPipe.json
+++ b/public/static/libs/mapbox/style/floodPipe.json
@@ -7,10 +7,10 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
- "zoom": 13.6,
+ "zoom": 12.9,
"pitch": 55,
"style": "/static/libs/mapbox/style/customs/night-style.json"
},
diff --git a/public/static/libs/mapbox/style/lateWarn.json b/public/static/libs/mapbox/style/lateWarn.json
index 94dc0b5..7813b68 100644
--- a/public/static/libs/mapbox/style/lateWarn.json
+++ b/public/static/libs/mapbox/style/lateWarn.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
"zoom": 13.6,
"pitch": 55,
diff --git a/public/static/libs/mapbox/style/overflowBlack.json b/public/static/libs/mapbox/style/overflowBlack.json
index 57573ee..c7c9151 100644
--- a/public/static/libs/mapbox/style/overflowBlack.json
+++ b/public/static/libs/mapbox/style/overflowBlack.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.96947488906668,
- 30.920599374920492
+ 114.312,
+ 34.8022
],
"zoom": 12.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
diff --git a/public/static/libs/mapbox/style/permeableGroundAreaCX.json b/public/static/libs/mapbox/style/permeableGroundAreaCX.json
index 57573ee..e0bdfb5 100644
--- a/public/static/libs/mapbox/style/permeableGroundAreaCX.json
+++ b/public/static/libs/mapbox/style/permeableGroundAreaCX.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.96947488906668,
- 30.920599374920492
+ 114.312,
+ 34.802
],
"zoom": 12.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
diff --git a/public/static/libs/mapbox/style/pipeHealthy.json b/public/static/libs/mapbox/style/pipeHealthy.json
index 2b89593..f85c63a 100644
--- a/public/static/libs/mapbox/style/pipeHealthy.json
+++ b/public/static/libs/mapbox/style/pipeHealthy.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
"zoom": 13.6,
"pitch": 55,
diff --git a/public/static/libs/mapbox/style/planningcontrolCX.json b/public/static/libs/mapbox/style/planningcontrolCX.json
index 34dad91..99829c0 100644
--- a/public/static/libs/mapbox/style/planningcontrolCX.json
+++ b/public/static/libs/mapbox/style/planningcontrolCX.json
@@ -2,9 +2,14 @@
"params": {
"basemap": "https://supermap2.wh-nf.cn:8090/bm",
"mvt": "https://supermap0.wh-nf.cn:8090/vt",
- "sprites": ["/static/libs/mapbox/style/sprite/sprite4"],
+ "sprites": [
+ "/static/libs/mapbox/style/sprite/sprite4"
+ ],
"init": {
- "center": [113.96947488906668, 30.920599374920492],
+ "center": [
+ 114.312,
+ 34.802
+ ],
"zoom": 12.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
},
@@ -17,51 +22,124 @@
]
}
},
- "orders": [["poi_label"], ["place_label_city"], ["road_major_label"], ["place_label_other"], ["point"]],
+ "orders": [
+ [
+ "poi_label"
+ ],
+ [
+ "place_label_city"
+ ],
+ [
+ "road_major_label"
+ ],
+ [
+ "place_label_other"
+ ],
+ [
+ "point"
+ ]
+ ],
"filter": {
"wsLine1": {
- "layerName": ["pipeline_info", "pipeline_point"],
+ "layerName": [
+ "pipeline_info",
+ "pipeline_point"
+ ],
"filter": [
- ["WS", "HS"],
- ["污水点", "合流点"]
+ [
+ "WS",
+ "HS"
+ ],
+ [
+ "污水点",
+ "合流点"
+ ]
]
},
"ysLine1": {
- "layerName": ["pipeline_info", "pipeline_point"],
- "filter": [["YS"], ["雨水点"]]
+ "layerName": [
+ "pipeline_info",
+ "pipeline_point"
+ ],
+ "filter": [
+ [
+ "YS"
+ ],
+ [
+ "雨水点"
+ ]
+ ]
},
"oldCity": {
- "layerName": ["city_boundary"],
- "filter": [["老城区"]],
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "老城区"
+ ]
+ ],
"easeTo": {
- "center": [113.933, 30.926],
+ "center": [
+ 113.933,
+ 30.926
+ ],
"zoom": 13.6,
"pitch": 55
}
},
"southCity": {
- "layerName": ["city_boundary"],
- "filter": [["南城新区"]],
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "南城新区"
+ ]
+ ],
"easeTo": {
- "center": [113.933, 30.886],
+ "center": [
+ 113.933,
+ 30.886
+ ],
"zoom": 13.6,
"pitch": 55
}
},
"newCity": {
- "layerName": ["city_boundary"],
- "filter": [["东城新区"]],
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "东城新区"
+ ]
+ ],
"easeTo": {
- "center": [113.983, 30.896],
+ "center": [
+ 113.983,
+ 30.896
+ ],
"zoom": 13.6,
"pitch": 55
}
},
"allCity": {
- "layerName": ["city_boundary"],
- "filter": [["东城新区", "南城新区", "老城区"]],
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "东城新区",
+ "南城新区",
+ "老城区"
+ ]
+ ],
"easeTo": {
- "center": [113.953, 30.906],
+ "center": [
+ 113.953,
+ 30.906
+ ],
"zoom": 13.6,
"pitch": 55
}
@@ -86,7 +164,11 @@
"id": "hubei_xiaogan_hm_psfq_text",
"key": "hubei_xiaogan_hm_psfq",
"source-layer": "hubei_xiaogan_hm_psfq",
- "filter": ["in", "type", "YS"],
+ "filter": [
+ "in",
+ "type",
+ "YS"
+ ],
"type": "symbol",
"paint": {
"text-color": "#ffffff",
@@ -96,7 +178,9 @@
},
"layout": {
"text-field": "{name}",
- "text-font": ["KlokanTech Noto Sans Regular"],
+ "text-font": [
+ "KlokanTech Noto Sans Regular"
+ ],
"text-size": 18,
"text-line-height": 1.5,
"text-anchor": "top",
@@ -112,7 +196,11 @@
"id": "point",
"key": "point",
"type": "symbol",
- "filter": ["in", "type", ""],
+ "filter": [
+ "in",
+ "type",
+ ""
+ ],
"paint": {
"text-color": "#ffffff",
"text-halo-color": "rgba(0,0,0,1)",
@@ -120,12 +208,25 @@
"text-halo-blur": 1
},
"layout": {
- "icon-image": ["match", ["get", "type"], "success_zishui", "ysj", "error_zishui", "error_zishui", "wsj"],
+ "icon-image": [
+ "match",
+ [
+ "get",
+ "type"
+ ],
+ "success_zishui",
+ "ysj",
+ "error_zishui",
+ "error_zishui",
+ "wsj"
+ ],
"icon-allow-overlap": true,
"text-allow-overlap": true,
"icon-size": 0.7,
"text-field": "{name}",
- "text-font": ["KlokanTech Noto Sans Regular"],
+ "text-font": [
+ "KlokanTech Noto Sans Regular"
+ ],
"text-size": 13,
"text-line-height": 1.5,
"text-anchor": "top",
@@ -138,4 +239,4 @@
"mType": "geojson"
}
]
-}
+}
\ No newline at end of file
diff --git a/public/static/libs/mapbox/style/preventionCX.json b/public/static/libs/mapbox/style/preventionCX.json
index 00e5bb3..0267ba0 100644
--- a/public/static/libs/mapbox/style/preventionCX.json
+++ b/public/static/libs/mapbox/style/preventionCX.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.96947488906668,
- 30.920599374920492
+ 114.312,
+ 34.802
],
"zoom": 12.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
diff --git a/public/static/libs/mapbox/style/preventionSFQ.json b/public/static/libs/mapbox/style/preventionSFQ.json
index cc380cb..45e5a5b 100644
--- a/public/static/libs/mapbox/style/preventionSFQ.json
+++ b/public/static/libs/mapbox/style/preventionSFQ.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.953,
- 30.938
+ 114.312,
+ 34.802
],
"zoom": 12.6,
"style": "/static/libs/mapbox/style/customs/night-style.json"
diff --git a/public/static/libs/mapbox/style/projectIndex.json b/public/static/libs/mapbox/style/projectIndex.json
index 98041c4..7159947 100644
--- a/public/static/libs/mapbox/style/projectIndex.json
+++ b/public/static/libs/mapbox/style/projectIndex.json
@@ -7,10 +7,10 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
- "zoom": 11.6,
+ "zoom": 12.9,
"pitch": 55,
"style": "/static/libs/mapbox/style/customs/night-style.json"
},
diff --git a/public/static/libs/mapbox/style/rainwaterResourceCX.json b/public/static/libs/mapbox/style/rainwaterResourceCX.json
index aa6ffb2..e233218 100644
--- a/public/static/libs/mapbox/style/rainwaterResourceCX.json
+++ b/public/static/libs/mapbox/style/rainwaterResourceCX.json
@@ -2,9 +2,14 @@
"params": {
"basemap": "https://supermap2.wh-nf.cn:8090/bm",
"mvt": "https://supermap0.wh-nf.cn:8090/vt",
- "sprites": ["/static/libs/mapbox/style/sprite/sprite4"],
+ "sprites": [
+ "/static/libs/mapbox/style/sprite/sprite4"
+ ],
"init": {
- "center": [113.94947488906668, 30.920599374920492],
+ "center": [
+ 114.312,
+ 34.802
+ ],
"zoom": 11.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
},
@@ -17,35 +22,127 @@
]
}
},
- "orders": [["poi_label"], ["place_label_city"], ["road_major_label"], ["place_label_other"], ["point"]],
+ "orders": [
+ [
+ "poi_label"
+ ],
+ [
+ "place_label_city"
+ ],
+ [
+ "road_major_label"
+ ],
+ [
+ "place_label_other"
+ ],
+ [
+ "point"
+ ]
+ ],
"filter": {
"wsLine1": {
- "layerName": ["pipeline_info", "pipeline_point"],
+ "layerName": [
+ "pipeline_info",
+ "pipeline_point"
+ ],
"filter": [
- ["WS", "HS"],
- ["污水点", "合流点"]
+ [
+ "WS",
+ "HS"
+ ],
+ [
+ "污水点",
+ "合流点"
+ ]
]
},
- "ysLine1": { "layerName": ["pipeline_info", "pipeline_point"], "filter": [["YS"], ["雨水点"]] },
+ "ysLine1": {
+ "layerName": [
+ "pipeline_info",
+ "pipeline_point"
+ ],
+ "filter": [
+ [
+ "YS"
+ ],
+ [
+ "雨水点"
+ ]
+ ]
+ },
"oldCity": {
- "layerName": ["city_boundary"],
- "filter": [["老城区"]],
- "easeTo": { "center": [113.933, 30.926], "zoom": 13.6, "pitch": 55 }
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "老城区"
+ ]
+ ],
+ "easeTo": {
+ "center": [
+ 113.933,
+ 30.926
+ ],
+ "zoom": 13.6,
+ "pitch": 55
+ }
},
"southCity": {
- "layerName": ["city_boundary"],
- "filter": [["南城新区"]],
- "easeTo": { "center": [113.933, 30.886], "zoom": 13.6, "pitch": 55 }
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "南城新区"
+ ]
+ ],
+ "easeTo": {
+ "center": [
+ 113.933,
+ 30.886
+ ],
+ "zoom": 13.6,
+ "pitch": 55
+ }
},
"newCity": {
- "layerName": ["city_boundary"],
- "filter": [["东城新区"]],
- "easeTo": { "center": [113.983, 30.896], "zoom": 13.6, "pitch": 55 }
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "东城新区"
+ ]
+ ],
+ "easeTo": {
+ "center": [
+ 113.983,
+ 30.896
+ ],
+ "zoom": 13.6,
+ "pitch": 55
+ }
},
"allCity": {
- "layerName": ["city_boundary"],
- "filter": [["东城新区", "南城新区", "老城区"]],
- "easeTo": { "center": [113.953, 30.906], "zoom": 13.6, "pitch": 55 }
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "东城新区",
+ "南城新区",
+ "老城区"
+ ]
+ ],
+ "easeTo": {
+ "center": [
+ 113.953,
+ 30.906
+ ],
+ "zoom": 13.6,
+ "pitch": 55
+ }
}
},
"mapbox": [
@@ -67,10 +164,17 @@
"id": "hubei_xiaogan_hm_psfq",
"key": "hubei_xiaogan_hm_psfq",
"source-layer": "hubei_xiaogan_hm_psfq",
- "filter": ["in", "type", "YS"],
+ "filter": [
+ "in",
+ "type",
+ "YS"
+ ],
"type": "fill",
"paint": {
- "fill-color": ["get", "fill_color"],
+ "fill-color": [
+ "get",
+ "fill_color"
+ ],
"fill-outline-color": "#ffffff"
},
"layout": {},
@@ -83,7 +187,11 @@
"id": "hubei_xiaogan_hm_psfq_text",
"key": "hubei_xiaogan_hm_psfq",
"source-layer": "hubei_xiaogan_hm_psfq",
- "filter": ["in", "type", "YS"],
+ "filter": [
+ "in",
+ "type",
+ "YS"
+ ],
"type": "symbol",
"paint": {
"text-color": "#ffffff",
@@ -93,7 +201,9 @@
},
"layout": {
"text-field": "{name}",
- "text-font": ["KlokanTech Noto Sans Regular"],
+ "text-font": [
+ "KlokanTech Noto Sans Regular"
+ ],
"text-size": 18,
"text-line-height": 1.5,
"text-anchor": "top",
@@ -106,4 +216,4 @@
"columns": "type,name"
}
]
-}
+}
\ No newline at end of file
diff --git a/public/static/libs/mapbox/style/syntheticDataMain.json b/public/static/libs/mapbox/style/syntheticDataMain.json
index d057767..af0eb84 100644
--- a/public/static/libs/mapbox/style/syntheticDataMain.json
+++ b/public/static/libs/mapbox/style/syntheticDataMain.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
"zoom": 13.6,
"pitch": 55,
diff --git a/src/assets/geojson/kaifeng/wsBengZhan.json b/src/assets/geojson/kaifeng/wsBengZhan.json
new file mode 100644
index 0000000..2e97290
--- /dev/null
+++ b/src/assets/geojson/kaifeng/wsBengZhan.json
@@ -0,0 +1 @@
+{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.3255447671694,34.806710446051198]},"properties":{"FID":0,"Layer":"合流","Name":"梁苑泵站","lon":114.325544767,"lat":34.806710446099999,"ysNumber":4,"wsNumber":2,"yswater":"0.09","wswater":"0.33"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.32448809744353,34.784734578145695]},"properties":{"FID":1,"Layer":"合流","Name":"大庆路泵站","lon":114.324488097,"lat":34.7847345781,"ysNumber":4,"wsNumber":2,"yswater":"24.8","wswater":"2.2"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.33701943055284,34.785062722447599]},"properties":{"FID":2,"Layer":"合流","Name":"包公湖泵站","lon":114.337019431,"lat":34.785062722399999,"ysNumber":4,"wsNumber":5,"yswater":"4.6","wswater":"0.8"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.35903886734209,34.783602760045085]},"properties":{"FID":3,"Layer":"合流","Name":"济梁闸泵站","lon":114.359038867,"lat":34.783602760000001,"ysNumber":4,"wsNumber":4,"yswater":"8.8","wswater":"1"}},{"type":"Feature","id":4,"geometry":{"type":"Point","coordinates":[114.3601067154365,34.780835170269889]},"properties":{"FID":4,"Layer":"合流","Name":"滨河路泵站","lon":114.360106715,"lat":34.780835170300001,"ysNumber":4,"wsNumber":5,"yswater":"5.1","wswater":"1.78"}},{"type":"Feature","id":5,"geometry":{"type":"Point","coordinates":[114.362711626443,34.795353758228423]},"properties":{"FID":5,"Layer":"合流","Name":"汴京泵站","lon":114.36271162600001,"lat":34.795353758200001,"ysNumber":4,"wsNumber":5,"yswater":"4.6","wswater":"0.58"}},{"type":"Feature","id":6,"geometry":{"type":"Point","coordinates":[114.36465150766639,34.806856989440767]},"properties":{"FID":6,"Layer":"合流","Name":"河大泵站","lon":114.36465150799999,"lat":34.806856989400003,"ysNumber":4,"wsNumber":2,"yswater":"3.37","wswater":"0.222"}},{"type":"Feature","id":7,"geometry":{"type":"Point","coordinates":[114.36935541545591,34.818365440199393]},"properties":{"FID":7,"Layer":"合流","Name":"仁和屯泵站","lon":114.369355415,"lat":34.818365440199997,"ysNumber":6,"wsNumber":4,"yswater":"14","wswater":"0.6"}},{"type":"Feature","id":8,"geometry":{"type":"Point","coordinates":[114.30813516896551,34.82411213358872]},"properties":{"FID":8,"Layer":"污水","Name":"夷山大街泵站","lon":114.308135169,"lat":34.824112133600003,"ysNumber":0,"wsNumber":3,"yswater":"0","wswater":"0.444"}},{"type":"Feature","id":9,"geometry":{"type":"Point","coordinates":[114.23126391857754,34.78000558314681]},"properties":{"FID":9,"Layer":"合流","Name":"新区四号泵站","lon":114.231263919,"lat":34.780005583099999,"ysNumber":4,"wsNumber":4,"yswater":"0.91","wswater":"0.58"}},{"type":"Feature","id":10,"geometry":{"type":"Point","coordinates":[114.26817088733971,34.808138775495564]},"properties":{"FID":10,"Layer":"合流","Name":"新区八号泵站","lon":114.268170887,"lat":34.808138775499998,"ysNumber":6,"wsNumber":4,"yswater":"16.5","wswater":"0.5"}},{"type":"Feature","id":11,"geometry":{"type":"Point","coordinates":[114.28943005499177,34.778579599595595]},"properties":{"FID":11,"Layer":"污水","Name":"新区老四号泵站","lon":114.289430055,"lat":34.7785795996,"ysNumber":0,"wsNumber":4,"yswater":"0","wswater":"0.25"}},{"type":"Feature","id":12,"geometry":{"type":"Point","coordinates":[114.28636257830526,34.813287063289344]},"properties":{"FID":12,"Layer":"污水","Name":"新区老二号泵站","lon":114.28636257799999,"lat":34.813287063300002,"ysNumber":0,"wsNumber":3,"yswater":"0","wswater":"1.45"}},{"type":"Feature","id":13,"geometry":{"type":"Point","coordinates":[114.3759437951563,34.769425099984282]},"properties":{"FID":13,"Layer":"污水","Name":"陵园路一体化泵站","lon":114.375943795,"lat":34.769425099999999,"ysNumber":0,"wsNumber":3,"yswater":"0","wswater":"0.7"}},{"type":"Feature","id":14,"geometry":{"type":"Point","coordinates":[114.3148602108178,34.785140412434828]},"properties":{"FID":14,"Layer":"污水","Name":"中途泵站","lon":114.314860211,"lat":34.785140412399997,"ysNumber":0,"wsNumber":7,"yswater":"0","wswater":"1.37"}},{"type":"Feature","id":15,"geometry":{"type":"Point","coordinates":[114.30788271631789,34.77759931964551]},"properties":{"FID":15,"Layer":"污水","Name":"魏都路泵站","lon":114.30788271599999,"lat":34.7775993196,"ysNumber":0,"wsNumber":4,"yswater":"0","wswater":"0.85"}},{"type":"Feature","id":16,"geometry":{"type":"Point","coordinates":[114.37597110760814,34.783202090692711]},"properties":{"FID":16,"Layer":"污水","Name":"重工路泵站","lon":114.375971108,"lat":34.783202090700001,"ysNumber":0,"wsNumber":4,"yswater":"0","wswater":"1.21"}},{"type":"Feature","id":17,"geometry":{"type":"Point","coordinates":[114.36645342601892,34.798051629735284]},"properties":{"FID":17,"Layer":"合流","Name":"海洋馆泵站","lon":114.36645342600001,"lat":34.798051629699998,"ysNumber":6,"wsNumber":5,"yswater":"2.9","wswater":"0.58"}},{"type":"Feature","id":18,"geometry":{"type":"Point","coordinates":[114.36416291216987,34.773162429921896]},"properties":{"FID":18,"Layer":"合流","Name":"铁北街泵站","lon":114.364162912,"lat":34.773162429899998,"ysNumber":5,"wsNumber":2,"yswater":"1.3","wswater":"0.111"}}]}
\ No newline at end of file
diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json
index 1203b73..fa5246e 100644
--- a/public/static/libs/mapbox/style/HaiMianScreen.json
+++ b/public/static/libs/mapbox/style/HaiMianScreen.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.979,
- 30.886
+ 114.312,
+ 34.802
],
"zoom": 11.451412188068154,
"pitch": 40,
diff --git a/public/static/libs/mapbox/style/floodPipe.json b/public/static/libs/mapbox/style/floodPipe.json
index b3ccada..68e87f1 100644
--- a/public/static/libs/mapbox/style/floodPipe.json
+++ b/public/static/libs/mapbox/style/floodPipe.json
@@ -7,10 +7,10 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
- "zoom": 13.6,
+ "zoom": 12.9,
"pitch": 55,
"style": "/static/libs/mapbox/style/customs/night-style.json"
},
diff --git a/public/static/libs/mapbox/style/lateWarn.json b/public/static/libs/mapbox/style/lateWarn.json
index 94dc0b5..7813b68 100644
--- a/public/static/libs/mapbox/style/lateWarn.json
+++ b/public/static/libs/mapbox/style/lateWarn.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
"zoom": 13.6,
"pitch": 55,
diff --git a/public/static/libs/mapbox/style/overflowBlack.json b/public/static/libs/mapbox/style/overflowBlack.json
index 57573ee..c7c9151 100644
--- a/public/static/libs/mapbox/style/overflowBlack.json
+++ b/public/static/libs/mapbox/style/overflowBlack.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.96947488906668,
- 30.920599374920492
+ 114.312,
+ 34.8022
],
"zoom": 12.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
diff --git a/public/static/libs/mapbox/style/permeableGroundAreaCX.json b/public/static/libs/mapbox/style/permeableGroundAreaCX.json
index 57573ee..e0bdfb5 100644
--- a/public/static/libs/mapbox/style/permeableGroundAreaCX.json
+++ b/public/static/libs/mapbox/style/permeableGroundAreaCX.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.96947488906668,
- 30.920599374920492
+ 114.312,
+ 34.802
],
"zoom": 12.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
diff --git a/public/static/libs/mapbox/style/pipeHealthy.json b/public/static/libs/mapbox/style/pipeHealthy.json
index 2b89593..f85c63a 100644
--- a/public/static/libs/mapbox/style/pipeHealthy.json
+++ b/public/static/libs/mapbox/style/pipeHealthy.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
"zoom": 13.6,
"pitch": 55,
diff --git a/public/static/libs/mapbox/style/planningcontrolCX.json b/public/static/libs/mapbox/style/planningcontrolCX.json
index 34dad91..99829c0 100644
--- a/public/static/libs/mapbox/style/planningcontrolCX.json
+++ b/public/static/libs/mapbox/style/planningcontrolCX.json
@@ -2,9 +2,14 @@
"params": {
"basemap": "https://supermap2.wh-nf.cn:8090/bm",
"mvt": "https://supermap0.wh-nf.cn:8090/vt",
- "sprites": ["/static/libs/mapbox/style/sprite/sprite4"],
+ "sprites": [
+ "/static/libs/mapbox/style/sprite/sprite4"
+ ],
"init": {
- "center": [113.96947488906668, 30.920599374920492],
+ "center": [
+ 114.312,
+ 34.802
+ ],
"zoom": 12.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
},
@@ -17,51 +22,124 @@
]
}
},
- "orders": [["poi_label"], ["place_label_city"], ["road_major_label"], ["place_label_other"], ["point"]],
+ "orders": [
+ [
+ "poi_label"
+ ],
+ [
+ "place_label_city"
+ ],
+ [
+ "road_major_label"
+ ],
+ [
+ "place_label_other"
+ ],
+ [
+ "point"
+ ]
+ ],
"filter": {
"wsLine1": {
- "layerName": ["pipeline_info", "pipeline_point"],
+ "layerName": [
+ "pipeline_info",
+ "pipeline_point"
+ ],
"filter": [
- ["WS", "HS"],
- ["污水点", "合流点"]
+ [
+ "WS",
+ "HS"
+ ],
+ [
+ "污水点",
+ "合流点"
+ ]
]
},
"ysLine1": {
- "layerName": ["pipeline_info", "pipeline_point"],
- "filter": [["YS"], ["雨水点"]]
+ "layerName": [
+ "pipeline_info",
+ "pipeline_point"
+ ],
+ "filter": [
+ [
+ "YS"
+ ],
+ [
+ "雨水点"
+ ]
+ ]
},
"oldCity": {
- "layerName": ["city_boundary"],
- "filter": [["老城区"]],
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "老城区"
+ ]
+ ],
"easeTo": {
- "center": [113.933, 30.926],
+ "center": [
+ 113.933,
+ 30.926
+ ],
"zoom": 13.6,
"pitch": 55
}
},
"southCity": {
- "layerName": ["city_boundary"],
- "filter": [["南城新区"]],
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "南城新区"
+ ]
+ ],
"easeTo": {
- "center": [113.933, 30.886],
+ "center": [
+ 113.933,
+ 30.886
+ ],
"zoom": 13.6,
"pitch": 55
}
},
"newCity": {
- "layerName": ["city_boundary"],
- "filter": [["东城新区"]],
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "东城新区"
+ ]
+ ],
"easeTo": {
- "center": [113.983, 30.896],
+ "center": [
+ 113.983,
+ 30.896
+ ],
"zoom": 13.6,
"pitch": 55
}
},
"allCity": {
- "layerName": ["city_boundary"],
- "filter": [["东城新区", "南城新区", "老城区"]],
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "东城新区",
+ "南城新区",
+ "老城区"
+ ]
+ ],
"easeTo": {
- "center": [113.953, 30.906],
+ "center": [
+ 113.953,
+ 30.906
+ ],
"zoom": 13.6,
"pitch": 55
}
@@ -86,7 +164,11 @@
"id": "hubei_xiaogan_hm_psfq_text",
"key": "hubei_xiaogan_hm_psfq",
"source-layer": "hubei_xiaogan_hm_psfq",
- "filter": ["in", "type", "YS"],
+ "filter": [
+ "in",
+ "type",
+ "YS"
+ ],
"type": "symbol",
"paint": {
"text-color": "#ffffff",
@@ -96,7 +178,9 @@
},
"layout": {
"text-field": "{name}",
- "text-font": ["KlokanTech Noto Sans Regular"],
+ "text-font": [
+ "KlokanTech Noto Sans Regular"
+ ],
"text-size": 18,
"text-line-height": 1.5,
"text-anchor": "top",
@@ -112,7 +196,11 @@
"id": "point",
"key": "point",
"type": "symbol",
- "filter": ["in", "type", ""],
+ "filter": [
+ "in",
+ "type",
+ ""
+ ],
"paint": {
"text-color": "#ffffff",
"text-halo-color": "rgba(0,0,0,1)",
@@ -120,12 +208,25 @@
"text-halo-blur": 1
},
"layout": {
- "icon-image": ["match", ["get", "type"], "success_zishui", "ysj", "error_zishui", "error_zishui", "wsj"],
+ "icon-image": [
+ "match",
+ [
+ "get",
+ "type"
+ ],
+ "success_zishui",
+ "ysj",
+ "error_zishui",
+ "error_zishui",
+ "wsj"
+ ],
"icon-allow-overlap": true,
"text-allow-overlap": true,
"icon-size": 0.7,
"text-field": "{name}",
- "text-font": ["KlokanTech Noto Sans Regular"],
+ "text-font": [
+ "KlokanTech Noto Sans Regular"
+ ],
"text-size": 13,
"text-line-height": 1.5,
"text-anchor": "top",
@@ -138,4 +239,4 @@
"mType": "geojson"
}
]
-}
+}
\ No newline at end of file
diff --git a/public/static/libs/mapbox/style/preventionCX.json b/public/static/libs/mapbox/style/preventionCX.json
index 00e5bb3..0267ba0 100644
--- a/public/static/libs/mapbox/style/preventionCX.json
+++ b/public/static/libs/mapbox/style/preventionCX.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.96947488906668,
- 30.920599374920492
+ 114.312,
+ 34.802
],
"zoom": 12.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
diff --git a/public/static/libs/mapbox/style/preventionSFQ.json b/public/static/libs/mapbox/style/preventionSFQ.json
index cc380cb..45e5a5b 100644
--- a/public/static/libs/mapbox/style/preventionSFQ.json
+++ b/public/static/libs/mapbox/style/preventionSFQ.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.953,
- 30.938
+ 114.312,
+ 34.802
],
"zoom": 12.6,
"style": "/static/libs/mapbox/style/customs/night-style.json"
diff --git a/public/static/libs/mapbox/style/projectIndex.json b/public/static/libs/mapbox/style/projectIndex.json
index 98041c4..7159947 100644
--- a/public/static/libs/mapbox/style/projectIndex.json
+++ b/public/static/libs/mapbox/style/projectIndex.json
@@ -7,10 +7,10 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
- "zoom": 11.6,
+ "zoom": 12.9,
"pitch": 55,
"style": "/static/libs/mapbox/style/customs/night-style.json"
},
diff --git a/public/static/libs/mapbox/style/rainwaterResourceCX.json b/public/static/libs/mapbox/style/rainwaterResourceCX.json
index aa6ffb2..e233218 100644
--- a/public/static/libs/mapbox/style/rainwaterResourceCX.json
+++ b/public/static/libs/mapbox/style/rainwaterResourceCX.json
@@ -2,9 +2,14 @@
"params": {
"basemap": "https://supermap2.wh-nf.cn:8090/bm",
"mvt": "https://supermap0.wh-nf.cn:8090/vt",
- "sprites": ["/static/libs/mapbox/style/sprite/sprite4"],
+ "sprites": [
+ "/static/libs/mapbox/style/sprite/sprite4"
+ ],
"init": {
- "center": [113.94947488906668, 30.920599374920492],
+ "center": [
+ 114.312,
+ 34.802
+ ],
"zoom": 11.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
},
@@ -17,35 +22,127 @@
]
}
},
- "orders": [["poi_label"], ["place_label_city"], ["road_major_label"], ["place_label_other"], ["point"]],
+ "orders": [
+ [
+ "poi_label"
+ ],
+ [
+ "place_label_city"
+ ],
+ [
+ "road_major_label"
+ ],
+ [
+ "place_label_other"
+ ],
+ [
+ "point"
+ ]
+ ],
"filter": {
"wsLine1": {
- "layerName": ["pipeline_info", "pipeline_point"],
+ "layerName": [
+ "pipeline_info",
+ "pipeline_point"
+ ],
"filter": [
- ["WS", "HS"],
- ["污水点", "合流点"]
+ [
+ "WS",
+ "HS"
+ ],
+ [
+ "污水点",
+ "合流点"
+ ]
]
},
- "ysLine1": { "layerName": ["pipeline_info", "pipeline_point"], "filter": [["YS"], ["雨水点"]] },
+ "ysLine1": {
+ "layerName": [
+ "pipeline_info",
+ "pipeline_point"
+ ],
+ "filter": [
+ [
+ "YS"
+ ],
+ [
+ "雨水点"
+ ]
+ ]
+ },
"oldCity": {
- "layerName": ["city_boundary"],
- "filter": [["老城区"]],
- "easeTo": { "center": [113.933, 30.926], "zoom": 13.6, "pitch": 55 }
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "老城区"
+ ]
+ ],
+ "easeTo": {
+ "center": [
+ 113.933,
+ 30.926
+ ],
+ "zoom": 13.6,
+ "pitch": 55
+ }
},
"southCity": {
- "layerName": ["city_boundary"],
- "filter": [["南城新区"]],
- "easeTo": { "center": [113.933, 30.886], "zoom": 13.6, "pitch": 55 }
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "南城新区"
+ ]
+ ],
+ "easeTo": {
+ "center": [
+ 113.933,
+ 30.886
+ ],
+ "zoom": 13.6,
+ "pitch": 55
+ }
},
"newCity": {
- "layerName": ["city_boundary"],
- "filter": [["东城新区"]],
- "easeTo": { "center": [113.983, 30.896], "zoom": 13.6, "pitch": 55 }
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "东城新区"
+ ]
+ ],
+ "easeTo": {
+ "center": [
+ 113.983,
+ 30.896
+ ],
+ "zoom": 13.6,
+ "pitch": 55
+ }
},
"allCity": {
- "layerName": ["city_boundary"],
- "filter": [["东城新区", "南城新区", "老城区"]],
- "easeTo": { "center": [113.953, 30.906], "zoom": 13.6, "pitch": 55 }
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "东城新区",
+ "南城新区",
+ "老城区"
+ ]
+ ],
+ "easeTo": {
+ "center": [
+ 113.953,
+ 30.906
+ ],
+ "zoom": 13.6,
+ "pitch": 55
+ }
}
},
"mapbox": [
@@ -67,10 +164,17 @@
"id": "hubei_xiaogan_hm_psfq",
"key": "hubei_xiaogan_hm_psfq",
"source-layer": "hubei_xiaogan_hm_psfq",
- "filter": ["in", "type", "YS"],
+ "filter": [
+ "in",
+ "type",
+ "YS"
+ ],
"type": "fill",
"paint": {
- "fill-color": ["get", "fill_color"],
+ "fill-color": [
+ "get",
+ "fill_color"
+ ],
"fill-outline-color": "#ffffff"
},
"layout": {},
@@ -83,7 +187,11 @@
"id": "hubei_xiaogan_hm_psfq_text",
"key": "hubei_xiaogan_hm_psfq",
"source-layer": "hubei_xiaogan_hm_psfq",
- "filter": ["in", "type", "YS"],
+ "filter": [
+ "in",
+ "type",
+ "YS"
+ ],
"type": "symbol",
"paint": {
"text-color": "#ffffff",
@@ -93,7 +201,9 @@
},
"layout": {
"text-field": "{name}",
- "text-font": ["KlokanTech Noto Sans Regular"],
+ "text-font": [
+ "KlokanTech Noto Sans Regular"
+ ],
"text-size": 18,
"text-line-height": 1.5,
"text-anchor": "top",
@@ -106,4 +216,4 @@
"columns": "type,name"
}
]
-}
+}
\ No newline at end of file
diff --git a/public/static/libs/mapbox/style/syntheticDataMain.json b/public/static/libs/mapbox/style/syntheticDataMain.json
index d057767..af0eb84 100644
--- a/public/static/libs/mapbox/style/syntheticDataMain.json
+++ b/public/static/libs/mapbox/style/syntheticDataMain.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
"zoom": 13.6,
"pitch": 55,
diff --git a/src/assets/geojson/kaifeng/wsBengZhan.json b/src/assets/geojson/kaifeng/wsBengZhan.json
new file mode 100644
index 0000000..2e97290
--- /dev/null
+++ b/src/assets/geojson/kaifeng/wsBengZhan.json
@@ -0,0 +1 @@
+{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.3255447671694,34.806710446051198]},"properties":{"FID":0,"Layer":"合流","Name":"梁苑泵站","lon":114.325544767,"lat":34.806710446099999,"ysNumber":4,"wsNumber":2,"yswater":"0.09","wswater":"0.33"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.32448809744353,34.784734578145695]},"properties":{"FID":1,"Layer":"合流","Name":"大庆路泵站","lon":114.324488097,"lat":34.7847345781,"ysNumber":4,"wsNumber":2,"yswater":"24.8","wswater":"2.2"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.33701943055284,34.785062722447599]},"properties":{"FID":2,"Layer":"合流","Name":"包公湖泵站","lon":114.337019431,"lat":34.785062722399999,"ysNumber":4,"wsNumber":5,"yswater":"4.6","wswater":"0.8"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.35903886734209,34.783602760045085]},"properties":{"FID":3,"Layer":"合流","Name":"济梁闸泵站","lon":114.359038867,"lat":34.783602760000001,"ysNumber":4,"wsNumber":4,"yswater":"8.8","wswater":"1"}},{"type":"Feature","id":4,"geometry":{"type":"Point","coordinates":[114.3601067154365,34.780835170269889]},"properties":{"FID":4,"Layer":"合流","Name":"滨河路泵站","lon":114.360106715,"lat":34.780835170300001,"ysNumber":4,"wsNumber":5,"yswater":"5.1","wswater":"1.78"}},{"type":"Feature","id":5,"geometry":{"type":"Point","coordinates":[114.362711626443,34.795353758228423]},"properties":{"FID":5,"Layer":"合流","Name":"汴京泵站","lon":114.36271162600001,"lat":34.795353758200001,"ysNumber":4,"wsNumber":5,"yswater":"4.6","wswater":"0.58"}},{"type":"Feature","id":6,"geometry":{"type":"Point","coordinates":[114.36465150766639,34.806856989440767]},"properties":{"FID":6,"Layer":"合流","Name":"河大泵站","lon":114.36465150799999,"lat":34.806856989400003,"ysNumber":4,"wsNumber":2,"yswater":"3.37","wswater":"0.222"}},{"type":"Feature","id":7,"geometry":{"type":"Point","coordinates":[114.36935541545591,34.818365440199393]},"properties":{"FID":7,"Layer":"合流","Name":"仁和屯泵站","lon":114.369355415,"lat":34.818365440199997,"ysNumber":6,"wsNumber":4,"yswater":"14","wswater":"0.6"}},{"type":"Feature","id":8,"geometry":{"type":"Point","coordinates":[114.30813516896551,34.82411213358872]},"properties":{"FID":8,"Layer":"污水","Name":"夷山大街泵站","lon":114.308135169,"lat":34.824112133600003,"ysNumber":0,"wsNumber":3,"yswater":"0","wswater":"0.444"}},{"type":"Feature","id":9,"geometry":{"type":"Point","coordinates":[114.23126391857754,34.78000558314681]},"properties":{"FID":9,"Layer":"合流","Name":"新区四号泵站","lon":114.231263919,"lat":34.780005583099999,"ysNumber":4,"wsNumber":4,"yswater":"0.91","wswater":"0.58"}},{"type":"Feature","id":10,"geometry":{"type":"Point","coordinates":[114.26817088733971,34.808138775495564]},"properties":{"FID":10,"Layer":"合流","Name":"新区八号泵站","lon":114.268170887,"lat":34.808138775499998,"ysNumber":6,"wsNumber":4,"yswater":"16.5","wswater":"0.5"}},{"type":"Feature","id":11,"geometry":{"type":"Point","coordinates":[114.28943005499177,34.778579599595595]},"properties":{"FID":11,"Layer":"污水","Name":"新区老四号泵站","lon":114.289430055,"lat":34.7785795996,"ysNumber":0,"wsNumber":4,"yswater":"0","wswater":"0.25"}},{"type":"Feature","id":12,"geometry":{"type":"Point","coordinates":[114.28636257830526,34.813287063289344]},"properties":{"FID":12,"Layer":"污水","Name":"新区老二号泵站","lon":114.28636257799999,"lat":34.813287063300002,"ysNumber":0,"wsNumber":3,"yswater":"0","wswater":"1.45"}},{"type":"Feature","id":13,"geometry":{"type":"Point","coordinates":[114.3759437951563,34.769425099984282]},"properties":{"FID":13,"Layer":"污水","Name":"陵园路一体化泵站","lon":114.375943795,"lat":34.769425099999999,"ysNumber":0,"wsNumber":3,"yswater":"0","wswater":"0.7"}},{"type":"Feature","id":14,"geometry":{"type":"Point","coordinates":[114.3148602108178,34.785140412434828]},"properties":{"FID":14,"Layer":"污水","Name":"中途泵站","lon":114.314860211,"lat":34.785140412399997,"ysNumber":0,"wsNumber":7,"yswater":"0","wswater":"1.37"}},{"type":"Feature","id":15,"geometry":{"type":"Point","coordinates":[114.30788271631789,34.77759931964551]},"properties":{"FID":15,"Layer":"污水","Name":"魏都路泵站","lon":114.30788271599999,"lat":34.7775993196,"ysNumber":0,"wsNumber":4,"yswater":"0","wswater":"0.85"}},{"type":"Feature","id":16,"geometry":{"type":"Point","coordinates":[114.37597110760814,34.783202090692711]},"properties":{"FID":16,"Layer":"污水","Name":"重工路泵站","lon":114.375971108,"lat":34.783202090700001,"ysNumber":0,"wsNumber":4,"yswater":"0","wswater":"1.21"}},{"type":"Feature","id":17,"geometry":{"type":"Point","coordinates":[114.36645342601892,34.798051629735284]},"properties":{"FID":17,"Layer":"合流","Name":"海洋馆泵站","lon":114.36645342600001,"lat":34.798051629699998,"ysNumber":6,"wsNumber":5,"yswater":"2.9","wswater":"0.58"}},{"type":"Feature","id":18,"geometry":{"type":"Point","coordinates":[114.36416291216987,34.773162429921896]},"properties":{"FID":18,"Layer":"合流","Name":"铁北街泵站","lon":114.364162912,"lat":34.773162429899998,"ysNumber":5,"wsNumber":2,"yswater":"1.3","wswater":"0.111"}}]}
\ No newline at end of file
diff --git a/src/assets/geojson/kaifeng/wuShuiChang.json b/src/assets/geojson/kaifeng/wuShuiChang.json
new file mode 100644
index 0000000..05cd451
--- /dev/null
+++ b/src/assets/geojson/kaifeng/wuShuiChang.json
@@ -0,0 +1 @@
+{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.28123597781243,34.771350841956895]},"properties":{"FID":0,"Id":0,"name":"马家河污水处理厂","designSize":"10","criterion":"一级 A","towater":"马家河北支","lon":114.281235978,"lat":34.771350841999997}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.31521289637995,34.753686318314848]},"properties":{"FID":1,"Id":0,"name":"西区污水处理厂","designSize":"12","criterion":"一级 A","towater":"马家河","lon":114.31521289600001,"lat":34.753686318299998}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.3358047995138,34.78658153390905]},"properties":{"FID":2,"Id":0,"name":"包公湖污水处理厂","designSize":"2","criterion":"准Ⅳ","towater":"黄汴河","lon":114.33580480000001,"lat":34.786581533899998}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.38093674073218,34.772004765430317]},"properties":{"FID":3,"Id":0,"name":"东区污水处理厂","designSize":"20","criterion":"一级 A","towater":"惠济河","lon":114.380936741,"lat":34.772004765399998}},{"type":"Feature","id":4,"geometry":{"type":"Point","coordinates":[114.39210355123265,34.827484278242849]},"properties":{"FID":4,"Id":0,"name":"北区污水处理厂","designSize":"5","criterion":"准Ⅳ","towater":"东郊沟","lon":114.39210355100001,"lat":34.827484278199996}},{"type":"Feature","id":5,"geometry":{"type":"Point","coordinates":[114.41412308338079,34.729598011384006]},"properties":{"FID":5,"Id":0,"name":"精细化工产业区污水处理厂","designSize":"2","criterion":"一级 A","towater":" ","lon":114.41412308300001,"lat":34.7295980114}},{"type":"Feature","id":6,"geometry":{"type":"Point","coordinates":[114.44667852780671,34.722484644433187]},"properties":{"FID":6,"Id":0,"name":"祥符区污水处理厂","designSize":"4","criterion":"一级A","towater":"马家河","lon":114.44667852800001,"lat":34.722484644399998}}]}
\ No newline at end of file
diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json
index 1203b73..fa5246e 100644
--- a/public/static/libs/mapbox/style/HaiMianScreen.json
+++ b/public/static/libs/mapbox/style/HaiMianScreen.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.979,
- 30.886
+ 114.312,
+ 34.802
],
"zoom": 11.451412188068154,
"pitch": 40,
diff --git a/public/static/libs/mapbox/style/floodPipe.json b/public/static/libs/mapbox/style/floodPipe.json
index b3ccada..68e87f1 100644
--- a/public/static/libs/mapbox/style/floodPipe.json
+++ b/public/static/libs/mapbox/style/floodPipe.json
@@ -7,10 +7,10 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
- "zoom": 13.6,
+ "zoom": 12.9,
"pitch": 55,
"style": "/static/libs/mapbox/style/customs/night-style.json"
},
diff --git a/public/static/libs/mapbox/style/lateWarn.json b/public/static/libs/mapbox/style/lateWarn.json
index 94dc0b5..7813b68 100644
--- a/public/static/libs/mapbox/style/lateWarn.json
+++ b/public/static/libs/mapbox/style/lateWarn.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
"zoom": 13.6,
"pitch": 55,
diff --git a/public/static/libs/mapbox/style/overflowBlack.json b/public/static/libs/mapbox/style/overflowBlack.json
index 57573ee..c7c9151 100644
--- a/public/static/libs/mapbox/style/overflowBlack.json
+++ b/public/static/libs/mapbox/style/overflowBlack.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.96947488906668,
- 30.920599374920492
+ 114.312,
+ 34.8022
],
"zoom": 12.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
diff --git a/public/static/libs/mapbox/style/permeableGroundAreaCX.json b/public/static/libs/mapbox/style/permeableGroundAreaCX.json
index 57573ee..e0bdfb5 100644
--- a/public/static/libs/mapbox/style/permeableGroundAreaCX.json
+++ b/public/static/libs/mapbox/style/permeableGroundAreaCX.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.96947488906668,
- 30.920599374920492
+ 114.312,
+ 34.802
],
"zoom": 12.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
diff --git a/public/static/libs/mapbox/style/pipeHealthy.json b/public/static/libs/mapbox/style/pipeHealthy.json
index 2b89593..f85c63a 100644
--- a/public/static/libs/mapbox/style/pipeHealthy.json
+++ b/public/static/libs/mapbox/style/pipeHealthy.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
"zoom": 13.6,
"pitch": 55,
diff --git a/public/static/libs/mapbox/style/planningcontrolCX.json b/public/static/libs/mapbox/style/planningcontrolCX.json
index 34dad91..99829c0 100644
--- a/public/static/libs/mapbox/style/planningcontrolCX.json
+++ b/public/static/libs/mapbox/style/planningcontrolCX.json
@@ -2,9 +2,14 @@
"params": {
"basemap": "https://supermap2.wh-nf.cn:8090/bm",
"mvt": "https://supermap0.wh-nf.cn:8090/vt",
- "sprites": ["/static/libs/mapbox/style/sprite/sprite4"],
+ "sprites": [
+ "/static/libs/mapbox/style/sprite/sprite4"
+ ],
"init": {
- "center": [113.96947488906668, 30.920599374920492],
+ "center": [
+ 114.312,
+ 34.802
+ ],
"zoom": 12.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
},
@@ -17,51 +22,124 @@
]
}
},
- "orders": [["poi_label"], ["place_label_city"], ["road_major_label"], ["place_label_other"], ["point"]],
+ "orders": [
+ [
+ "poi_label"
+ ],
+ [
+ "place_label_city"
+ ],
+ [
+ "road_major_label"
+ ],
+ [
+ "place_label_other"
+ ],
+ [
+ "point"
+ ]
+ ],
"filter": {
"wsLine1": {
- "layerName": ["pipeline_info", "pipeline_point"],
+ "layerName": [
+ "pipeline_info",
+ "pipeline_point"
+ ],
"filter": [
- ["WS", "HS"],
- ["污水点", "合流点"]
+ [
+ "WS",
+ "HS"
+ ],
+ [
+ "污水点",
+ "合流点"
+ ]
]
},
"ysLine1": {
- "layerName": ["pipeline_info", "pipeline_point"],
- "filter": [["YS"], ["雨水点"]]
+ "layerName": [
+ "pipeline_info",
+ "pipeline_point"
+ ],
+ "filter": [
+ [
+ "YS"
+ ],
+ [
+ "雨水点"
+ ]
+ ]
},
"oldCity": {
- "layerName": ["city_boundary"],
- "filter": [["老城区"]],
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "老城区"
+ ]
+ ],
"easeTo": {
- "center": [113.933, 30.926],
+ "center": [
+ 113.933,
+ 30.926
+ ],
"zoom": 13.6,
"pitch": 55
}
},
"southCity": {
- "layerName": ["city_boundary"],
- "filter": [["南城新区"]],
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "南城新区"
+ ]
+ ],
"easeTo": {
- "center": [113.933, 30.886],
+ "center": [
+ 113.933,
+ 30.886
+ ],
"zoom": 13.6,
"pitch": 55
}
},
"newCity": {
- "layerName": ["city_boundary"],
- "filter": [["东城新区"]],
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "东城新区"
+ ]
+ ],
"easeTo": {
- "center": [113.983, 30.896],
+ "center": [
+ 113.983,
+ 30.896
+ ],
"zoom": 13.6,
"pitch": 55
}
},
"allCity": {
- "layerName": ["city_boundary"],
- "filter": [["东城新区", "南城新区", "老城区"]],
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "东城新区",
+ "南城新区",
+ "老城区"
+ ]
+ ],
"easeTo": {
- "center": [113.953, 30.906],
+ "center": [
+ 113.953,
+ 30.906
+ ],
"zoom": 13.6,
"pitch": 55
}
@@ -86,7 +164,11 @@
"id": "hubei_xiaogan_hm_psfq_text",
"key": "hubei_xiaogan_hm_psfq",
"source-layer": "hubei_xiaogan_hm_psfq",
- "filter": ["in", "type", "YS"],
+ "filter": [
+ "in",
+ "type",
+ "YS"
+ ],
"type": "symbol",
"paint": {
"text-color": "#ffffff",
@@ -96,7 +178,9 @@
},
"layout": {
"text-field": "{name}",
- "text-font": ["KlokanTech Noto Sans Regular"],
+ "text-font": [
+ "KlokanTech Noto Sans Regular"
+ ],
"text-size": 18,
"text-line-height": 1.5,
"text-anchor": "top",
@@ -112,7 +196,11 @@
"id": "point",
"key": "point",
"type": "symbol",
- "filter": ["in", "type", ""],
+ "filter": [
+ "in",
+ "type",
+ ""
+ ],
"paint": {
"text-color": "#ffffff",
"text-halo-color": "rgba(0,0,0,1)",
@@ -120,12 +208,25 @@
"text-halo-blur": 1
},
"layout": {
- "icon-image": ["match", ["get", "type"], "success_zishui", "ysj", "error_zishui", "error_zishui", "wsj"],
+ "icon-image": [
+ "match",
+ [
+ "get",
+ "type"
+ ],
+ "success_zishui",
+ "ysj",
+ "error_zishui",
+ "error_zishui",
+ "wsj"
+ ],
"icon-allow-overlap": true,
"text-allow-overlap": true,
"icon-size": 0.7,
"text-field": "{name}",
- "text-font": ["KlokanTech Noto Sans Regular"],
+ "text-font": [
+ "KlokanTech Noto Sans Regular"
+ ],
"text-size": 13,
"text-line-height": 1.5,
"text-anchor": "top",
@@ -138,4 +239,4 @@
"mType": "geojson"
}
]
-}
+}
\ No newline at end of file
diff --git a/public/static/libs/mapbox/style/preventionCX.json b/public/static/libs/mapbox/style/preventionCX.json
index 00e5bb3..0267ba0 100644
--- a/public/static/libs/mapbox/style/preventionCX.json
+++ b/public/static/libs/mapbox/style/preventionCX.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.96947488906668,
- 30.920599374920492
+ 114.312,
+ 34.802
],
"zoom": 12.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
diff --git a/public/static/libs/mapbox/style/preventionSFQ.json b/public/static/libs/mapbox/style/preventionSFQ.json
index cc380cb..45e5a5b 100644
--- a/public/static/libs/mapbox/style/preventionSFQ.json
+++ b/public/static/libs/mapbox/style/preventionSFQ.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.953,
- 30.938
+ 114.312,
+ 34.802
],
"zoom": 12.6,
"style": "/static/libs/mapbox/style/customs/night-style.json"
diff --git a/public/static/libs/mapbox/style/projectIndex.json b/public/static/libs/mapbox/style/projectIndex.json
index 98041c4..7159947 100644
--- a/public/static/libs/mapbox/style/projectIndex.json
+++ b/public/static/libs/mapbox/style/projectIndex.json
@@ -7,10 +7,10 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
- "zoom": 11.6,
+ "zoom": 12.9,
"pitch": 55,
"style": "/static/libs/mapbox/style/customs/night-style.json"
},
diff --git a/public/static/libs/mapbox/style/rainwaterResourceCX.json b/public/static/libs/mapbox/style/rainwaterResourceCX.json
index aa6ffb2..e233218 100644
--- a/public/static/libs/mapbox/style/rainwaterResourceCX.json
+++ b/public/static/libs/mapbox/style/rainwaterResourceCX.json
@@ -2,9 +2,14 @@
"params": {
"basemap": "https://supermap2.wh-nf.cn:8090/bm",
"mvt": "https://supermap0.wh-nf.cn:8090/vt",
- "sprites": ["/static/libs/mapbox/style/sprite/sprite4"],
+ "sprites": [
+ "/static/libs/mapbox/style/sprite/sprite4"
+ ],
"init": {
- "center": [113.94947488906668, 30.920599374920492],
+ "center": [
+ 114.312,
+ 34.802
+ ],
"zoom": 11.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
},
@@ -17,35 +22,127 @@
]
}
},
- "orders": [["poi_label"], ["place_label_city"], ["road_major_label"], ["place_label_other"], ["point"]],
+ "orders": [
+ [
+ "poi_label"
+ ],
+ [
+ "place_label_city"
+ ],
+ [
+ "road_major_label"
+ ],
+ [
+ "place_label_other"
+ ],
+ [
+ "point"
+ ]
+ ],
"filter": {
"wsLine1": {
- "layerName": ["pipeline_info", "pipeline_point"],
+ "layerName": [
+ "pipeline_info",
+ "pipeline_point"
+ ],
"filter": [
- ["WS", "HS"],
- ["污水点", "合流点"]
+ [
+ "WS",
+ "HS"
+ ],
+ [
+ "污水点",
+ "合流点"
+ ]
]
},
- "ysLine1": { "layerName": ["pipeline_info", "pipeline_point"], "filter": [["YS"], ["雨水点"]] },
+ "ysLine1": {
+ "layerName": [
+ "pipeline_info",
+ "pipeline_point"
+ ],
+ "filter": [
+ [
+ "YS"
+ ],
+ [
+ "雨水点"
+ ]
+ ]
+ },
"oldCity": {
- "layerName": ["city_boundary"],
- "filter": [["老城区"]],
- "easeTo": { "center": [113.933, 30.926], "zoom": 13.6, "pitch": 55 }
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "老城区"
+ ]
+ ],
+ "easeTo": {
+ "center": [
+ 113.933,
+ 30.926
+ ],
+ "zoom": 13.6,
+ "pitch": 55
+ }
},
"southCity": {
- "layerName": ["city_boundary"],
- "filter": [["南城新区"]],
- "easeTo": { "center": [113.933, 30.886], "zoom": 13.6, "pitch": 55 }
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "南城新区"
+ ]
+ ],
+ "easeTo": {
+ "center": [
+ 113.933,
+ 30.886
+ ],
+ "zoom": 13.6,
+ "pitch": 55
+ }
},
"newCity": {
- "layerName": ["city_boundary"],
- "filter": [["东城新区"]],
- "easeTo": { "center": [113.983, 30.896], "zoom": 13.6, "pitch": 55 }
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "东城新区"
+ ]
+ ],
+ "easeTo": {
+ "center": [
+ 113.983,
+ 30.896
+ ],
+ "zoom": 13.6,
+ "pitch": 55
+ }
},
"allCity": {
- "layerName": ["city_boundary"],
- "filter": [["东城新区", "南城新区", "老城区"]],
- "easeTo": { "center": [113.953, 30.906], "zoom": 13.6, "pitch": 55 }
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "东城新区",
+ "南城新区",
+ "老城区"
+ ]
+ ],
+ "easeTo": {
+ "center": [
+ 113.953,
+ 30.906
+ ],
+ "zoom": 13.6,
+ "pitch": 55
+ }
}
},
"mapbox": [
@@ -67,10 +164,17 @@
"id": "hubei_xiaogan_hm_psfq",
"key": "hubei_xiaogan_hm_psfq",
"source-layer": "hubei_xiaogan_hm_psfq",
- "filter": ["in", "type", "YS"],
+ "filter": [
+ "in",
+ "type",
+ "YS"
+ ],
"type": "fill",
"paint": {
- "fill-color": ["get", "fill_color"],
+ "fill-color": [
+ "get",
+ "fill_color"
+ ],
"fill-outline-color": "#ffffff"
},
"layout": {},
@@ -83,7 +187,11 @@
"id": "hubei_xiaogan_hm_psfq_text",
"key": "hubei_xiaogan_hm_psfq",
"source-layer": "hubei_xiaogan_hm_psfq",
- "filter": ["in", "type", "YS"],
+ "filter": [
+ "in",
+ "type",
+ "YS"
+ ],
"type": "symbol",
"paint": {
"text-color": "#ffffff",
@@ -93,7 +201,9 @@
},
"layout": {
"text-field": "{name}",
- "text-font": ["KlokanTech Noto Sans Regular"],
+ "text-font": [
+ "KlokanTech Noto Sans Regular"
+ ],
"text-size": 18,
"text-line-height": 1.5,
"text-anchor": "top",
@@ -106,4 +216,4 @@
"columns": "type,name"
}
]
-}
+}
\ No newline at end of file
diff --git a/public/static/libs/mapbox/style/syntheticDataMain.json b/public/static/libs/mapbox/style/syntheticDataMain.json
index d057767..af0eb84 100644
--- a/public/static/libs/mapbox/style/syntheticDataMain.json
+++ b/public/static/libs/mapbox/style/syntheticDataMain.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
"zoom": 13.6,
"pitch": 55,
diff --git a/src/assets/geojson/kaifeng/wsBengZhan.json b/src/assets/geojson/kaifeng/wsBengZhan.json
new file mode 100644
index 0000000..2e97290
--- /dev/null
+++ b/src/assets/geojson/kaifeng/wsBengZhan.json
@@ -0,0 +1 @@
+{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.3255447671694,34.806710446051198]},"properties":{"FID":0,"Layer":"合流","Name":"梁苑泵站","lon":114.325544767,"lat":34.806710446099999,"ysNumber":4,"wsNumber":2,"yswater":"0.09","wswater":"0.33"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.32448809744353,34.784734578145695]},"properties":{"FID":1,"Layer":"合流","Name":"大庆路泵站","lon":114.324488097,"lat":34.7847345781,"ysNumber":4,"wsNumber":2,"yswater":"24.8","wswater":"2.2"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.33701943055284,34.785062722447599]},"properties":{"FID":2,"Layer":"合流","Name":"包公湖泵站","lon":114.337019431,"lat":34.785062722399999,"ysNumber":4,"wsNumber":5,"yswater":"4.6","wswater":"0.8"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.35903886734209,34.783602760045085]},"properties":{"FID":3,"Layer":"合流","Name":"济梁闸泵站","lon":114.359038867,"lat":34.783602760000001,"ysNumber":4,"wsNumber":4,"yswater":"8.8","wswater":"1"}},{"type":"Feature","id":4,"geometry":{"type":"Point","coordinates":[114.3601067154365,34.780835170269889]},"properties":{"FID":4,"Layer":"合流","Name":"滨河路泵站","lon":114.360106715,"lat":34.780835170300001,"ysNumber":4,"wsNumber":5,"yswater":"5.1","wswater":"1.78"}},{"type":"Feature","id":5,"geometry":{"type":"Point","coordinates":[114.362711626443,34.795353758228423]},"properties":{"FID":5,"Layer":"合流","Name":"汴京泵站","lon":114.36271162600001,"lat":34.795353758200001,"ysNumber":4,"wsNumber":5,"yswater":"4.6","wswater":"0.58"}},{"type":"Feature","id":6,"geometry":{"type":"Point","coordinates":[114.36465150766639,34.806856989440767]},"properties":{"FID":6,"Layer":"合流","Name":"河大泵站","lon":114.36465150799999,"lat":34.806856989400003,"ysNumber":4,"wsNumber":2,"yswater":"3.37","wswater":"0.222"}},{"type":"Feature","id":7,"geometry":{"type":"Point","coordinates":[114.36935541545591,34.818365440199393]},"properties":{"FID":7,"Layer":"合流","Name":"仁和屯泵站","lon":114.369355415,"lat":34.818365440199997,"ysNumber":6,"wsNumber":4,"yswater":"14","wswater":"0.6"}},{"type":"Feature","id":8,"geometry":{"type":"Point","coordinates":[114.30813516896551,34.82411213358872]},"properties":{"FID":8,"Layer":"污水","Name":"夷山大街泵站","lon":114.308135169,"lat":34.824112133600003,"ysNumber":0,"wsNumber":3,"yswater":"0","wswater":"0.444"}},{"type":"Feature","id":9,"geometry":{"type":"Point","coordinates":[114.23126391857754,34.78000558314681]},"properties":{"FID":9,"Layer":"合流","Name":"新区四号泵站","lon":114.231263919,"lat":34.780005583099999,"ysNumber":4,"wsNumber":4,"yswater":"0.91","wswater":"0.58"}},{"type":"Feature","id":10,"geometry":{"type":"Point","coordinates":[114.26817088733971,34.808138775495564]},"properties":{"FID":10,"Layer":"合流","Name":"新区八号泵站","lon":114.268170887,"lat":34.808138775499998,"ysNumber":6,"wsNumber":4,"yswater":"16.5","wswater":"0.5"}},{"type":"Feature","id":11,"geometry":{"type":"Point","coordinates":[114.28943005499177,34.778579599595595]},"properties":{"FID":11,"Layer":"污水","Name":"新区老四号泵站","lon":114.289430055,"lat":34.7785795996,"ysNumber":0,"wsNumber":4,"yswater":"0","wswater":"0.25"}},{"type":"Feature","id":12,"geometry":{"type":"Point","coordinates":[114.28636257830526,34.813287063289344]},"properties":{"FID":12,"Layer":"污水","Name":"新区老二号泵站","lon":114.28636257799999,"lat":34.813287063300002,"ysNumber":0,"wsNumber":3,"yswater":"0","wswater":"1.45"}},{"type":"Feature","id":13,"geometry":{"type":"Point","coordinates":[114.3759437951563,34.769425099984282]},"properties":{"FID":13,"Layer":"污水","Name":"陵园路一体化泵站","lon":114.375943795,"lat":34.769425099999999,"ysNumber":0,"wsNumber":3,"yswater":"0","wswater":"0.7"}},{"type":"Feature","id":14,"geometry":{"type":"Point","coordinates":[114.3148602108178,34.785140412434828]},"properties":{"FID":14,"Layer":"污水","Name":"中途泵站","lon":114.314860211,"lat":34.785140412399997,"ysNumber":0,"wsNumber":7,"yswater":"0","wswater":"1.37"}},{"type":"Feature","id":15,"geometry":{"type":"Point","coordinates":[114.30788271631789,34.77759931964551]},"properties":{"FID":15,"Layer":"污水","Name":"魏都路泵站","lon":114.30788271599999,"lat":34.7775993196,"ysNumber":0,"wsNumber":4,"yswater":"0","wswater":"0.85"}},{"type":"Feature","id":16,"geometry":{"type":"Point","coordinates":[114.37597110760814,34.783202090692711]},"properties":{"FID":16,"Layer":"污水","Name":"重工路泵站","lon":114.375971108,"lat":34.783202090700001,"ysNumber":0,"wsNumber":4,"yswater":"0","wswater":"1.21"}},{"type":"Feature","id":17,"geometry":{"type":"Point","coordinates":[114.36645342601892,34.798051629735284]},"properties":{"FID":17,"Layer":"合流","Name":"海洋馆泵站","lon":114.36645342600001,"lat":34.798051629699998,"ysNumber":6,"wsNumber":5,"yswater":"2.9","wswater":"0.58"}},{"type":"Feature","id":18,"geometry":{"type":"Point","coordinates":[114.36416291216987,34.773162429921896]},"properties":{"FID":18,"Layer":"合流","Name":"铁北街泵站","lon":114.364162912,"lat":34.773162429899998,"ysNumber":5,"wsNumber":2,"yswater":"1.3","wswater":"0.111"}}]}
\ No newline at end of file
diff --git a/src/assets/geojson/kaifeng/wuShuiChang.json b/src/assets/geojson/kaifeng/wuShuiChang.json
new file mode 100644
index 0000000..05cd451
--- /dev/null
+++ b/src/assets/geojson/kaifeng/wuShuiChang.json
@@ -0,0 +1 @@
+{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.28123597781243,34.771350841956895]},"properties":{"FID":0,"Id":0,"name":"马家河污水处理厂","designSize":"10","criterion":"一级 A","towater":"马家河北支","lon":114.281235978,"lat":34.771350841999997}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.31521289637995,34.753686318314848]},"properties":{"FID":1,"Id":0,"name":"西区污水处理厂","designSize":"12","criterion":"一级 A","towater":"马家河","lon":114.31521289600001,"lat":34.753686318299998}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.3358047995138,34.78658153390905]},"properties":{"FID":2,"Id":0,"name":"包公湖污水处理厂","designSize":"2","criterion":"准Ⅳ","towater":"黄汴河","lon":114.33580480000001,"lat":34.786581533899998}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.38093674073218,34.772004765430317]},"properties":{"FID":3,"Id":0,"name":"东区污水处理厂","designSize":"20","criterion":"一级 A","towater":"惠济河","lon":114.380936741,"lat":34.772004765399998}},{"type":"Feature","id":4,"geometry":{"type":"Point","coordinates":[114.39210355123265,34.827484278242849]},"properties":{"FID":4,"Id":0,"name":"北区污水处理厂","designSize":"5","criterion":"准Ⅳ","towater":"东郊沟","lon":114.39210355100001,"lat":34.827484278199996}},{"type":"Feature","id":5,"geometry":{"type":"Point","coordinates":[114.41412308338079,34.729598011384006]},"properties":{"FID":5,"Id":0,"name":"精细化工产业区污水处理厂","designSize":"2","criterion":"一级 A","towater":" ","lon":114.41412308300001,"lat":34.7295980114}},{"type":"Feature","id":6,"geometry":{"type":"Point","coordinates":[114.44667852780671,34.722484644433187]},"properties":{"FID":6,"Id":0,"name":"祥符区污水处理厂","designSize":"4","criterion":"一级A","towater":"马家河","lon":114.44667852800001,"lat":34.722484644399998}}]}
\ No newline at end of file
diff --git a/src/assets/geojson/kaifeng/ysBengZhan.json b/src/assets/geojson/kaifeng/ysBengZhan.json
new file mode 100644
index 0000000..b3a48ab
--- /dev/null
+++ b/src/assets/geojson/kaifeng/ysBengZhan.json
@@ -0,0 +1 @@
+{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.33167432644986,34.813796784857281]},"properties":{"FID":0,"Layer":"雨水","Name":"金耀门泵站","lon":114.331674326,"lat":34.813796784899999,"ysNumber":2,"wsNumber":0,"yswater":"0.25"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.32417783240864,34.81410117080717]},"properties":{"FID":1,"Layer":"雨水","Name":"西环路泵站","lon":114.324177832,"lat":34.814101170800001,"ysNumber":5,"wsNumber":0,"yswater":"20"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.34284796364797,34.781843275915001]},"properties":{"FID":2,"Layer":"雨水","Name":"大南门泵站","lon":114.342847964,"lat":34.781843275900002,"ysNumber":4,"wsNumber":0,"yswater":"4.44"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.36789736380371,34.772872621142433]},"properties":{"FID":3,"Layer":"雨水","Name":"禹王台泵站","lon":114.367897364,"lat":34.772872621099999,"ysNumber":2,"wsNumber":0,"yswater":"3.15"}},{"type":"Feature","id":4,"geometry":{"type":"Point","coordinates":[114.39595923246809,34.777007031063107]},"properties":{"FID":4,"Layer":"雨水","Name":"东立交泵站","lon":114.395959232,"lat":34.777007031099998,"ysNumber":3,"wsNumber":0,"yswater":"0.24"}},{"type":"Feature","id":5,"geometry":{"type":"Point","coordinates":[114.34058289381456,34.771380801424577]},"properties":{"FID":5,"Layer":"雨水","Name":"官坊立交泵站","lon":114.34058289399999,"lat":34.771380801399999,"ysNumber":3,"wsNumber":0,"yswater":"0.75"}},{"type":"Feature","id":6,"geometry":{"type":"Point","coordinates":[114.34027528378151,34.768957653249963]},"properties":{"FID":6,"Layer":"雨水","Name":"金梁里泵站","lon":114.340275284,"lat":34.768957653199998,"ysNumber":2,"wsNumber":0,"yswater":"0.22"}},{"type":"Feature","id":7,"geometry":{"type":"Point","coordinates":[114.33222421064397,34.771554187805066]},"properties":{"FID":7,"Layer":"雨水","Name":"西立交泵站","lon":114.332224211,"lat":34.7715541878,"ysNumber":2,"wsNumber":0,"yswater":"0.47"}},{"type":"Feature","id":8,"geometry":{"type":"Point","coordinates":[114.36451517766994,34.76594093005199]},"properties":{"FID":8,"Layer":"雨水","Name":"花园街泵站","lon":114.364515178,"lat":34.765940930100001,"ysNumber":2,"wsNumber":0,"yswater":"0.03"}},{"type":"Feature","id":9,"geometry":{"type":"Point","coordinates":[114.33738094803121,34.772177856110709]},"properties":{"FID":9,"Layer":"雨水","Name":"化三泵站","lon":114.337380948,"lat":34.772177856100001,"ysNumber":4,"wsNumber":0,"yswater":"0.111"}},{"type":"Feature","id":10,"geometry":{"type":"Point","coordinates":[114.35815067082993,34.77337174385648]},"properties":{"FID":10,"Layer":"雨水","Name":"东闸口泵站","lon":114.358150671,"lat":34.7733717439,"ysNumber":3,"wsNumber":0,"yswater":"0.39"}},{"type":"Feature","id":11,"geometry":{"type":"Point","coordinates":[114.32379602678792,34.82494987875603]},"properties":{"FID":11,"Layer":"雨水","Name":"东京大道泵站","lon":114.323796027,"lat":34.824949878799998,"ysNumber":6,"wsNumber":0,"yswater":"23"}},{"type":"Feature","id":12,"geometry":{"type":"Point","coordinates":[114.36863773061212,34.764531502671531]},"properties":{"FID":12,"Layer":"雨水","Name":"华夏大道泵站","lon":114.36863773100001,"lat":34.764531502700002,"ysNumber":6,"wsNumber":0,"yswater":"12"}},{"type":"Feature","id":13,"geometry":{"type":"Point","coordinates":[114.28119335571743,34.780232758031538]},"properties":{"FID":13,"Layer":"雨水","Name":"新区二号泵站","lon":114.281193356,"lat":34.780232757999997,"ysNumber":6,"wsNumber":0,"yswater":"14.95"}},{"type":"Feature","id":14,"geometry":{"type":"Point","coordinates":[114.27075013641387,34.78905253485037]},"properties":{"FID":14,"Layer":"雨水","Name":"新区一号泵站","lon":114.270750136,"lat":34.789052534900001,"ysNumber":5,"wsNumber":0,"yswater":"10.2"}},{"type":"Feature","id":15,"geometry":{"type":"Point","coordinates":[114.2798130338245,34.77913291034838]},"properties":{"FID":15,"Layer":"雨水","Name":"新区三号泵站","lon":114.279813034,"lat":34.7791329103,"ysNumber":4,"wsNumber":0,"yswater":"7.7"}},{"type":"Feature","id":16,"geometry":{"type":"Point","coordinates":[114.21167454828185,34.807762640580506]},"properties":{"FID":16,"Layer":"雨水","Name":"新区五号泵站","lon":114.211674548,"lat":34.807762640599996,"ysNumber":4,"wsNumber":0,"yswater":"3.42"}},{"type":"Feature","id":17,"geometry":{"type":"Point","coordinates":[114.21909733930421,34.778725139828168]},"properties":{"FID":17,"Layer":"雨水","Name":"新区六号泵站","lon":114.219097339,"lat":34.778725139800002,"ysNumber":6,"wsNumber":0,"yswater":"14.2"}},{"type":"Feature","id":18,"geometry":{"type":"Point","coordinates":[114.27522423372798,34.825332079611812]},"properties":{"FID":18,"Layer":"雨水","Name":"新区七号泵站","lon":114.27522423400001,"lat":34.825332079600003,"ysNumber":6,"wsNumber":0,"yswater":"13"}},{"type":"Feature","id":19,"geometry":{"type":"Point","coordinates":[114.2963828469167,34.774431499614359]},"properties":{"FID":19,"Layer":"雨水","Name":"金明大道陇海立交泵站","lon":114.296382847,"lat":34.774431499599999,"ysNumber":3,"wsNumber":0,"yswater":"0.6"}},{"type":"Feature","id":20,"geometry":{"type":"Point","coordinates":[114.26895926766986,34.774052571120166]},"properties":{"FID":20,"Layer":"雨水","Name":"一大街立交泵站","lon":114.268959268,"lat":34.7740525711,"ysNumber":2,"wsNumber":0,"yswater":"0.82"}},{"type":"Feature","id":21,"geometry":{"type":"Point","coordinates":[114.29111664686717,34.824567884137792]},"properties":{"FID":21,"Layer":"雨水","Name":"东京大道环堤路泵站","lon":114.291116647,"lat":34.824567884099999,"ysNumber":2,"wsNumber":0,"yswater":"0.14"}},{"type":"Feature","id":22,"geometry":{"type":"Point","coordinates":[114.27947482774283,34.802580148339061]},"properties":{"FID":22,"Layer":"雨水","Name":"郑开大道环堤路泵站","lon":114.27947482800001,"lat":34.802580148300002,"ysNumber":3,"wsNumber":0,"yswater":"1.25"}},{"type":"Feature","id":23,"geometry":{"type":"Point","coordinates":[114.32584815799478,34.804150195214611]},"properties":{"FID":23,"Layer":"雨水","Name":"大梁路泵站","lon":114.325848158,"lat":34.804150195200002,"ysNumber":2,"wsNumber":0,"yswater":"3.16"}},{"type":"Feature","id":24,"geometry":{"type":"Point","coordinates":[114.39840848113086,34.793725142040017]},"properties":{"FID":24,"Layer":"雨水","Name":"东郊沟雨水泵站","lon":114.398408481,"lat":34.793725142,"ysNumber":4,"wsNumber":0,"yswater":"9.8"}}]}
\ No newline at end of file
diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json
index 1203b73..fa5246e 100644
--- a/public/static/libs/mapbox/style/HaiMianScreen.json
+++ b/public/static/libs/mapbox/style/HaiMianScreen.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.979,
- 30.886
+ 114.312,
+ 34.802
],
"zoom": 11.451412188068154,
"pitch": 40,
diff --git a/public/static/libs/mapbox/style/floodPipe.json b/public/static/libs/mapbox/style/floodPipe.json
index b3ccada..68e87f1 100644
--- a/public/static/libs/mapbox/style/floodPipe.json
+++ b/public/static/libs/mapbox/style/floodPipe.json
@@ -7,10 +7,10 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
- "zoom": 13.6,
+ "zoom": 12.9,
"pitch": 55,
"style": "/static/libs/mapbox/style/customs/night-style.json"
},
diff --git a/public/static/libs/mapbox/style/lateWarn.json b/public/static/libs/mapbox/style/lateWarn.json
index 94dc0b5..7813b68 100644
--- a/public/static/libs/mapbox/style/lateWarn.json
+++ b/public/static/libs/mapbox/style/lateWarn.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
"zoom": 13.6,
"pitch": 55,
diff --git a/public/static/libs/mapbox/style/overflowBlack.json b/public/static/libs/mapbox/style/overflowBlack.json
index 57573ee..c7c9151 100644
--- a/public/static/libs/mapbox/style/overflowBlack.json
+++ b/public/static/libs/mapbox/style/overflowBlack.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.96947488906668,
- 30.920599374920492
+ 114.312,
+ 34.8022
],
"zoom": 12.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
diff --git a/public/static/libs/mapbox/style/permeableGroundAreaCX.json b/public/static/libs/mapbox/style/permeableGroundAreaCX.json
index 57573ee..e0bdfb5 100644
--- a/public/static/libs/mapbox/style/permeableGroundAreaCX.json
+++ b/public/static/libs/mapbox/style/permeableGroundAreaCX.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.96947488906668,
- 30.920599374920492
+ 114.312,
+ 34.802
],
"zoom": 12.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
diff --git a/public/static/libs/mapbox/style/pipeHealthy.json b/public/static/libs/mapbox/style/pipeHealthy.json
index 2b89593..f85c63a 100644
--- a/public/static/libs/mapbox/style/pipeHealthy.json
+++ b/public/static/libs/mapbox/style/pipeHealthy.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
"zoom": 13.6,
"pitch": 55,
diff --git a/public/static/libs/mapbox/style/planningcontrolCX.json b/public/static/libs/mapbox/style/planningcontrolCX.json
index 34dad91..99829c0 100644
--- a/public/static/libs/mapbox/style/planningcontrolCX.json
+++ b/public/static/libs/mapbox/style/planningcontrolCX.json
@@ -2,9 +2,14 @@
"params": {
"basemap": "https://supermap2.wh-nf.cn:8090/bm",
"mvt": "https://supermap0.wh-nf.cn:8090/vt",
- "sprites": ["/static/libs/mapbox/style/sprite/sprite4"],
+ "sprites": [
+ "/static/libs/mapbox/style/sprite/sprite4"
+ ],
"init": {
- "center": [113.96947488906668, 30.920599374920492],
+ "center": [
+ 114.312,
+ 34.802
+ ],
"zoom": 12.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
},
@@ -17,51 +22,124 @@
]
}
},
- "orders": [["poi_label"], ["place_label_city"], ["road_major_label"], ["place_label_other"], ["point"]],
+ "orders": [
+ [
+ "poi_label"
+ ],
+ [
+ "place_label_city"
+ ],
+ [
+ "road_major_label"
+ ],
+ [
+ "place_label_other"
+ ],
+ [
+ "point"
+ ]
+ ],
"filter": {
"wsLine1": {
- "layerName": ["pipeline_info", "pipeline_point"],
+ "layerName": [
+ "pipeline_info",
+ "pipeline_point"
+ ],
"filter": [
- ["WS", "HS"],
- ["污水点", "合流点"]
+ [
+ "WS",
+ "HS"
+ ],
+ [
+ "污水点",
+ "合流点"
+ ]
]
},
"ysLine1": {
- "layerName": ["pipeline_info", "pipeline_point"],
- "filter": [["YS"], ["雨水点"]]
+ "layerName": [
+ "pipeline_info",
+ "pipeline_point"
+ ],
+ "filter": [
+ [
+ "YS"
+ ],
+ [
+ "雨水点"
+ ]
+ ]
},
"oldCity": {
- "layerName": ["city_boundary"],
- "filter": [["老城区"]],
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "老城区"
+ ]
+ ],
"easeTo": {
- "center": [113.933, 30.926],
+ "center": [
+ 113.933,
+ 30.926
+ ],
"zoom": 13.6,
"pitch": 55
}
},
"southCity": {
- "layerName": ["city_boundary"],
- "filter": [["南城新区"]],
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "南城新区"
+ ]
+ ],
"easeTo": {
- "center": [113.933, 30.886],
+ "center": [
+ 113.933,
+ 30.886
+ ],
"zoom": 13.6,
"pitch": 55
}
},
"newCity": {
- "layerName": ["city_boundary"],
- "filter": [["东城新区"]],
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "东城新区"
+ ]
+ ],
"easeTo": {
- "center": [113.983, 30.896],
+ "center": [
+ 113.983,
+ 30.896
+ ],
"zoom": 13.6,
"pitch": 55
}
},
"allCity": {
- "layerName": ["city_boundary"],
- "filter": [["东城新区", "南城新区", "老城区"]],
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "东城新区",
+ "南城新区",
+ "老城区"
+ ]
+ ],
"easeTo": {
- "center": [113.953, 30.906],
+ "center": [
+ 113.953,
+ 30.906
+ ],
"zoom": 13.6,
"pitch": 55
}
@@ -86,7 +164,11 @@
"id": "hubei_xiaogan_hm_psfq_text",
"key": "hubei_xiaogan_hm_psfq",
"source-layer": "hubei_xiaogan_hm_psfq",
- "filter": ["in", "type", "YS"],
+ "filter": [
+ "in",
+ "type",
+ "YS"
+ ],
"type": "symbol",
"paint": {
"text-color": "#ffffff",
@@ -96,7 +178,9 @@
},
"layout": {
"text-field": "{name}",
- "text-font": ["KlokanTech Noto Sans Regular"],
+ "text-font": [
+ "KlokanTech Noto Sans Regular"
+ ],
"text-size": 18,
"text-line-height": 1.5,
"text-anchor": "top",
@@ -112,7 +196,11 @@
"id": "point",
"key": "point",
"type": "symbol",
- "filter": ["in", "type", ""],
+ "filter": [
+ "in",
+ "type",
+ ""
+ ],
"paint": {
"text-color": "#ffffff",
"text-halo-color": "rgba(0,0,0,1)",
@@ -120,12 +208,25 @@
"text-halo-blur": 1
},
"layout": {
- "icon-image": ["match", ["get", "type"], "success_zishui", "ysj", "error_zishui", "error_zishui", "wsj"],
+ "icon-image": [
+ "match",
+ [
+ "get",
+ "type"
+ ],
+ "success_zishui",
+ "ysj",
+ "error_zishui",
+ "error_zishui",
+ "wsj"
+ ],
"icon-allow-overlap": true,
"text-allow-overlap": true,
"icon-size": 0.7,
"text-field": "{name}",
- "text-font": ["KlokanTech Noto Sans Regular"],
+ "text-font": [
+ "KlokanTech Noto Sans Regular"
+ ],
"text-size": 13,
"text-line-height": 1.5,
"text-anchor": "top",
@@ -138,4 +239,4 @@
"mType": "geojson"
}
]
-}
+}
\ No newline at end of file
diff --git a/public/static/libs/mapbox/style/preventionCX.json b/public/static/libs/mapbox/style/preventionCX.json
index 00e5bb3..0267ba0 100644
--- a/public/static/libs/mapbox/style/preventionCX.json
+++ b/public/static/libs/mapbox/style/preventionCX.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.96947488906668,
- 30.920599374920492
+ 114.312,
+ 34.802
],
"zoom": 12.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
diff --git a/public/static/libs/mapbox/style/preventionSFQ.json b/public/static/libs/mapbox/style/preventionSFQ.json
index cc380cb..45e5a5b 100644
--- a/public/static/libs/mapbox/style/preventionSFQ.json
+++ b/public/static/libs/mapbox/style/preventionSFQ.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.953,
- 30.938
+ 114.312,
+ 34.802
],
"zoom": 12.6,
"style": "/static/libs/mapbox/style/customs/night-style.json"
diff --git a/public/static/libs/mapbox/style/projectIndex.json b/public/static/libs/mapbox/style/projectIndex.json
index 98041c4..7159947 100644
--- a/public/static/libs/mapbox/style/projectIndex.json
+++ b/public/static/libs/mapbox/style/projectIndex.json
@@ -7,10 +7,10 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
- "zoom": 11.6,
+ "zoom": 12.9,
"pitch": 55,
"style": "/static/libs/mapbox/style/customs/night-style.json"
},
diff --git a/public/static/libs/mapbox/style/rainwaterResourceCX.json b/public/static/libs/mapbox/style/rainwaterResourceCX.json
index aa6ffb2..e233218 100644
--- a/public/static/libs/mapbox/style/rainwaterResourceCX.json
+++ b/public/static/libs/mapbox/style/rainwaterResourceCX.json
@@ -2,9 +2,14 @@
"params": {
"basemap": "https://supermap2.wh-nf.cn:8090/bm",
"mvt": "https://supermap0.wh-nf.cn:8090/vt",
- "sprites": ["/static/libs/mapbox/style/sprite/sprite4"],
+ "sprites": [
+ "/static/libs/mapbox/style/sprite/sprite4"
+ ],
"init": {
- "center": [113.94947488906668, 30.920599374920492],
+ "center": [
+ 114.312,
+ 34.802
+ ],
"zoom": 11.15,
"style": "/static/libs/mapbox/style/customs/night-style.json"
},
@@ -17,35 +22,127 @@
]
}
},
- "orders": [["poi_label"], ["place_label_city"], ["road_major_label"], ["place_label_other"], ["point"]],
+ "orders": [
+ [
+ "poi_label"
+ ],
+ [
+ "place_label_city"
+ ],
+ [
+ "road_major_label"
+ ],
+ [
+ "place_label_other"
+ ],
+ [
+ "point"
+ ]
+ ],
"filter": {
"wsLine1": {
- "layerName": ["pipeline_info", "pipeline_point"],
+ "layerName": [
+ "pipeline_info",
+ "pipeline_point"
+ ],
"filter": [
- ["WS", "HS"],
- ["污水点", "合流点"]
+ [
+ "WS",
+ "HS"
+ ],
+ [
+ "污水点",
+ "合流点"
+ ]
]
},
- "ysLine1": { "layerName": ["pipeline_info", "pipeline_point"], "filter": [["YS"], ["雨水点"]] },
+ "ysLine1": {
+ "layerName": [
+ "pipeline_info",
+ "pipeline_point"
+ ],
+ "filter": [
+ [
+ "YS"
+ ],
+ [
+ "雨水点"
+ ]
+ ]
+ },
"oldCity": {
- "layerName": ["city_boundary"],
- "filter": [["老城区"]],
- "easeTo": { "center": [113.933, 30.926], "zoom": 13.6, "pitch": 55 }
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "老城区"
+ ]
+ ],
+ "easeTo": {
+ "center": [
+ 113.933,
+ 30.926
+ ],
+ "zoom": 13.6,
+ "pitch": 55
+ }
},
"southCity": {
- "layerName": ["city_boundary"],
- "filter": [["南城新区"]],
- "easeTo": { "center": [113.933, 30.886], "zoom": 13.6, "pitch": 55 }
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "南城新区"
+ ]
+ ],
+ "easeTo": {
+ "center": [
+ 113.933,
+ 30.886
+ ],
+ "zoom": 13.6,
+ "pitch": 55
+ }
},
"newCity": {
- "layerName": ["city_boundary"],
- "filter": [["东城新区"]],
- "easeTo": { "center": [113.983, 30.896], "zoom": 13.6, "pitch": 55 }
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "东城新区"
+ ]
+ ],
+ "easeTo": {
+ "center": [
+ 113.983,
+ 30.896
+ ],
+ "zoom": 13.6,
+ "pitch": 55
+ }
},
"allCity": {
- "layerName": ["city_boundary"],
- "filter": [["东城新区", "南城新区", "老城区"]],
- "easeTo": { "center": [113.953, 30.906], "zoom": 13.6, "pitch": 55 }
+ "layerName": [
+ "city_boundary"
+ ],
+ "filter": [
+ [
+ "东城新区",
+ "南城新区",
+ "老城区"
+ ]
+ ],
+ "easeTo": {
+ "center": [
+ 113.953,
+ 30.906
+ ],
+ "zoom": 13.6,
+ "pitch": 55
+ }
}
},
"mapbox": [
@@ -67,10 +164,17 @@
"id": "hubei_xiaogan_hm_psfq",
"key": "hubei_xiaogan_hm_psfq",
"source-layer": "hubei_xiaogan_hm_psfq",
- "filter": ["in", "type", "YS"],
+ "filter": [
+ "in",
+ "type",
+ "YS"
+ ],
"type": "fill",
"paint": {
- "fill-color": ["get", "fill_color"],
+ "fill-color": [
+ "get",
+ "fill_color"
+ ],
"fill-outline-color": "#ffffff"
},
"layout": {},
@@ -83,7 +187,11 @@
"id": "hubei_xiaogan_hm_psfq_text",
"key": "hubei_xiaogan_hm_psfq",
"source-layer": "hubei_xiaogan_hm_psfq",
- "filter": ["in", "type", "YS"],
+ "filter": [
+ "in",
+ "type",
+ "YS"
+ ],
"type": "symbol",
"paint": {
"text-color": "#ffffff",
@@ -93,7 +201,9 @@
},
"layout": {
"text-field": "{name}",
- "text-font": ["KlokanTech Noto Sans Regular"],
+ "text-font": [
+ "KlokanTech Noto Sans Regular"
+ ],
"text-size": 18,
"text-line-height": 1.5,
"text-anchor": "top",
@@ -106,4 +216,4 @@
"columns": "type,name"
}
]
-}
+}
\ No newline at end of file
diff --git a/public/static/libs/mapbox/style/syntheticDataMain.json b/public/static/libs/mapbox/style/syntheticDataMain.json
index d057767..af0eb84 100644
--- a/public/static/libs/mapbox/style/syntheticDataMain.json
+++ b/public/static/libs/mapbox/style/syntheticDataMain.json
@@ -7,8 +7,8 @@
],
"init": {
"center": [
- 113.953,
- 30.906
+ 114.312,
+ 34.802
],
"zoom": 13.6,
"pitch": 55,
diff --git a/src/assets/geojson/kaifeng/wsBengZhan.json b/src/assets/geojson/kaifeng/wsBengZhan.json
new file mode 100644
index 0000000..2e97290
--- /dev/null
+++ b/src/assets/geojson/kaifeng/wsBengZhan.json
@@ -0,0 +1 @@
+{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.3255447671694,34.806710446051198]},"properties":{"FID":0,"Layer":"合流","Name":"梁苑泵站","lon":114.325544767,"lat":34.806710446099999,"ysNumber":4,"wsNumber":2,"yswater":"0.09","wswater":"0.33"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.32448809744353,34.784734578145695]},"properties":{"FID":1,"Layer":"合流","Name":"大庆路泵站","lon":114.324488097,"lat":34.7847345781,"ysNumber":4,"wsNumber":2,"yswater":"24.8","wswater":"2.2"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.33701943055284,34.785062722447599]},"properties":{"FID":2,"Layer":"合流","Name":"包公湖泵站","lon":114.337019431,"lat":34.785062722399999,"ysNumber":4,"wsNumber":5,"yswater":"4.6","wswater":"0.8"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.35903886734209,34.783602760045085]},"properties":{"FID":3,"Layer":"合流","Name":"济梁闸泵站","lon":114.359038867,"lat":34.783602760000001,"ysNumber":4,"wsNumber":4,"yswater":"8.8","wswater":"1"}},{"type":"Feature","id":4,"geometry":{"type":"Point","coordinates":[114.3601067154365,34.780835170269889]},"properties":{"FID":4,"Layer":"合流","Name":"滨河路泵站","lon":114.360106715,"lat":34.780835170300001,"ysNumber":4,"wsNumber":5,"yswater":"5.1","wswater":"1.78"}},{"type":"Feature","id":5,"geometry":{"type":"Point","coordinates":[114.362711626443,34.795353758228423]},"properties":{"FID":5,"Layer":"合流","Name":"汴京泵站","lon":114.36271162600001,"lat":34.795353758200001,"ysNumber":4,"wsNumber":5,"yswater":"4.6","wswater":"0.58"}},{"type":"Feature","id":6,"geometry":{"type":"Point","coordinates":[114.36465150766639,34.806856989440767]},"properties":{"FID":6,"Layer":"合流","Name":"河大泵站","lon":114.36465150799999,"lat":34.806856989400003,"ysNumber":4,"wsNumber":2,"yswater":"3.37","wswater":"0.222"}},{"type":"Feature","id":7,"geometry":{"type":"Point","coordinates":[114.36935541545591,34.818365440199393]},"properties":{"FID":7,"Layer":"合流","Name":"仁和屯泵站","lon":114.369355415,"lat":34.818365440199997,"ysNumber":6,"wsNumber":4,"yswater":"14","wswater":"0.6"}},{"type":"Feature","id":8,"geometry":{"type":"Point","coordinates":[114.30813516896551,34.82411213358872]},"properties":{"FID":8,"Layer":"污水","Name":"夷山大街泵站","lon":114.308135169,"lat":34.824112133600003,"ysNumber":0,"wsNumber":3,"yswater":"0","wswater":"0.444"}},{"type":"Feature","id":9,"geometry":{"type":"Point","coordinates":[114.23126391857754,34.78000558314681]},"properties":{"FID":9,"Layer":"合流","Name":"新区四号泵站","lon":114.231263919,"lat":34.780005583099999,"ysNumber":4,"wsNumber":4,"yswater":"0.91","wswater":"0.58"}},{"type":"Feature","id":10,"geometry":{"type":"Point","coordinates":[114.26817088733971,34.808138775495564]},"properties":{"FID":10,"Layer":"合流","Name":"新区八号泵站","lon":114.268170887,"lat":34.808138775499998,"ysNumber":6,"wsNumber":4,"yswater":"16.5","wswater":"0.5"}},{"type":"Feature","id":11,"geometry":{"type":"Point","coordinates":[114.28943005499177,34.778579599595595]},"properties":{"FID":11,"Layer":"污水","Name":"新区老四号泵站","lon":114.289430055,"lat":34.7785795996,"ysNumber":0,"wsNumber":4,"yswater":"0","wswater":"0.25"}},{"type":"Feature","id":12,"geometry":{"type":"Point","coordinates":[114.28636257830526,34.813287063289344]},"properties":{"FID":12,"Layer":"污水","Name":"新区老二号泵站","lon":114.28636257799999,"lat":34.813287063300002,"ysNumber":0,"wsNumber":3,"yswater":"0","wswater":"1.45"}},{"type":"Feature","id":13,"geometry":{"type":"Point","coordinates":[114.3759437951563,34.769425099984282]},"properties":{"FID":13,"Layer":"污水","Name":"陵园路一体化泵站","lon":114.375943795,"lat":34.769425099999999,"ysNumber":0,"wsNumber":3,"yswater":"0","wswater":"0.7"}},{"type":"Feature","id":14,"geometry":{"type":"Point","coordinates":[114.3148602108178,34.785140412434828]},"properties":{"FID":14,"Layer":"污水","Name":"中途泵站","lon":114.314860211,"lat":34.785140412399997,"ysNumber":0,"wsNumber":7,"yswater":"0","wswater":"1.37"}},{"type":"Feature","id":15,"geometry":{"type":"Point","coordinates":[114.30788271631789,34.77759931964551]},"properties":{"FID":15,"Layer":"污水","Name":"魏都路泵站","lon":114.30788271599999,"lat":34.7775993196,"ysNumber":0,"wsNumber":4,"yswater":"0","wswater":"0.85"}},{"type":"Feature","id":16,"geometry":{"type":"Point","coordinates":[114.37597110760814,34.783202090692711]},"properties":{"FID":16,"Layer":"污水","Name":"重工路泵站","lon":114.375971108,"lat":34.783202090700001,"ysNumber":0,"wsNumber":4,"yswater":"0","wswater":"1.21"}},{"type":"Feature","id":17,"geometry":{"type":"Point","coordinates":[114.36645342601892,34.798051629735284]},"properties":{"FID":17,"Layer":"合流","Name":"海洋馆泵站","lon":114.36645342600001,"lat":34.798051629699998,"ysNumber":6,"wsNumber":5,"yswater":"2.9","wswater":"0.58"}},{"type":"Feature","id":18,"geometry":{"type":"Point","coordinates":[114.36416291216987,34.773162429921896]},"properties":{"FID":18,"Layer":"合流","Name":"铁北街泵站","lon":114.364162912,"lat":34.773162429899998,"ysNumber":5,"wsNumber":2,"yswater":"1.3","wswater":"0.111"}}]}
\ No newline at end of file
diff --git a/src/assets/geojson/kaifeng/wuShuiChang.json b/src/assets/geojson/kaifeng/wuShuiChang.json
new file mode 100644
index 0000000..05cd451
--- /dev/null
+++ b/src/assets/geojson/kaifeng/wuShuiChang.json
@@ -0,0 +1 @@
+{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.28123597781243,34.771350841956895]},"properties":{"FID":0,"Id":0,"name":"马家河污水处理厂","designSize":"10","criterion":"一级 A","towater":"马家河北支","lon":114.281235978,"lat":34.771350841999997}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.31521289637995,34.753686318314848]},"properties":{"FID":1,"Id":0,"name":"西区污水处理厂","designSize":"12","criterion":"一级 A","towater":"马家河","lon":114.31521289600001,"lat":34.753686318299998}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.3358047995138,34.78658153390905]},"properties":{"FID":2,"Id":0,"name":"包公湖污水处理厂","designSize":"2","criterion":"准Ⅳ","towater":"黄汴河","lon":114.33580480000001,"lat":34.786581533899998}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.38093674073218,34.772004765430317]},"properties":{"FID":3,"Id":0,"name":"东区污水处理厂","designSize":"20","criterion":"一级 A","towater":"惠济河","lon":114.380936741,"lat":34.772004765399998}},{"type":"Feature","id":4,"geometry":{"type":"Point","coordinates":[114.39210355123265,34.827484278242849]},"properties":{"FID":4,"Id":0,"name":"北区污水处理厂","designSize":"5","criterion":"准Ⅳ","towater":"东郊沟","lon":114.39210355100001,"lat":34.827484278199996}},{"type":"Feature","id":5,"geometry":{"type":"Point","coordinates":[114.41412308338079,34.729598011384006]},"properties":{"FID":5,"Id":0,"name":"精细化工产业区污水处理厂","designSize":"2","criterion":"一级 A","towater":" ","lon":114.41412308300001,"lat":34.7295980114}},{"type":"Feature","id":6,"geometry":{"type":"Point","coordinates":[114.44667852780671,34.722484644433187]},"properties":{"FID":6,"Id":0,"name":"祥符区污水处理厂","designSize":"4","criterion":"一级A","towater":"马家河","lon":114.44667852800001,"lat":34.722484644399998}}]}
\ No newline at end of file
diff --git a/src/assets/geojson/kaifeng/ysBengZhan.json b/src/assets/geojson/kaifeng/ysBengZhan.json
new file mode 100644
index 0000000..b3a48ab
--- /dev/null
+++ b/src/assets/geojson/kaifeng/ysBengZhan.json
@@ -0,0 +1 @@
+{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.33167432644986,34.813796784857281]},"properties":{"FID":0,"Layer":"雨水","Name":"金耀门泵站","lon":114.331674326,"lat":34.813796784899999,"ysNumber":2,"wsNumber":0,"yswater":"0.25"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.32417783240864,34.81410117080717]},"properties":{"FID":1,"Layer":"雨水","Name":"西环路泵站","lon":114.324177832,"lat":34.814101170800001,"ysNumber":5,"wsNumber":0,"yswater":"20"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.34284796364797,34.781843275915001]},"properties":{"FID":2,"Layer":"雨水","Name":"大南门泵站","lon":114.342847964,"lat":34.781843275900002,"ysNumber":4,"wsNumber":0,"yswater":"4.44"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.36789736380371,34.772872621142433]},"properties":{"FID":3,"Layer":"雨水","Name":"禹王台泵站","lon":114.367897364,"lat":34.772872621099999,"ysNumber":2,"wsNumber":0,"yswater":"3.15"}},{"type":"Feature","id":4,"geometry":{"type":"Point","coordinates":[114.39595923246809,34.777007031063107]},"properties":{"FID":4,"Layer":"雨水","Name":"东立交泵站","lon":114.395959232,"lat":34.777007031099998,"ysNumber":3,"wsNumber":0,"yswater":"0.24"}},{"type":"Feature","id":5,"geometry":{"type":"Point","coordinates":[114.34058289381456,34.771380801424577]},"properties":{"FID":5,"Layer":"雨水","Name":"官坊立交泵站","lon":114.34058289399999,"lat":34.771380801399999,"ysNumber":3,"wsNumber":0,"yswater":"0.75"}},{"type":"Feature","id":6,"geometry":{"type":"Point","coordinates":[114.34027528378151,34.768957653249963]},"properties":{"FID":6,"Layer":"雨水","Name":"金梁里泵站","lon":114.340275284,"lat":34.768957653199998,"ysNumber":2,"wsNumber":0,"yswater":"0.22"}},{"type":"Feature","id":7,"geometry":{"type":"Point","coordinates":[114.33222421064397,34.771554187805066]},"properties":{"FID":7,"Layer":"雨水","Name":"西立交泵站","lon":114.332224211,"lat":34.7715541878,"ysNumber":2,"wsNumber":0,"yswater":"0.47"}},{"type":"Feature","id":8,"geometry":{"type":"Point","coordinates":[114.36451517766994,34.76594093005199]},"properties":{"FID":8,"Layer":"雨水","Name":"花园街泵站","lon":114.364515178,"lat":34.765940930100001,"ysNumber":2,"wsNumber":0,"yswater":"0.03"}},{"type":"Feature","id":9,"geometry":{"type":"Point","coordinates":[114.33738094803121,34.772177856110709]},"properties":{"FID":9,"Layer":"雨水","Name":"化三泵站","lon":114.337380948,"lat":34.772177856100001,"ysNumber":4,"wsNumber":0,"yswater":"0.111"}},{"type":"Feature","id":10,"geometry":{"type":"Point","coordinates":[114.35815067082993,34.77337174385648]},"properties":{"FID":10,"Layer":"雨水","Name":"东闸口泵站","lon":114.358150671,"lat":34.7733717439,"ysNumber":3,"wsNumber":0,"yswater":"0.39"}},{"type":"Feature","id":11,"geometry":{"type":"Point","coordinates":[114.32379602678792,34.82494987875603]},"properties":{"FID":11,"Layer":"雨水","Name":"东京大道泵站","lon":114.323796027,"lat":34.824949878799998,"ysNumber":6,"wsNumber":0,"yswater":"23"}},{"type":"Feature","id":12,"geometry":{"type":"Point","coordinates":[114.36863773061212,34.764531502671531]},"properties":{"FID":12,"Layer":"雨水","Name":"华夏大道泵站","lon":114.36863773100001,"lat":34.764531502700002,"ysNumber":6,"wsNumber":0,"yswater":"12"}},{"type":"Feature","id":13,"geometry":{"type":"Point","coordinates":[114.28119335571743,34.780232758031538]},"properties":{"FID":13,"Layer":"雨水","Name":"新区二号泵站","lon":114.281193356,"lat":34.780232757999997,"ysNumber":6,"wsNumber":0,"yswater":"14.95"}},{"type":"Feature","id":14,"geometry":{"type":"Point","coordinates":[114.27075013641387,34.78905253485037]},"properties":{"FID":14,"Layer":"雨水","Name":"新区一号泵站","lon":114.270750136,"lat":34.789052534900001,"ysNumber":5,"wsNumber":0,"yswater":"10.2"}},{"type":"Feature","id":15,"geometry":{"type":"Point","coordinates":[114.2798130338245,34.77913291034838]},"properties":{"FID":15,"Layer":"雨水","Name":"新区三号泵站","lon":114.279813034,"lat":34.7791329103,"ysNumber":4,"wsNumber":0,"yswater":"7.7"}},{"type":"Feature","id":16,"geometry":{"type":"Point","coordinates":[114.21167454828185,34.807762640580506]},"properties":{"FID":16,"Layer":"雨水","Name":"新区五号泵站","lon":114.211674548,"lat":34.807762640599996,"ysNumber":4,"wsNumber":0,"yswater":"3.42"}},{"type":"Feature","id":17,"geometry":{"type":"Point","coordinates":[114.21909733930421,34.778725139828168]},"properties":{"FID":17,"Layer":"雨水","Name":"新区六号泵站","lon":114.219097339,"lat":34.778725139800002,"ysNumber":6,"wsNumber":0,"yswater":"14.2"}},{"type":"Feature","id":18,"geometry":{"type":"Point","coordinates":[114.27522423372798,34.825332079611812]},"properties":{"FID":18,"Layer":"雨水","Name":"新区七号泵站","lon":114.27522423400001,"lat":34.825332079600003,"ysNumber":6,"wsNumber":0,"yswater":"13"}},{"type":"Feature","id":19,"geometry":{"type":"Point","coordinates":[114.2963828469167,34.774431499614359]},"properties":{"FID":19,"Layer":"雨水","Name":"金明大道陇海立交泵站","lon":114.296382847,"lat":34.774431499599999,"ysNumber":3,"wsNumber":0,"yswater":"0.6"}},{"type":"Feature","id":20,"geometry":{"type":"Point","coordinates":[114.26895926766986,34.774052571120166]},"properties":{"FID":20,"Layer":"雨水","Name":"一大街立交泵站","lon":114.268959268,"lat":34.7740525711,"ysNumber":2,"wsNumber":0,"yswater":"0.82"}},{"type":"Feature","id":21,"geometry":{"type":"Point","coordinates":[114.29111664686717,34.824567884137792]},"properties":{"FID":21,"Layer":"雨水","Name":"东京大道环堤路泵站","lon":114.291116647,"lat":34.824567884099999,"ysNumber":2,"wsNumber":0,"yswater":"0.14"}},{"type":"Feature","id":22,"geometry":{"type":"Point","coordinates":[114.27947482774283,34.802580148339061]},"properties":{"FID":22,"Layer":"雨水","Name":"郑开大道环堤路泵站","lon":114.27947482800001,"lat":34.802580148300002,"ysNumber":3,"wsNumber":0,"yswater":"1.25"}},{"type":"Feature","id":23,"geometry":{"type":"Point","coordinates":[114.32584815799478,34.804150195214611]},"properties":{"FID":23,"Layer":"雨水","Name":"大梁路泵站","lon":114.325848158,"lat":34.804150195200002,"ysNumber":2,"wsNumber":0,"yswater":"3.16"}},{"type":"Feature","id":24,"geometry":{"type":"Point","coordinates":[114.39840848113086,34.793725142040017]},"properties":{"FID":24,"Layer":"雨水","Name":"东郊沟雨水泵站","lon":114.398408481,"lat":34.793725142,"ysNumber":4,"wsNumber":0,"yswater":"9.8"}}]}
\ No newline at end of file
diff --git a/src/views/floodSys/floodOneMap/commonPopup.vue b/src/views/floodSys/floodOneMap/commonPopup.vue
index c21fed9..d9ddec6 100644
--- a/src/views/floodSys/floodOneMap/commonPopup.vue
+++ b/src/views/floodSys/floodOneMap/commonPopup.vue
@@ -5,6 +5,7 @@
{{ allData.dataList.pumpName }}
{{ allData.dataList.sewageName }}
{{ allData.dataList.roadName }}
+ {{ allData.dataList.name }}
@@ -122,6 +123,56 @@
+
+
+
+
+
设计规模：
+
{{ allData.dataList.designSize }}万吨/天
+
出水标准：
+
{{ allData.dataList.criterion }}
+
+
+
排放水体：
+
{{ allData.dataList.towater }}
+
+
+
+
+
+
泵机台数：
+
{{ allData.dataList.ysNumber }}台
+
抽排量：
+
{{ allData.dataList.yswater }}m³/s
+
+
+
泵站类型：
+
{{ allData.dataList.Layer }}
+
+
+
+
+
+
雨水泵机台数：
+
{{ allData.dataList.ysNumber }}台
+
雨水抽排量：
+
{{ allData.dataList.yswater }}m³/s
+
+
+
污水泵机台数：
+
{{ allData.dataList.wsNumber }}台
+
污水抽排量：
+
{{ allData.dataList.wswater }}m³/s
+
+
+
泵站类型：
+
{{ allData.dataList.Layer }}
+
+
+
{{ allData.dataList.pumpName }}
{{ allData.dataList.sewageName }}
{{ allData.dataList.roadName }}
+ {{ allData.dataList.name }}
@@ -122,6 +123,56 @@
+
+
+
+
+
设计规模：
+
{{ allData.dataList.designSize }}万吨/天
+
出水标准：
+
{{ allData.dataList.criterion }}
+
+
+
排放水体：
+
{{ allData.dataList.towater }}
+
+
+
+
+
+
泵机台数：
+
{{ allData.dataList.ysNumber }}台
+
抽排量：
+
{{ allData.dataList.yswater }}m³/s
+
+
+
泵站类型：
+
{{ allData.dataList.Layer }}
+
+
+
+
+
+
雨水泵机台数：
+
{{ allData.dataList.ysNumber }}台
+
雨水抽排量：
+
{{ allData.dataList.yswater }}m³/s
+
+
+
污水泵机台数：
+
{{ allData.dataList.wsNumber }}台
+
污水抽排量：
+
{{ allData.dataList.wswater }}m³/s
+
+
+
泵站类型：
+
{{ allData.dataList.Layer }}
+
+
+
{{ allData.dataList.pumpName }}
{{ allData.dataList.sewageName }}
{{ allData.dataList.roadName }}
+ {{ allData.dataList.name }}
@@ -122,6 +123,56 @@
+
+
+
+
+
设计规模：
+
{{ allData.dataList.designSize }}万吨/天
+
出水标准：
+
{{ allData.dataList.criterion }}
+
+
+
排放水体：
+
{{ allData.dataList.towater }}
+
+
+
+
+
+
泵机台数：
+
{{ allData.dataList.ysNumber }}台
+
抽排量：
+
{{ allData.dataList.yswater }}m³/s
+
+
+
泵站类型：
+
{{ allData.dataList.Layer }}
+
+
+
+
+
+
雨水泵机台数：
+
{{ allData.dataList.ysNumber }}台
+
雨水抽排量：
+
{{ allData.dataList.yswater }}m³/s
+
+
+
污水泵机台数：
+
{{ allData.dataList.wsNumber }}台
+
污水抽排量：
+
{{ allData.dataList.wswater }}m³/s
+
+
+
泵站类型：
+
{{ allData.dataList.Layer }}
+
+
+
{{ allData.dataList.pumpName }}
{{ allData.dataList.sewageName }}
{{ allData.dataList.roadName }}
+ {{ allData.dataList.name }}
@@ -122,6 +123,56 @@
+
+
+
+
+
设计规模：
+
{{ allData.dataList.designSize }}万吨/天
+
出水标准：
+
{{ allData.dataList.criterion }}
+
+
+
排放水体：
+
{{ allData.dataList.towater }}
+
+
+
+
+
+
泵机台数：
+
{{ allData.dataList.ysNumber }}台
+
抽排量：
+
{{ allData.dataList.yswater }}m³/s
+
+
+
泵站类型：
+
{{ allData.dataList.Layer }}
+
+
+
+
+
+
雨水泵机台数：
+
{{ allData.dataList.ysNumber }}台
+
雨水抽排量：
+
{{ allData.dataList.yswater }}m³/s
+
+
+
污水泵机台数：
+
{{ allData.dataList.wsNumber }}台
+
污水抽排量：
+
{{ allData.dataList.wswater }}m³/s
+
+
+
泵站类型：
+
{{ allData.dataList.Layer }}
+
+
+
{{ allData.dataList.pumpName }}
{{ allData.dataList.sewageName }}
{{ allData.dataList.roadName }}
+ {{ allData.dataList.name }}
@@ -122,6 +123,56 @@
+
+
+
+
+
设计规模：
+
{{ allData.dataList.designSize }}万吨/天
+
出水标准：
+
{{ allData.dataList.criterion }}
+
+
+
排放水体：
+
{{ allData.dataList.towater }}
+
+
+
+
+
+
泵机台数：
+
{{ allData.dataList.ysNumber }}台
+
抽排量：
+
{{ allData.dataList.yswater }}m³/s
+
+
+
泵站类型：
+
{{ allData.dataList.Layer }}
+
+
+
+
+
+
雨水泵机台数：
+
{{ allData.dataList.ysNumber }}台
+
雨水抽排量：
+
{{ allData.dataList.yswater }}m³/s
+
+
+
污水泵机台数：
+
{{ allData.dataList.wsNumber }}台
+
污水抽排量：
+
{{ allData.dataList.wswater }}m³/s
+
+
+
泵站类型：
+
{{ allData.dataList.Layer }}
+
+
+
{{ allData.dataList.pumpName }}
{{ allData.dataList.sewageName }}
{{ allData.dataList.roadName }}
+ {{ allData.dataList.name }}
@@ -122,6 +123,56 @@
+
+
+
+
+
设计规模：
+
{{ allData.dataList.designSize }}万吨/天
+
出水标准：
+
{{ allData.dataList.criterion }}
+
+
+
排放水体：
+
{{ allData.dataList.towater }}
+
+
+
+
+
+
泵机台数：
+
{{ allData.dataList.ysNumber }}台
+
抽排量：
+
{{ allData.dataList.yswater }}m³/s
+
+
+
泵站类型：
+
{{ allData.dataList.Layer }}
+
+
+
+
+
+
雨水泵机台数：
+
{{ allData.dataList.ysNumber }}台
+
雨水抽排量：
+
{{ allData.dataList.yswater }}m³/s
+
+
+
污水泵机台数：
+
{{ allData.dataList.wsNumber }}台
+
污水抽排量：
+
{{ allData.dataList.wswater }}m³/s
+
+
+
泵站类型：
+
{{ allData.dataList.Layer }}
+
+
+