Ismail/nodeMap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Server Konfiguration

Browse Source
This commit is contained in:
ISA
2024-05-28 06:49:46 +02:00
parent ea3f65e80f
commit 788caa89d4
2 changed files with 4 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
components/MapComponent.js
View File

@@ -899,10 +899,7 @@ const MapComponent = ({ locations, onLocationUpdate }) => {
} }
//------------------------------------------ //------------------------------------------
<<<<<<< HEAD
=======
>>>>>>> 1a87c21 (Server configuration)
const fetchDeviceNameById = async (idLD) => { const fetchDeviceNameById = async (idLD) => {
try { try {
const response = await fetch(`/api/locationDeviceNameById?idLD=${idLD}`); const response = await fetch(`/api/locationDeviceNameById?idLD=${idLD}`);
@@ -919,11 +916,7 @@ const MapComponent = ({ locations, onLocationUpdate }) => {
}; };
//------------------------------------------ //------------------------------------------
<<<<<<< HEAD
=======
//------------------------------------------
>>>>>>> 1a87c21 (Server configuration)
// poiLayerRef(poiDbLayer) POI hinzufügen // poiLayerRef(poiDbLayer) POI hinzufügen
//-------------------------------------------- //--------------------------------------------
@@ -941,10 +934,7 @@ const MapComponent = ({ locations, onLocationUpdate }) => {
//console.log("location.idPoiTyp poiLayer:", location.idPoiTyp); //console.log("location.idPoiTyp poiLayer:", location.idPoiTyp);
console.log("location.idPoiTyp poiLayer:", location); console.log("location.idPoiTyp poiLayer:", location);
console.log("location.idPoiTyp:", location.idPoiTyp); console.log("location.idPoiTyp:", location.idPoiTyp);
<<<<<<< HEAD
=======
>>>>>>> 1a87c21 (Server configuration)
const deviceName = await fetchDeviceNameById(location.idLD); const deviceName = await fetchDeviceNameById(location.idLD);
const marker = L.marker([latitude, longitude], { const marker = L.marker([latitude, longitude], {
icon: L.icon({ icon: L.icon({
@@ -973,11 +963,9 @@ const MapComponent = ({ locations, onLocationUpdate }) => {
marker.bindPopup(` marker.bindPopup(`
<div> <div>
<b class="text-xl text-black-700">${location.description || "Unbekannt"}</b><br> <b class="text-xl text-black-700">${location.description || "Unbekannt"}</b><br>
<<<<<<< HEAD
${deviceName}<br> <!-- Gerät:-->
=======
${deviceName}<br> <!-- Gerät:--> ${deviceName}<br> <!-- Gerät:-->
>>>>>>> 1a87c21 (Server configuration)
${poiTypName}<br> <!-- Typ:--> ${poiTypName}<br> <!-- Typ:-->
</div> </div>
`); `);
@@ -998,18 +986,12 @@ const MapComponent = ({ locations, onLocationUpdate }) => {
//console.log("poiLayer Marker Beschreibung:", location.description); //console.log("poiLayer Marker Beschreibung:", location.description);
//Informationen an handlePoiSelect übergeben //Informationen an handlePoiSelect übergeben
handlePoiSelect(poiData); handlePoiSelect(poiData);
<<<<<<< HEAD
console.log("poiData in MapComponent.js:", poiData); console.log("poiData in MapComponent.js:", poiData);
=======
setCurrentPoi(location); setCurrentPoi(location);
console.log("POI-Daten currentPoi:", currentPoi); console.log("POI-Daten currentPoi:", currentPoi);
//console.log("poiData in MapComponent.js:", poiData); //console.log("poiData in MapComponent.js:", poiData);
<<<<<<< HEAD
>>>>>>> b983067 (Prepair: With Recoil atom pass current poi data from MapComponent to poiUpdateModal.js when mouse over)
=======
>>>>>>> 1a87c21 (Server configuration)
}); });
marker.on("mouseout", function () { marker.on("mouseout", function () {
this.closePopup(); this.closePopup();

5
config/config.js
View File

@@ -30,11 +30,8 @@ if (typeof window !== "undefined") {
mapGisSystemStaticUrl = `${serverURL}/talas5/ClientData/WebserviceMap.asmx/GisSystemStatic?idMap=${c}&idUser=${user}`; mapGisSystemStaticUrl = `${serverURL}/talas5/ClientData/WebserviceMap.asmx/GisSystemStatic?idMap=${c}&idUser=${user}`;
mapDataIconUrl = `${serverURL}/talas5/ClientData/WebserviceMap.asmx/GetIconsStatic`; mapDataIconUrl = `${serverURL}/talas5/ClientData/WebserviceMap.asmx/GetIconsStatic`;
<<<<<<< HEAD
/* mapGisStationsStaticDistrictUrl = `${serverURL}/talas5/ClientData/WebserviceMap.asmx/GisStationsStaticDistrict`;
=======
/* mapGisStationsStaticDistrictUrl = `${serverURL}/talas5/ClientData/WebserviceMap.asmx/GisStationsStaticDistrict`; /* mapGisStationsStaticDistrictUrl = `${serverURL}/talas5/ClientData/WebserviceMap.asmx/GisStationsStaticDistrict`;
>>>>>>> 1a87c21 (Server configuration)
mapGisStationsStatusDistrictUrl = `${serverURL}/talas5/ClientData/WebserviceMap.asmx/GisStationsStatusDistrict`; mapGisStationsStatusDistrictUrl = `${serverURL}/talas5/ClientData/WebserviceMap.asmx/GisStationsStatusDistrict`;
mapGisStationsMeasurementsUrl = `${serverURL}/talas5/ClientData/WebserviceMap.asmx/GisStationsMeasurements`; mapGisStationsMeasurementsUrl = `${serverURL}/talas5/ClientData/WebserviceMap.asmx/GisStationsMeasurements`;
mapGisSystemStaticUrl = `${serverURL}/talas5/ClientData/WebserviceMap.asmx/GisSystemStatic`; mapGisSystemStaticUrl = `${serverURL}/talas5/ClientData/WebserviceMap.asmx/GisSystemStatic`;