diff --git a/src/utils/gis/NewFiberMapUtils.js b/src/utils/gis/NewFiberMapUtils.js index 0b7b257..f788c53 100644 --- a/src/utils/gis/NewFiberMapUtils.js +++ b/src/utils/gis/NewFiberMapUtils.js @@ -105,14 +105,14 @@ let polygons = pumpData.map(i => turf.feature(Terraformer.WKT.parse(i.geometrys),{style_:{id:keys.defaultPatrolDemo,...(_.cloneDeep(defaulGeoJSONParams.polygon))}})); NewFiberMapUtils.removeByIds([keys.defaultPreventWaterloggingDemo]); NewFiberMapUtils.weatherToMap(newfiberMap); - let modelLegends = cesiumMapLegend.map(i => i.children).flat(Infinity).filter(i => i.layername.includes('Line') && i.type == '3dModel'); + /* let modelLegends = cesiumMapLegend.map(i => i.children).flat(Infinity).filter(i => i.layername.includes('Line') && i.type == '3dModel'); let modelIds = modelLegends.map(i => i.layername); let models = newfiberMap.getMap().scene.primitives._primitives.filter(i => modelIds.includes(i.newfiberId)); if (models.length > 0) { models.forEach(i => i.show = true); } else { modelLegends.forEach(i => i.data.forEach(url => newfiberVectorLayer.add3DModelLayers(newfiberMap, url, i.layername))); - } + }*/ riverFlow.features.forEach(i => i.properties.style_ = {id: keys.defaultPreventWaterloggingDemo, ...(defaulGeoJSONParams.polyline)}); riverFlow.features = riverFlow.features.concat([...points,...polygons]); newfiberMap.geojsonToMap(riverFlow); @@ -174,6 +174,6 @@ const {keys} = NewFiberMapUtils.defaultParams; newfiberMap.removeByIds(ids); if (ids.includes(keys.defaultPatrolDemo)) if (newfiberMap.patrolDemoTracks) newfiberMap.patrolDemoTracks.forEach(i => i.destroy()), newfiberMap.patrolDemoTracks = undefined; - if (ids.includes(keys.defaultPreventWaterloggingDemo)) ["sewageLine", "rainLine", "combineLine"].forEach(i => newfiberVectorLayer.set3DModelVisible(i, false)), newfiberMap.weatherInterVal && clearInterval(newfiberMap.weatherInterVal), newfiberMap.weatherInterVal = undefined; + if (ids.includes(keys.defaultPreventWaterloggingDemo)) newfiberMap.weatherInterVal && clearInterval(newfiberMap.weatherInterVal), newfiberMap.weatherInterVal = undefined; } }