diff --git a/public/static/libs/mapbox/night-style1.json b/public/static/libs/mapbox/night-style1.json index d97a042..531aabf 100644 --- a/public/static/libs/mapbox/night-style1.json +++ b/public/static/libs/mapbox/night-style1.json @@ -30,7 +30,7 @@ "type": "fill", "source": "openmaptiles", "source-layer": "landuse", - "minzoom": 15, + "minzoom": 14, "filter": [ "all", [ @@ -59,7 +59,7 @@ "type": "fill", "source": "openmaptiles", "source-layer": "landcover", - "minzoom": 15, + "minzoom": 14, "filter": [ "==", "class", @@ -257,7 +257,7 @@ "type": "line", "source": "openmaptiles", "source-layer": "waterway", - "minzoom": 15, + "minzoom": 14, "filter": [ "all", [ @@ -313,7 +313,7 @@ "type": "line", "source": "openmaptiles", "source-layer": "waterway", - "minzoom": 15, + "minzoom": 14, "filter": [ "all", [ @@ -615,7 +615,7 @@ "type": "line", "source": "openmaptiles", "source-layer": "transportation", - "minzoom": 15, + "minzoom": 14, "filter": [ "all", [ @@ -656,7 +656,7 @@ "type": "line", "source": "openmaptiles", "source-layer": "transportation", - "minzoom": 15, + "minzoom": 14, "filter": [ "all", [ @@ -772,7 +772,7 @@ "type": "line", "source": "openmaptiles", "source-layer": "transportation", - "minzoom": 15, + "minzoom": 14, "filter": [ "all", [ @@ -1063,7 +1063,7 @@ "type": "line", "source": "openmaptiles", "source-layer": "transportation", - "minzoom": 15, + "minzoom": 14, "filter": [ "all", [ @@ -1716,7 +1716,7 @@ "type": "symbol", "source": "openmaptiles", "source-layer": "poi", - "minzoom": 15, + "minzoom": 14, "filter": [ "all", [ @@ -1792,7 +1792,7 @@ "type": "symbol", "source": "openmaptiles", "source-layer": "transportation_name", - "minzoom": 15, + "minzoom": 14, "filter": [ "==", "$type", @@ -1834,7 +1834,7 @@ "type": "symbol", "source": "openmaptiles", "source-layer": "place", - "minzoom": 15, + "minzoom": 14, "filter": [ "all", [ @@ -2008,7 +2008,7 @@ "metadata": {}, "source": "openmaptiles", "source-layer": "building", - "minzoom": 15, + "minzoom": 14, "filter": [ "all", [ diff --git a/public/static/libs/mapbox/night-style1.json b/public/static/libs/mapbox/night-style1.json index d97a042..531aabf 100644 --- a/public/static/libs/mapbox/night-style1.json +++ b/public/static/libs/mapbox/night-style1.json @@ -30,7 +30,7 @@ "type": "fill", "source": "openmaptiles", "source-layer": "landuse", - "minzoom": 15, + "minzoom": 14, "filter": [ "all", [ @@ -59,7 +59,7 @@ "type": "fill", "source": "openmaptiles", "source-layer": "landcover", - "minzoom": 15, + "minzoom": 14, "filter": [ "==", "class", @@ -257,7 +257,7 @@ "type": "line", "source": "openmaptiles", "source-layer": "waterway", - "minzoom": 15, + "minzoom": 14, "filter": [ "all", [ @@ -313,7 +313,7 @@ "type": "line", "source": "openmaptiles", "source-layer": "waterway", - "minzoom": 15, + "minzoom": 14, "filter": [ "all", [ @@ -615,7 +615,7 @@ "type": "line", "source": "openmaptiles", "source-layer": "transportation", - "minzoom": 15, + "minzoom": 14, "filter": [ "all", [ @@ -656,7 +656,7 @@ "type": "line", "source": "openmaptiles", "source-layer": "transportation", - "minzoom": 15, + "minzoom": 14, "filter": [ "all", [ @@ -772,7 +772,7 @@ "type": "line", "source": "openmaptiles", "source-layer": "transportation", - "minzoom": 15, + "minzoom": 14, "filter": [ "all", [ @@ -1063,7 +1063,7 @@ "type": "line", "source": "openmaptiles", "source-layer": "transportation", - "minzoom": 15, + "minzoom": 14, "filter": [ "all", [ @@ -1716,7 +1716,7 @@ "type": "symbol", "source": "openmaptiles", "source-layer": "poi", - "minzoom": 15, + "minzoom": 14, "filter": [ "all", [ @@ -1792,7 +1792,7 @@ "type": "symbol", "source": "openmaptiles", "source-layer": "transportation_name", - "minzoom": 15, + "minzoom": 14, "filter": [ "==", "$type", @@ -1834,7 +1834,7 @@ "type": "symbol", "source": "openmaptiles", "source-layer": "place", - "minzoom": 15, + "minzoom": 14, "filter": [ "all", [ @@ -2008,7 +2008,7 @@ "metadata": {}, "source": "openmaptiles", "source-layer": "building", - "minzoom": 15, + "minzoom": 14, "filter": [ "all", [ diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index 3fce5d1..32cc801 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -138,7 +138,7 @@ setHighlight_(properties); ysFlow(); newfiberMap.getLayers().filter((i) => i.newfiberId == "村域边界")[0].setData(turf.featureCollection([])); - busEmit(removeMapDatas.key, _keys); + busEmit(removeMapDatas.key, _keys.filter(i => i != (properties || {}).type)); if (town.prevId) { busEmit(setLayerVisible.key, { layername: town.key, isCheck: true }); @@ -388,14 +388,12 @@ if (!properties.geometry || properties.geometry.includes('POINT')) return; let geojson = turf.polygonToLine(Terraformer.WKT.parse(properties.geometry)); geojson = geojson.features ? geojson : turf.featureCollection([geojson]); - geojson.features.forEach( - (i) => (i.properties = { color: "rgba(255,255,0,1)", type: temporary }) - ); + geojson.features.forEach((i) => (i.properties = { color: "rgba(255,255,0,1)", type: temporary })); bus.emit("setGeoJSON", { json: geojson, key: temporary }); - newfiberMap + /* newfiberMap .getLayers() .filter((i) => i.newfiberId == "村域边界")[0] - .setData(geojson); + .setData(geojson);*/ } const getModalData = () => { @@ -445,20 +443,8 @@ busEmit(setHighlight.key, []); // busEmit(setLayerVisible.key, { layername: obj.type, isCheck: true }); // debugger; - let features = ["point", "linestring", "polygon", "hb_wh_dhgx_merge"] - .map((key) => - newfiberMap.map - .getSource(key) - ._options.data.features.filter( - (i) => - (i.properties.name || "").includes(obj.name) && - (obj.id ? obj.id == i.properties.pid : true) - ) - ) - .flat(); - let feature = - features.filter((i) => i.properties.name == obj.name)[0] || - features[_.random(0, features.length - 1)]; + let features = ["point", "linestring", "polygon", "hb_wh_dhgx_merge"].map((key) => newfiberMap.map.getSource(key)._options.data.features.filter((i) => (i.properties.name || "").includes(obj.name) && (obj.id ? obj.id == i.properties.pid : true))).flat(); + let feature = features.filter((i) => i.properties.name == obj.name)[0] || features[_.random(0, features.length - 1)]; if (!feature) return; busEmit(setHighlight.key, [feature]); mapCenterByData(turf.bbox(feature)); diff --git a/public/static/libs/mapbox/night-style1.json b/public/static/libs/mapbox/night-style1.json index d97a042..531aabf 100644 --- a/public/static/libs/mapbox/night-style1.json +++ b/public/static/libs/mapbox/night-style1.json @@ -30,7 +30,7 @@ "type": "fill", "source": "openmaptiles", "source-layer": "landuse", - "minzoom": 15, + "minzoom": 14, "filter": [ "all", [ @@ -59,7 +59,7 @@ "type": "fill", "source": "openmaptiles", "source-layer": "landcover", - "minzoom": 15, + "minzoom": 14, "filter": [ "==", "class", @@ -257,7 +257,7 @@ "type": "line", "source": "openmaptiles", "source-layer": "waterway", - "minzoom": 15, + "minzoom": 14, "filter": [ "all", [ @@ -313,7 +313,7 @@ "type": "line", "source": "openmaptiles", "source-layer": "waterway", - "minzoom": 15, + "minzoom": 14, "filter": [ "all", [ @@ -615,7 +615,7 @@ "type": "line", "source": "openmaptiles", "source-layer": "transportation", - "minzoom": 15, + "minzoom": 14, "filter": [ "all", [ @@ -656,7 +656,7 @@ "type": "line", "source": "openmaptiles", "source-layer": "transportation", - "minzoom": 15, + "minzoom": 14, "filter": [ "all", [ @@ -772,7 +772,7 @@ "type": "line", "source": "openmaptiles", "source-layer": "transportation", - "minzoom": 15, + "minzoom": 14, "filter": [ "all", [ @@ -1063,7 +1063,7 @@ "type": "line", "source": "openmaptiles", "source-layer": "transportation", - "minzoom": 15, + "minzoom": 14, "filter": [ "all", [ @@ -1716,7 +1716,7 @@ "type": "symbol", "source": "openmaptiles", "source-layer": "poi", - "minzoom": 15, + "minzoom": 14, "filter": [ "all", [ @@ -1792,7 +1792,7 @@ "type": "symbol", "source": "openmaptiles", "source-layer": "transportation_name", - "minzoom": 15, + "minzoom": 14, "filter": [ "==", "$type", @@ -1834,7 +1834,7 @@ "type": "symbol", "source": "openmaptiles", "source-layer": "place", - "minzoom": 15, + "minzoom": 14, "filter": [ "all", [ @@ -2008,7 +2008,7 @@ "metadata": {}, "source": "openmaptiles", "source-layer": "building", - "minzoom": 15, + "minzoom": 14, "filter": [ "all", [ diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index 3fce5d1..32cc801 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -138,7 +138,7 @@ setHighlight_(properties); ysFlow(); newfiberMap.getLayers().filter((i) => i.newfiberId == "村域边界")[0].setData(turf.featureCollection([])); - busEmit(removeMapDatas.key, _keys); + busEmit(removeMapDatas.key, _keys.filter(i => i != (properties || {}).type)); if (town.prevId) { busEmit(setLayerVisible.key, { layername: town.key, isCheck: true }); @@ -388,14 +388,12 @@ if (!properties.geometry || properties.geometry.includes('POINT')) return; let geojson = turf.polygonToLine(Terraformer.WKT.parse(properties.geometry)); geojson = geojson.features ? geojson : turf.featureCollection([geojson]); - geojson.features.forEach( - (i) => (i.properties = { color: "rgba(255,255,0,1)", type: temporary }) - ); + geojson.features.forEach((i) => (i.properties = { color: "rgba(255,255,0,1)", type: temporary })); bus.emit("setGeoJSON", { json: geojson, key: temporary }); - newfiberMap + /* newfiberMap .getLayers() .filter((i) => i.newfiberId == "村域边界")[0] - .setData(geojson); + .setData(geojson);*/ } const getModalData = () => { @@ -445,20 +443,8 @@ busEmit(setHighlight.key, []); // busEmit(setLayerVisible.key, { layername: obj.type, isCheck: true }); // debugger; - let features = ["point", "linestring", "polygon", "hb_wh_dhgx_merge"] - .map((key) => - newfiberMap.map - .getSource(key) - ._options.data.features.filter( - (i) => - (i.properties.name || "").includes(obj.name) && - (obj.id ? obj.id == i.properties.pid : true) - ) - ) - .flat(); - let feature = - features.filter((i) => i.properties.name == obj.name)[0] || - features[_.random(0, features.length - 1)]; + let features = ["point", "linestring", "polygon", "hb_wh_dhgx_merge"].map((key) => newfiberMap.map.getSource(key)._options.data.features.filter((i) => (i.properties.name || "").includes(obj.name) && (obj.id ? obj.id == i.properties.pid : true))).flat(); + let feature = features.filter((i) => i.properties.name == obj.name)[0] || features[_.random(0, features.length - 1)]; if (!feature) return; busEmit(setHighlight.key, [feature]); mapCenterByData(turf.bbox(feature)); diff --git a/src/views/pictureOnMap/page/DrainageSystem/index.vue b/src/views/pictureOnMap/page/DrainageSystem/index.vue index 3d85968..7f0a106 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/index.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/index.vue @@ -49,6 +49,7 @@ {key: "雨水分区", visible: true}, {key: "newfiber-XYZLayer", visible: true}, {key: "高清地图", visible: true}, + {key: "rain_water_pump_station_info", visible: true}, {key: "outlet_info2", visible: false}, {key: "排口流向", visible: false}, {key: "排口流向1", visible: false},