Refactoring

This commit is contained in:
ISA
2024-09-03 22:55:57 +02:00
parent e60ce2b354
commit 193d1e2f2f
6 changed files with 88 additions and 64 deletions

View File

@@ -1,8 +1,6 @@
import { useEffect, useState } from "react";
import L from "leaflet";
import { createAndSetDevices } from "../../utils/createAndSetDevices";
import { addContextMenuToMarker } from "../../utils/contextMenuUtils";
import { checkOverlappingMarkers } from "../../utils/mapUtils";
const useTalasMarkersLayer = (map, oms, GisSystemStatic, priorityConfig) => {
const [talasMarkers, setTalasMarkers] = useState([]);
@@ -14,12 +12,11 @@ const useTalasMarkersLayer = (map, oms, GisSystemStatic, priorityConfig) => {
}, [GisSystemStatic, map, priorityConfig]);
useEffect(() => {
if (map && talasMarkers.length) {
if (map && talasMarkers.length && oms) {
talasMarkers.forEach((marker) => {
marker.addTo(map);
oms.addMarker(marker);
oms.addMarker(marker); // Erst zu OMS hinzufügen
marker.addTo(map); // Dann zum Map hinzufügen
// Popup beim Überfahren mit der Maus öffnen und schließen
marker.on("mouseover", function () {
this.openPopup();
});
@@ -27,19 +24,10 @@ const useTalasMarkersLayer = (map, oms, GisSystemStatic, priorityConfig) => {
this.closePopup();
});
addContextMenuToMarker(marker);
addContextMenuToMarker(marker); // Kontextmenü-Event hinzufügen
});
// Disable map context menu
map.options.contextmenu = false;
map.options.contextmenuItems = [];
oms.map.options.contextmenu = false;
oms.map.options.contextmenuItems = [];
// Call the function to check for overlapping markers
checkOverlappingMarkers(oms, map);
}
}, [map, talasMarkers]);
}, [map, talasMarkers, oms]);
return talasMarkers;
};