diff --git a/src/app/api/Websockets/SocketClient.js b/src/app/api/Websockets/SocketClient.js index cc791de..ae10469 100644 --- a/src/app/api/Websockets/SocketClient.js +++ b/src/app/api/Websockets/SocketClient.js @@ -4,10 +4,12 @@ import { useFiltering } from '../../hooks/useFiltering'; function isRequestedValue(item, renderOptions) { if ( (item.name == "pluviometer" && renderOptions.citzen.pluviometer) || - (item.name == "officialPluviometer" && renderOptions.oficial.automaticPluviometer) || + /*(item.name == "automaticPluviometer" && + renderOptions.oficial.automaticPluviometer) ||*/ (item.name == "rain" && renderOptions.citzen.rain) || (item.name == "riverFlood" && renderOptions.citzen.riverFlood) || - (item.name == "floodZones" && renderOptions.citzen.floodRisk) + (item.name == "floodZones" && renderOptions.citzen.floodRisk) || + (item.name == "susceptibilityAreas" && renderOptions.oficial.susceptibilityAreas) ) { return true; @@ -16,26 +18,24 @@ function isRequestedValue(item, renderOptions) { function verify_existingSockets(formType, renderOptions) { if (formType.response == null && isRequestedValue(formType, renderOptions)) { - console.log("Resposta é null"); + // console.log("Resposta é null"); const socket = new WebSocket("wss://waterproofing.geog.uni-heidelberg.de/wss/hot/data?" + formType.endpoint); socket.onmessage = ({ data }) => { formType.response = data; } } - else { + /* else { console.log("\nresposta preenchida"); - } + }*/ } export default function SocketClient(dataOptionObject, focusChanged) { const [data, setData] = useState(useFiltering()); - useEffect(() => { - data.citizen.map((e) => verify_existingSockets(e, dataOptionObject)); - data.oficial.map((e) => verify_existingSockets(e, dataOptionObject)); + data.forms.map((e) => verify_existingSockets(e, dataOptionObject)); }, [dataOptionObject, focusChanged]); diff --git a/src/app/components/MapMarkerList.js b/src/app/components/MapMarkerList.js index c3d3665..55f8566 100644 --- a/src/app/components/MapMarkerList.js +++ b/src/app/components/MapMarkerList.js @@ -1,11 +1,12 @@ function isRequestedValue(item, renderOptions) { return ( (item.name == "pluviometer" && renderOptions.citzen.pluviometer) || - (item.name == "officialPluviometer" && + (item.name == "automaticPluviometer" && renderOptions.oficial.automaticPluviometer) || (item.name == "rain" && renderOptions.citzen.rain) || (item.name == "riverFlood" && renderOptions.citzen.riverFlood) || - (item.name == "floodZones" && renderOptions.citzen.floodRisk) + (item.name == "floodZones" && renderOptions.citzen.floodRisk) || + (item.name == "susceptibilityAreas" && renderOptions.oficial.susceptibilityAreas) ); } diff --git a/src/app/components/map/LeafLetMap.js b/src/app/components/map/LeafLetMap.js index 5f3d3fc..1046e13 100644 --- a/src/app/components/map/LeafLetMap.js +++ b/src/app/components/map/LeafLetMap.js @@ -75,21 +75,34 @@ async function insertMarker(mapRef, ID, coordinate, icon) { html: \`${icon}\`, iconSize: 70 }); - // Check if there is no other marker with same ID already in map if (!(${ID} in markers)) { // Creates marker object - markers[${ID}] = L.marker([${coordinate.latitude}, ${coordinate.longitude}], { ID: ${ID}}); - + markers[${ID}] = L.marker([${coordinate.latitude}, ${coordinate.longitude}], {icon: customIcon, ID: ${ID}}); // Add marker to map and bind callback event to its function markers[${ID}].addTo(map).on('click', onPopupClick); }`); } +async function insertPolygon(mapRef, ID, coordinate) { + // console.log("COORDENADAS: "+JSON.stringify(coordinate.coordinate)); + var coordinates = JSON.stringify(coordinate.coordinate); + // console.log(ID); + mapRef.injectJavaScript(` + polygons = (L.polygon(${coordinates}, { ID: ${ID}})); + + polygons.addTo(map); + `); + /* mapRef.injectJavaScript(` + + var polygon = L.polygon(${coordinates}).addTo(map); + `);*/ +} export { loadHTMLFile, handleEvent, insertMarker, + insertPolygon, goToRegion, setViewCode, deleteAllMarkers, diff --git a/src/app/components/map/Map.html b/src/app/components/map/Map.html index 7d1d8eb..5017ae0 100644 --- a/src/app/components/map/Map.html +++ b/src/app/components/map/Map.html @@ -51,6 +51,7 @@