Informationen in Tooltips einfügen
This commit is contained in:
@@ -29,6 +29,9 @@ const MapComponent = ({ locations, onLocationUpdate }) => {
|
|||||||
const mapDataIconUrl = config.mapDataIconUrl;
|
const mapDataIconUrl = config.mapDataIconUrl;
|
||||||
|
|
||||||
console.log("GisStationsStaticDistrict 1 :", GisStationsStaticDistrict);
|
console.log("GisStationsStaticDistrict 1 :", GisStationsStaticDistrict);
|
||||||
|
console.log("GisStationsStatusDistrict 1 :", GisStationsStatusDistrict);
|
||||||
|
console.log("GisStationsMeasurements 1 :", GisStationsMeasurements);
|
||||||
|
console.log("GisSystemStatic 1 :", GisSystemStatic);
|
||||||
console.log("map 1:", map);
|
console.log("map 1:", map);
|
||||||
|
|
||||||
// Funktion zum Aktualisieren der Position in der Datenbank
|
// Funktion zum Aktualisieren der Position in der Datenbank
|
||||||
@@ -55,8 +58,7 @@ const MapComponent = ({ locations, onLocationUpdate }) => {
|
|||||||
console.error("Fehler beim Aktualisieren der Position");
|
console.error("Fehler beim Aktualisieren der Position");
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
//---
|
|
||||||
//------------------------------------------
|
|
||||||
// API-Daten laden für GisStationsStaticDistrict
|
// API-Daten laden für GisStationsStaticDistrict
|
||||||
//http://10.10.0.13/talas5/ClientData/WebServiceMap.asmx/GisStationsStaticDistrict?idMap=10&idUser=485
|
//http://10.10.0.13/talas5/ClientData/WebServiceMap.asmx/GisStationsStaticDistrict?idMap=10&idUser=485
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -660,6 +662,54 @@ const MapComponent = ({ locations, onLocationUpdate }) => {
|
|||||||
|
|
||||||
//-------------------------------------
|
//-------------------------------------
|
||||||
}
|
}
|
||||||
|
//------------------------------------------
|
||||||
|
//Informationen in Tooltips einfügen
|
||||||
|
// Marker hinzufügen für GisStationsStaticDistrict
|
||||||
|
useEffect(() => {
|
||||||
|
if (
|
||||||
|
map &&
|
||||||
|
GisStationsStaticDistrict.length > 0 &&
|
||||||
|
GisStationsStatusDistrict.length > 0
|
||||||
|
) {
|
||||||
|
// Zuerst alte Marker entfernen
|
||||||
|
map.eachLayer((layer) => {
|
||||||
|
if (layer instanceof L.Marker) {
|
||||||
|
map.removeLayer(layer);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Neue Marker für jede Station hinzufügen
|
||||||
|
GisStationsStaticDistrict.forEach((station) => {
|
||||||
|
// Find corresponding status message
|
||||||
|
const status = GisStationsStatusDistrict.find(
|
||||||
|
(status) => status.IdLD === station.IdLD
|
||||||
|
);
|
||||||
|
const message = status ? status.Me : "Keine Statusmeldung verfügbar";
|
||||||
|
|
||||||
|
const marker = L.marker([station.X, station.Y], {
|
||||||
|
icon: L.icon({
|
||||||
|
iconUrl: getIconPath(station.Icon),
|
||||||
|
iconSize: [25, 41],
|
||||||
|
iconAnchor: [12, 41],
|
||||||
|
popupAnchor: [1, -34],
|
||||||
|
shadowSize: [41, 41],
|
||||||
|
}),
|
||||||
|
}).addTo(map);
|
||||||
|
|
||||||
|
// Ein Popup mit Informationen zur Station und Statusmeldung hinzufügen
|
||||||
|
marker
|
||||||
|
.bindPopup(
|
||||||
|
`<b>${station.LD_Name}</b><br>${station.Device}<br><b>Status:</b> ${message}`
|
||||||
|
)
|
||||||
|
.bindTooltip(`${station.LD_Name} - ${message}`, {
|
||||||
|
permanent: false,
|
||||||
|
direction: "top",
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}, [map, GisStationsStaticDistrict, GisStationsStatusDistrict]); // Include GisStationsStatusDistrict in dependencies
|
||||||
|
|
||||||
|
//------------------------------------------
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
|
|||||||
Reference in New Issue
Block a user