Browse Source

Fixing map markers data structure bug

master
GabrielTrettel 3 years ago
parent
commit
2ea3e734e0
  1. 13
      src/app/components/MapMarkerList.js
  2. 2
      src/app/components/MapModal.js
  3. 10
      src/app/components/map/OpenStreetMap.js

13
src/app/components/MapMarkerList.js

@ -1,3 +1,5 @@
import {useState} from "react";
function isRequestedValue(item, renderOptions) { function isRequestedValue(item, renderOptions) {
return ( return (
(item.name == "pluviometer" && renderOptions.citzen.pluviometer) || (item.name == "pluviometer" && renderOptions.citzen.pluviometer) ||
@ -13,10 +15,13 @@ function isRequestedValue(item, renderOptions) {
function MapMarkerList({ markers, renderOptions }) { function MapMarkerList({ markers, renderOptions }) {
if (!markers) return null; if (!markers) return null;
return [...markers.markers].filter(([_, item]) => {
return isRequestedValue(item, renderOptions);
});
const [selectedMarkers, _] = useState(new Map());
markers.markers.forEach((item,key) => {
if (isRequestedValue(item, renderOptions))
selectedMarkers.set(key, item);
})
return selectedMarkers
} }
export { MapMarkerList }; export { MapMarkerList };

2
src/app/components/MapModal.js

@ -231,7 +231,7 @@ function isPluviometer(name) {
function MapModal({ showModal, setShowModal, markers }) { function MapModal({ showModal, setShowModal, markers }) {
var currentMarker = undefined; var currentMarker = undefined;
//console.log(markers);
if (markers && showModal != null && markers.has(showModal)) { if (markers && showModal != null && markers.has(showModal)) {
currentMarker = markers.get(showModal); currentMarker = markers.get(showModal);
} }

10
src/app/components/map/OpenStreetMap.js

@ -35,7 +35,7 @@ function bindEventsToListeners(
} }
function notEmpy(lista) { function notEmpy(lista) {
return lista && lista.length > 0;
return lista && [...lista].length > 0;
} }
export default function OpenStreetMap({ export default function OpenStreetMap({
@ -71,13 +71,11 @@ export default function OpenStreetMap({
notEmpy(markersList) && notEmpy(markersList) &&
markersList.forEach((val, k) => { markersList.forEach((val, k) => {
// console.log(val);
if (val[1].name == "susceptibilityAreas") {
// console.log("floodzones")
insertPolygon(mapRef, val[1].ID, val[1].coordinate);
if (val.name == "susceptibilityAreas") {
insertPolygon(mapRef, val.ID, val.coordinate);
} }
else { else {
insertMarker(mapRef, val[1].ID, val[1].coordinate, val[1].image);
insertMarker(mapRef, val.ID, val.coordinate, val.image);
} }
}); });
} }

Loading…
Cancel
Save