fix: Duplizierte Kontextmenü-Einträge verhindert und Cleanup hinzugefügt
- Kontextmenü wird jetzt nur einmal hinzugefügt, wenn es noch nicht existiert. - Vor dem Hinzufügen wird geprüft, ob bereits Einträge existieren, um Duplikate zu vermeiden. - Kontextmenü wird entfernt, wenn außerhalb geklickt wird, um Speicherlecks zu verhindern. - Nutzung eines `Set()` für Menü-IDs, um doppelte Einträge sicher zu verhindern.
This commit is contained in:
@@ -85,9 +85,14 @@ import useLoadUserRights from "./hooks/useLoadUserRights";
|
|||||||
import useFetchWebServiceMap from "./hooks/useFetchWebServiceMap";
|
import useFetchWebServiceMap from "./hooks/useFetchWebServiceMap";
|
||||||
import useFetchPoiData from "./hooks/useFetchPoiData.js";
|
import useFetchPoiData from "./hooks/useFetchPoiData.js";
|
||||||
import useRestoreMapSettings from "./hooks/useRestoreMapSettings";
|
import useRestoreMapSettings from "./hooks/useRestoreMapSettings";
|
||||||
|
import { setSelectedPoi, clearSelectedPoi } from "../../redux/slices/selectedPoiSlice";
|
||||||
|
import { setupDevices } from "../../utils/setupDevices";
|
||||||
|
|
||||||
const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {
|
const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {
|
||||||
const dispatch = useDispatch();
|
const dispatch = useDispatch();
|
||||||
|
// Redux-States holen
|
||||||
|
const selectedPoi = useSelector((state) => state.selectedPoi);
|
||||||
|
const selectedDevice = useSelector((state) => state.selectedDevice);
|
||||||
const countdown = useSelector((state) => state.polylineContextMenu.countdown);
|
const countdown = useSelector((state) => state.polylineContextMenu.countdown);
|
||||||
const countdownActive = useSelector((state) => state.polylineContextMenu.countdownActive);
|
const countdownActive = useSelector((state) => state.polylineContextMenu.countdownActive);
|
||||||
const isPolylineContextMenuOpen = useSelector((state) => state.polylineContextMenu.isOpen);
|
const isPolylineContextMenuOpen = useSelector((state) => state.polylineContextMenu.isOpen);
|
||||||
@@ -132,7 +137,7 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {
|
|||||||
const [userId, setUserId] = useRecoilState(userIdState);
|
const [userId, setUserId] = useRecoilState(userIdState);
|
||||||
const [AddPoiModalWindowState, setAddPoiModalWindowState] = useState(false);
|
const [AddPoiModalWindowState, setAddPoiModalWindowState] = useState(false);
|
||||||
const [userRights, setUserRights] = useState(null);
|
const [userRights, setUserRights] = useState(null);
|
||||||
const setSelectedPoi = useSetRecoilState(selectedPoiState);
|
|
||||||
const [showPoiUpdateModal, setShowPoiUpdateModal] = useState(false);
|
const [showPoiUpdateModal, setShowPoiUpdateModal] = useState(false);
|
||||||
const [currentPoiData, setCurrentPoiData] = useState(null);
|
const [currentPoiData, setCurrentPoiData] = useState(null);
|
||||||
const [showVersionInfoModal, setShowVersionInfoModal] = useState(false);
|
const [showVersionInfoModal, setShowVersionInfoModal] = useState(false);
|
||||||
@@ -324,8 +329,8 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {
|
|||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (poiData.length === 0) return;
|
if (poiData.length === 0) return;
|
||||||
|
|
||||||
setupPOIs(map, locations, poiData, poiTypMap, userRights, poiLayerRef, setSelectedPoi, setLocationDeviceData, setDeviceName, setCurrentPoi, poiLayerVisible, fetchPoiData, toast, setShowPoiUpdateModal, setCurrentPoiData, deviceName);
|
setupPOIs(map, locations, poiData, poiTypMap, userRights, poiLayerRef, setSelectedPoi, setLocationDeviceData, setDeviceName, setCurrentPoi, poiLayerVisible, fetchPoiData, toast, setShowPoiUpdateModal, setCurrentPoiData, deviceName, dispatch);
|
||||||
}, [map, locations, onLocationUpdate, poiReadTrigger, isPoiTypLoaded, userRights, poiLayerVisible, poiData, poiTypMap]);
|
}, [map, locations, onLocationUpdate, poiReadTrigger, isPoiTypLoaded, userRights, poiLayerVisible, poiData, poiTypMap, dispatch]);
|
||||||
|
|
||||||
//---------------------------------------------
|
//---------------------------------------------
|
||||||
//console.log("priorityConfig in MapComponent2: ", priorityConfig);
|
//console.log("priorityConfig in MapComponent2: ", priorityConfig);
|
||||||
@@ -996,6 +1001,8 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {
|
|||||||
|
|
||||||
//---------------------------------------------
|
//---------------------------------------------
|
||||||
|
|
||||||
|
//--------------------------------------------
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
{useSelector((state) => state.addPoiOnPolyline.isOpen) && <AddPOIOnPolyline />}
|
{useSelector((state) => state.addPoiOnPolyline.isOpen) && <AddPOIOnPolyline />}
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
// /config/appVersion
|
// /config/appVersion
|
||||||
export const APP_VERSION = "1.1.53";
|
export const APP_VERSION = "1.1.54";
|
||||||
|
|||||||
14
redux/slices/selectedDeviceSlice.js
Normal file
14
redux/slices/selectedDeviceSlice.js
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
// redux/slices/selectedDeviceSlice.js
|
||||||
|
import { createSlice } from "@reduxjs/toolkit";
|
||||||
|
|
||||||
|
export const selectedDeviceSlice = createSlice({
|
||||||
|
name: "selectedDevice",
|
||||||
|
initialState: null,
|
||||||
|
reducers: {
|
||||||
|
setSelectedDevice: (state, action) => action.payload, // Speichert Device-Daten
|
||||||
|
clearSelectedDevice: () => null, // Entfernt das Gerät aus dem State
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
export const { setSelectedDevice, clearSelectedDevice } = selectedDeviceSlice.actions;
|
||||||
|
export default selectedDeviceSlice.reducer;
|
||||||
@@ -1,8 +1,14 @@
|
|||||||
// redux/slices/selectedPoiSlice.js
|
// redux/slices/selectedPoiSlice.js
|
||||||
//Ist gedacht um ausgewählte Poi Informationen zu speichern und zu PoiUpdateModal.js zu übergeben
|
import { createSlice } from "@reduxjs/toolkit";
|
||||||
import { atom } from "recoil";
|
|
||||||
|
|
||||||
export const selectedPoiState = atom({
|
export const selectedPoiSlice = createSlice({
|
||||||
key: "poiState", // Einzigartiger Key (mit der gesamten Anwendung)
|
name: "selectedPoi",
|
||||||
default: null, // Standardwert
|
initialState: null,
|
||||||
|
reducers: {
|
||||||
|
setSelectedPoi: (state, action) => action.payload, // Speichert POI-Daten
|
||||||
|
clearSelectedPoi: () => null, // Entfernt POI aus dem State
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
export const { setSelectedPoi, clearSelectedPoi } = selectedPoiSlice.actions;
|
||||||
|
export default selectedPoiSlice.reducer;
|
||||||
|
|||||||
@@ -12,6 +12,8 @@ import gisStationsStaticReducer from "./slices/webService/gisStationsStaticSlice
|
|||||||
import poiTypesReducer from "./slices/db/poiTypesSlice";
|
import poiTypesReducer from "./slices/db/poiTypesSlice";
|
||||||
import addPoiOnPolylineReducer from "./slices/addPoiOnPolylineSlice";
|
import addPoiOnPolylineReducer from "./slices/addPoiOnPolylineSlice";
|
||||||
import polylineContextMenuReducer from "./slices/polylineContextMenuSlice";
|
import polylineContextMenuReducer from "./slices/polylineContextMenuSlice";
|
||||||
|
import selectedPoiReducer from "./slices/selectedPoiSlice";
|
||||||
|
import selectedDeviceReducer from "./slices/selectedDeviceSlice";
|
||||||
|
|
||||||
export const store = configureStore({
|
export const store = configureStore({
|
||||||
reducer: {
|
reducer: {
|
||||||
@@ -27,5 +29,7 @@ export const store = configureStore({
|
|||||||
poiTypes: poiTypesReducer,
|
poiTypes: poiTypesReducer,
|
||||||
addPoiOnPolyline: addPoiOnPolylineReducer,
|
addPoiOnPolyline: addPoiOnPolylineReducer,
|
||||||
polylineContextMenu: polylineContextMenuReducer,
|
polylineContextMenu: polylineContextMenuReducer,
|
||||||
|
selectedPoi: selectedPoiReducer,
|
||||||
|
selectedDevice: selectedDeviceReducer,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,31 +1,38 @@
|
|||||||
// contextMenuUtils.js
|
// utils/contextMenuUtils.js
|
||||||
import { BASE_URL } from "../config/urls";
|
import { BASE_URL } from "../config/urls";
|
||||||
|
import { store } from "../redux/store"; // Redux-Store importieren
|
||||||
|
|
||||||
export function addContextMenuToMarker(marker) {
|
export function addContextMenuToMarker(marker) {
|
||||||
marker.unbindContextMenu(); // Entferne das Kontextmenü, um Duplikate zu vermeiden
|
marker.unbindContextMenu(); // Entferne das Kontextmenü, um Duplikate zu vermeiden
|
||||||
|
|
||||||
|
const selectedDevice = store.getState().selectedDevice; // Redux-Wert abrufen
|
||||||
|
|
||||||
|
const contextMenuItems = [];
|
||||||
|
|
||||||
|
// ✅ Nur hinzufügen, wenn `selectedDevice` vorhanden ist
|
||||||
|
if (selectedDevice && marker.options?.idDevice) {
|
||||||
|
contextMenuItems.push({
|
||||||
|
text: "Station öffnen (Tab)",
|
||||||
|
icon: "/img/screen_new.png",
|
||||||
|
callback: (e) => openInNewTab(e, marker),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Falls weitere Kontextmenü-Optionen nötig sind, können sie hier hinzugefügt werden.
|
||||||
|
|
||||||
marker.bindContextMenu({
|
marker.bindContextMenu({
|
||||||
contextmenu: true,
|
contextmenu: true,
|
||||||
contextmenuWidth: 140,
|
contextmenuWidth: 140,
|
||||||
contextmenuItems: [
|
contextmenuItems: contextMenuItems,
|
||||||
/* {
|
|
||||||
text: "Station öffnen (Tab)",
|
|
||||||
icon: "/img/screen_new.png",
|
|
||||||
callback: (e) => openInNewTab(e, marker),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
text: "Station öffnen",
|
|
||||||
icon: "/img/screen_same.png",
|
|
||||||
callback: (e) => openInSameWindow(e, marker),
|
|
||||||
}, */
|
|
||||||
],
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// Funktion zum Öffnen in einem neuen Tab
|
// Funktion zum Öffnen in einem neuen Tab
|
||||||
export function openInNewTab(e, marker) {
|
export function openInNewTab(e, marker) {
|
||||||
const baseUrl = BASE_URL;
|
const baseUrl = BASE_URL;
|
||||||
console.log("baseUrl:", baseUrl);
|
console.log("baseUrl:", baseUrl);
|
||||||
|
|
||||||
if (marker && marker.options && marker.options.link) {
|
if (marker && marker.options && marker.options.link) {
|
||||||
//console.log("Marker data:", baseUrl + marker.options.link);
|
|
||||||
window.open(baseUrl + marker.options.link, "_blank");
|
window.open(baseUrl + marker.options.link, "_blank");
|
||||||
} else {
|
} else {
|
||||||
console.error("Fehler: Marker hat keine gültige 'link' Eigenschaft");
|
console.error("Fehler: Marker hat keine gültige 'link' Eigenschaft");
|
||||||
|
|||||||
@@ -6,6 +6,8 @@ import * as config from "../config/config.js";
|
|||||||
import { disablePolylineEvents, enablePolylineEvents } from "./polylines/setupPolylines.js";
|
import { disablePolylineEvents, enablePolylineEvents } from "./polylines/setupPolylines.js";
|
||||||
import { store } from "../redux/store";
|
import { store } from "../redux/store";
|
||||||
import { updateLineStatus } from "../redux/slices/lineVisibilitySlice";
|
import { updateLineStatus } from "../redux/slices/lineVisibilitySlice";
|
||||||
|
import { setSelectedDevice, clearSelectedDevice } from "../redux/slices/selectedDeviceSlice";
|
||||||
|
import { addContextMenuToMarker } from "./contextMenuUtils.js";
|
||||||
|
|
||||||
const determinePriority = (iconPath, priorityConfig) => {
|
const determinePriority = (iconPath, priorityConfig) => {
|
||||||
for (let priority of priorityConfig) {
|
for (let priority of priorityConfig) {
|
||||||
@@ -80,39 +82,98 @@ export const createAndSetDevices = async (systemId, setMarkersFunction, GisSyste
|
|||||||
areaName: station.Area_Name,
|
areaName: station.Area_Name,
|
||||||
link: station.Link,
|
link: station.Link,
|
||||||
zIndexOffset: zIndexOffset,
|
zIndexOffset: zIndexOffset,
|
||||||
|
deviceName: station.Device,
|
||||||
|
idDevice: station.IdLD, // ✅ Sicherstellen, dass `idDevice` existiert
|
||||||
});
|
});
|
||||||
|
const popupContent = `
|
||||||
marker.bindPopup(`
|
<div class="bg-white rounded-lg">
|
||||||
<div class="bg-white rounded-lg">
|
<span class="text-lg font-semibold text-gray-900">${station.LD_Name}</span>
|
||||||
<span class="text-lg font-semibold text-gray-900"> ${station.LD_Name}</span>
|
<span class="text-md font-bold text-gray-800">${station.Device}</span><br>
|
||||||
<span class="text-md font-bold text-gray-800">${station.Device}</span><br>
|
<span class="text-gray-800"><strong>${station.Area_Short}</strong> (${station.Area_Name})</span><br>
|
||||||
<span class="text-gray-800"><strong>${station.Area_Short}</strong> (${station.Area_Name})</span><br>
|
<span class="text-gray-800"><strong>${station.Location_Short}</strong> (${station.Location_Name})</span>
|
||||||
<span class="text-gray-800"><strong>${station.Location_Short}</strong> (${station.Location_Name})</span>
|
<div class="mt-2">
|
||||||
<div class="mt-2">
|
${statusDistrictData.Statis.filter((status) => status.IdLD === station.IdLD)
|
||||||
${statusDistrictData.Statis.filter((status) => status.IdLD === station.IdLD)
|
.reverse()
|
||||||
.reverse()
|
.map(
|
||||||
.map(
|
(status) => `
|
||||||
(status) => `
|
<div class="flex items-center my-1">
|
||||||
<div class="flex items-center my-1">
|
<div class="w-2 h-2 mr-2 inline-block rounded-full" style="background-color: ${status.Co};"></div>
|
||||||
<div class="w-2 h-2 mr-2 inline-block rounded-full" style="background-color: ${status.Co};"></div>
|
${status.Me} <span style="color: ${status.Co};">(${status.Na})</span>
|
||||||
${status.Me} <span style="color: ${status.Co};">(${status.Na})</span>
|
|
||||||
</div>
|
|
||||||
`
|
|
||||||
)
|
|
||||||
.join("")}
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
`);
|
`
|
||||||
|
)
|
||||||
|
.join("")}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
marker.bindPopup(popupContent);
|
||||||
|
|
||||||
marker.on("mouseover", () => marker.openPopup());
|
// Redux: Gerät setzen
|
||||||
marker.on("mouseout", () => marker.closePopup());
|
marker.on("mouseover", () => {
|
||||||
marker.on("contextmenu", (event) => {
|
//console.log("✅ Gerät erkannt:", station);
|
||||||
if (event.originalEvent?.preventDefault) {
|
store.dispatch(setSelectedDevice({ id: station.IdLD, name: station.Device, area: station.Area_Name }));
|
||||||
event.originalEvent.preventDefault();
|
marker.openPopup(); // Bestehender Code bleibt erhalten
|
||||||
}
|
|
||||||
marker.openPopup();
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
//-----------------------------------
|
||||||
|
//-----------------------------------
|
||||||
|
// Variable zum Speichern der hinzugefügten Menüeinträge
|
||||||
|
let contextMenuItemIds = new Set();
|
||||||
|
|
||||||
|
const addDeviceContextMenu = (map, marker) => {
|
||||||
|
if (map && map.contextmenu) {
|
||||||
|
// Vor dem Hinzufügen sicherstellen, dass vorherige Menüeinträge entfernt werden
|
||||||
|
if (contextMenuItemIds.size > 0) {
|
||||||
|
contextMenuItemIds.forEach((id) => map.contextmenu.removeItem(id));
|
||||||
|
contextMenuItemIds.clear(); // Set zurücksetzen
|
||||||
|
}
|
||||||
|
|
||||||
|
// Menüeinträge hinzufügen
|
||||||
|
const editItem = map.contextmenu.addItem({
|
||||||
|
text: "Gerät bearbeiten",
|
||||||
|
icon: "img/edit.png",
|
||||||
|
callback: () => console.log(`Bearbeite Gerät: ${marker.options.deviceName}`),
|
||||||
|
});
|
||||||
|
|
||||||
|
const deleteItem = map.contextmenu.addItem({
|
||||||
|
text: "Gerät entfernen",
|
||||||
|
icon: "img/delete.png",
|
||||||
|
callback: () => console.log(`Entferne Gerät: ${marker.options.deviceName}`),
|
||||||
|
});
|
||||||
|
|
||||||
|
const separator = map.contextmenu.addItem({ separator: true });
|
||||||
|
|
||||||
|
const detailsItem = map.contextmenu.addItem({
|
||||||
|
text: "Details anzeigen",
|
||||||
|
icon: "img/details.png",
|
||||||
|
callback: () => console.log(`Details für Gerät: ${marker.options.deviceName}`),
|
||||||
|
});
|
||||||
|
|
||||||
|
// IDs speichern
|
||||||
|
contextMenuItemIds.add(editItem);
|
||||||
|
contextMenuItemIds.add(deleteItem);
|
||||||
|
contextMenuItemIds.add(separator);
|
||||||
|
contextMenuItemIds.add(detailsItem);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// `contextmenu`-Event für Marker
|
||||||
|
marker.on("contextmenu", (event) => {
|
||||||
|
event.originalEvent?.preventDefault();
|
||||||
|
marker.openPopup();
|
||||||
|
addDeviceContextMenu(map, marker);
|
||||||
|
});
|
||||||
|
|
||||||
|
// Menü entfernen, wenn außerhalb des Markers geklickt wird
|
||||||
|
map.on("click", () => {
|
||||||
|
if (map.contextmenu && contextMenuItemIds.size > 0) {
|
||||||
|
contextMenuItemIds.forEach((id) => map.contextmenu.removeItem(id));
|
||||||
|
contextMenuItemIds.clear();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
//-----------------------------------
|
||||||
|
//-----------------------------------
|
||||||
if (typeof marker.bounce === "function" && statis) {
|
if (typeof marker.bounce === "function" && statis) {
|
||||||
marker.on("add", () => marker.bounce(3));
|
marker.on("add", () => marker.bounce(3));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,104 +3,119 @@ import L from "leaflet";
|
|||||||
import "leaflet-contextmenu";
|
import "leaflet-contextmenu";
|
||||||
import "leaflet/dist/leaflet.css";
|
import "leaflet/dist/leaflet.css";
|
||||||
import "leaflet-contextmenu/dist/leaflet.contextmenu.css";
|
import "leaflet-contextmenu/dist/leaflet.contextmenu.css";
|
||||||
import "leaflet-control-geocoder";
|
import { store } from "../redux/store";
|
||||||
|
|
||||||
import * as urls from "../config/urls.js";
|
import * as urls from "../config/urls.js";
|
||||||
import * as layers from "../config/layers.js";
|
import * as layers from "../config/layers.js";
|
||||||
import { openInNewTab } from "./openInNewTab.js";
|
|
||||||
|
|
||||||
export const initializeMap = (mapRef, setMap, setOms, setMenuItemAdded, addItemsToMapContextMenu, hasRights, setPolylineEventsDisabled) => {
|
export const initializeMap = (mapRef, setMap, setOms, setMenuItemAdded, addItemsToMapContextMenu, hasRights, setPolylineEventsDisabled) => {
|
||||||
if (mapRef.current) {
|
if (!mapRef.current) {
|
||||||
const initMap = L.map(mapRef.current, {
|
console.error("❌ Fehler: mapRef.current ist nicht definiert.");
|
||||||
center: [53.111111, 8.4625],
|
return;
|
||||||
zoom: 12,
|
}
|
||||||
minZoom: 5,
|
|
||||||
maxZoom: 15,
|
|
||||||
layers: [
|
|
||||||
layers.MAP_LAYERS.TALAS,
|
|
||||||
layers.MAP_LAYERS.ECI,
|
|
||||||
layers.MAP_LAYERS.GSMModem,
|
|
||||||
layers.MAP_LAYERS.CiscoRouter,
|
|
||||||
layers.MAP_LAYERS.WAGO,
|
|
||||||
layers.MAP_LAYERS.Siemens,
|
|
||||||
layers.MAP_LAYERS.OTDR,
|
|
||||||
layers.MAP_LAYERS.WDM,
|
|
||||||
layers.MAP_LAYERS.GMA,
|
|
||||||
layers.MAP_LAYERS.TALASICL,
|
|
||||||
layers.MAP_LAYERS.Sonstige,
|
|
||||||
layers.MAP_LAYERS.ULAF,
|
|
||||||
],
|
|
||||||
|
|
||||||
zoomControl: false,
|
if (mapRef.current._leaflet_id) {
|
||||||
contextmenu: true,
|
console.log("⚠️ Karte ist bereits initialisiert – `dragging.enable()` wird sichergestellt.");
|
||||||
contextmenuItems: [
|
setTimeout(() => {
|
||||||
{
|
if (mapRef.current) {
|
||||||
text: "Station öffnen (Tab)",
|
mapRef.current.dragging.enable();
|
||||||
icon: "/img/screen_new.png",
|
}
|
||||||
callback: (e) => {
|
}, 100);
|
||||||
const editMode = localStorage.getItem("editMode") === "true";
|
return;
|
||||||
const clickedElement = e.relatedTarget;
|
}
|
||||||
|
|
||||||
if (!clickedElement) {
|
// Leaflet-Karte erstellen
|
||||||
console.error("No valid target for the context menu entry (Element is null).");
|
const initMap = L.map(mapRef.current, {
|
||||||
return;
|
center: [53.111111, 8.4625],
|
||||||
}
|
zoom: 12,
|
||||||
|
minZoom: 5,
|
||||||
|
maxZoom: 15,
|
||||||
|
zoomControl: false,
|
||||||
|
dragging: true,
|
||||||
|
contextmenu: true, // ✅ Sicherstellen, dass Kontextmenü aktiviert ist
|
||||||
|
layers: [
|
||||||
|
layers.MAP_LAYERS.TALAS,
|
||||||
|
layers.MAP_LAYERS.ECI,
|
||||||
|
layers.MAP_LAYERS.GSMModem,
|
||||||
|
layers.MAP_LAYERS.CiscoRouter,
|
||||||
|
layers.MAP_LAYERS.WAGO,
|
||||||
|
layers.MAP_LAYERS.Siemens,
|
||||||
|
layers.MAP_LAYERS.OTDR,
|
||||||
|
layers.MAP_LAYERS.WDM,
|
||||||
|
layers.MAP_LAYERS.GMA,
|
||||||
|
layers.MAP_LAYERS.TALASICL,
|
||||||
|
layers.MAP_LAYERS.Sonstige,
|
||||||
|
layers.MAP_LAYERS.ULAF,
|
||||||
|
],
|
||||||
|
});
|
||||||
|
|
||||||
// Prüfen, ob es ein POI ist (POIs haben idPoi in den Optionen)
|
initMap.dragging.enable();
|
||||||
if (clickedElement instanceof L.Marker && clickedElement.options?.idPoi) {
|
|
||||||
console.log("POI erkannt - Station öffnen deaktiviert.");
|
|
||||||
return; // Keine Aktion ausführen
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
// 🌍 **🚀 Kontextmenü sicherstellen**
|
||||||
if (clickedElement instanceof L.Marker || clickedElement?.options?.link) {
|
if (!initMap.contextmenu) {
|
||||||
const link = "http://" + window.location.hostname + "/talas5/devices/" + clickedElement.options.link;
|
console.error("❌ `contextmenu` ist nicht verfügbar.");
|
||||||
if (link) {
|
return;
|
||||||
console.log("Opening link in a new tab:", link);
|
}
|
||||||
//window.open(link, "_blank"); POI-Link öffnen in neuem Tab
|
|
||||||
} else {
|
|
||||||
console.error("No link found in the Marker options.");
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
console.error("No valid target for the context menu entry");
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
console.error("Error processing the context menu:", error);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
},
|
|
||||||
"-",
|
|
||||||
],
|
|
||||||
});
|
|
||||||
|
|
||||||
// Füge die Tile-Layer hinzu
|
// **Kontextmenü für Geräte aktualisieren**
|
||||||
L.tileLayer(urls.OFFLINE_TILE_LAYER, {
|
initMap.on("contextmenu.show", (e) => {
|
||||||
attribution: '© <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
|
const clickedElement = e.relatedTarget;
|
||||||
}).addTo(initMap);
|
const selectedDevice = store.getState().selectedDevice; // Redux-Wert abrufen
|
||||||
|
|
||||||
// Suchfeld hinzufügen
|
if (!initMap.contextmenu || !initMap.contextmenu.items) {
|
||||||
/* const geocoder = L.Control.geocoder({
|
console.error("❌ Fehler: `contextmenu` oder `items` ist nicht definiert.");
|
||||||
defaultMarkGeocode: false,
|
return;
|
||||||
})
|
|
||||||
.on("markgeocode", function (e) {
|
|
||||||
const latlng = e.geocode.center;
|
|
||||||
initMap.setView(latlng, 15);
|
|
||||||
L.marker(latlng).addTo(initMap).bindPopup(e.geocode.name).openPopup();
|
|
||||||
})
|
|
||||||
.addTo(initMap); */
|
|
||||||
|
|
||||||
// Initialisiere OverlappingMarkerSpiderfier
|
|
||||||
const overlappingMarkerSpiderfier = new OverlappingMarkerSpiderfier(initMap, {
|
|
||||||
nearbyDistance: 20,
|
|
||||||
});
|
|
||||||
|
|
||||||
// Setze die Map und OMS in den State
|
|
||||||
setMap(initMap);
|
|
||||||
setOms(overlappingMarkerSpiderfier);
|
|
||||||
|
|
||||||
// Wenn Rechte geladen sind und es noch nicht hinzugefügt wurde, füge das Kontextmenü hinzu
|
|
||||||
if (hasRights && !setMenuItemAdded) {
|
|
||||||
addItemsToMapContextMenu(initMap, setMenuItemAdded, setPolylineEventsDisabled);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
initMap.contextmenu.removeAllItems(); // **Sicherstellen, dass vorherige Einträge entfernt werden**
|
||||||
|
} catch (error) {
|
||||||
|
console.error("❌ Fehler beim Entfernen der Menüelemente:", error);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!clickedElement) {
|
||||||
|
console.error("❌ Kein gültiges Ziel für das Kontextmenü.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 🛑 Falls `selectedDevice === null`, kein "Station öffnen" anzeigen
|
||||||
|
if (!selectedDevice || !clickedElement.options?.idDevice) {
|
||||||
|
console.log("ℹ️ Kein Gerät ausgewählt – 'Station öffnen' wird nicht hinzugefügt.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ✅ Falls `selectedDevice` gesetzt ist, "Station öffnen" anzeigen
|
||||||
|
console.log("✅ Gerät erkannt – 'Station öffnen' wird hinzugefügt.");
|
||||||
|
initMap.contextmenu.addItem({
|
||||||
|
text: "Station öffnen (Tab)",
|
||||||
|
icon: "/img/screen_new.png",
|
||||||
|
callback: () => {
|
||||||
|
const link = `http://${window.location.hostname}/talas5/devices/${selectedDevice.id}`;
|
||||||
|
if (link) {
|
||||||
|
console.log("🟢 Öffne Link in neuem Tab:", link);
|
||||||
|
window.open(link, "_blank");
|
||||||
|
} else {
|
||||||
|
console.error("❌ Kein Link in den Marker-Optionen gefunden.");
|
||||||
|
}
|
||||||
|
},
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
// Tile-Layer hinzufügen
|
||||||
|
L.tileLayer(urls.OFFLINE_TILE_LAYER, {
|
||||||
|
attribution: '© <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
|
||||||
|
}).addTo(initMap);
|
||||||
|
|
||||||
|
// Initialisiere OverlappingMarkerSpiderfier
|
||||||
|
const overlappingMarkerSpiderfier = new OverlappingMarkerSpiderfier(initMap, {
|
||||||
|
nearbyDistance: 20,
|
||||||
|
});
|
||||||
|
|
||||||
|
// Setze die Map und OMS in den State
|
||||||
|
setMap(initMap);
|
||||||
|
setOms(overlappingMarkerSpiderfier);
|
||||||
|
|
||||||
|
// Falls Rechte geladen sind, füge das Kontextmenü hinzu
|
||||||
|
if (hasRights && !setMenuItemAdded) {
|
||||||
|
addItemsToMapContextMenu(initMap, setMenuItemAdded, setPolylineEventsDisabled);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
18
utils/setupDevices.js
Normal file
18
utils/setupDevices.js
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
// utils/setupDevices.js
|
||||||
|
import { setSelectedDevice, clearSelectedDevice } from "../redux/slices/selectedDeviceSlice";
|
||||||
|
|
||||||
|
export const setupDevices = async (map, deviceMarkers, dispatch) => {
|
||||||
|
for (const marker of deviceMarkers) {
|
||||||
|
marker.on("mouseover", function () {
|
||||||
|
console.log("✅ Gerät ausgewählt:", marker);
|
||||||
|
dispatch(setSelectedDevice(marker.options)); // Gerät in Redux speichern
|
||||||
|
});
|
||||||
|
|
||||||
|
marker.on("mouseout", function () {
|
||||||
|
console.log("❌ Gerät abgewählt");
|
||||||
|
dispatch(clearSelectedDevice()); // Gerät aus Redux entfernen
|
||||||
|
});
|
||||||
|
|
||||||
|
marker.addTo(map);
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -10,6 +10,8 @@ import endIcon from "../components/gisPolylines/icons/EndIcon";
|
|||||||
import { redrawPolyline } from "./polylines/redrawPolyline";
|
import { redrawPolyline } from "./polylines/redrawPolyline";
|
||||||
import { openInNewTab } from "../utils/openInNewTab";
|
import { openInNewTab } from "../utils/openInNewTab";
|
||||||
import { disablePolylineEvents, enablePolylineEvents } from "./polylines/setupPolylines"; // Importiere die Funktionen
|
import { disablePolylineEvents, enablePolylineEvents } from "./polylines/setupPolylines"; // Importiere die Funktionen
|
||||||
|
import { setSelectedPoi, clearSelectedPoi } from "../redux/slices/selectedPoiSlice";
|
||||||
|
import { useDispatch } from "react-redux";
|
||||||
|
|
||||||
export const setupPOIs = async (
|
export const setupPOIs = async (
|
||||||
map,
|
map,
|
||||||
@@ -27,7 +29,8 @@ export const setupPOIs = async (
|
|||||||
toast,
|
toast,
|
||||||
setShowPoiUpdateModal,
|
setShowPoiUpdateModal,
|
||||||
setCurrentPoiData,
|
setCurrentPoiData,
|
||||||
deviceName
|
deviceName,
|
||||||
|
dispatch
|
||||||
) => {
|
) => {
|
||||||
const editMode = localStorage.getItem("editMode") === "true"; // Prüfen, ob der Bearbeitungsmodus aktiv ist
|
const editMode = localStorage.getItem("editMode") === "true"; // Prüfen, ob der Bearbeitungsmodus aktiv ist
|
||||||
userRights = editMode ? userRights : undefined; // Nur Berechtigungen anwenden, wenn editMode true ist
|
userRights = editMode ? userRights : undefined; // Nur Berechtigungen anwenden, wenn editMode true ist
|
||||||
@@ -83,7 +86,9 @@ export const setupPOIs = async (
|
|||||||
`);
|
`);
|
||||||
|
|
||||||
marker.on("mouseover", function () {
|
marker.on("mouseover", function () {
|
||||||
//console.log("Device Name:", marker); // Debugging
|
console.log("Device Name in setupPOIs.js :", marker); // Debugging
|
||||||
|
dispatch(setSelectedPoi(location)); // POI in Redux setzen
|
||||||
|
|
||||||
handlePoiSelect(
|
handlePoiSelect(
|
||||||
{
|
{
|
||||||
id: location.idPoi,
|
id: location.idPoi,
|
||||||
@@ -105,6 +110,7 @@ export const setupPOIs = async (
|
|||||||
});
|
});
|
||||||
|
|
||||||
marker.on("mouseout", function () {
|
marker.on("mouseout", function () {
|
||||||
|
dispatch(clearSelectedPoi()); // POI aus Redux entfernen
|
||||||
this.closePopup();
|
this.closePopup();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user