diff --git a/Lora-Map/resources/icons/marker/Marker.svg b/Lora-Map/resources/icons/marker/Marker.svg index def7e6f..f925d20 100644 --- a/Lora-Map/resources/icons/marker/Marker.svg +++ b/Lora-Map/resources/icons/marker/Marker.svg @@ -1,21 +1,21 @@ - - - + + + diff --git a/Lora-Map/resources/js/marker.js b/Lora-Map/resources/js/marker.js index b46bcff..88f78bf 100644 --- a/Lora-Map/resources/js/marker.js +++ b/Lora-Map/resources/js/marker.js @@ -30,7 +30,7 @@ function parseAjaxLoc() { className: 'pos-marker', iconSize: [56, 80], iconAnchor: [0, 80], - html: '' + html: '' }); marker = L.marker([positionItem['Latitude'], positionItem['Longitude']], { 'title': positionItem['Name'], 'icon': myIcon }); } @@ -43,16 +43,16 @@ function parseAjaxLoc() { className: 'pos-marker', iconSize: [56, 80], iconAnchor: [0, 80], - html: '' + html: '' })); - } else if (markers[key]._icon.children[0].hasAttribute("data")) { - var old = markers[key]._icon.children[0]["data"].substring(markers[key]._icon.children[0]["data"].indexOf("/", 7) + 1); + } else if (markers[key]._icon.children[0].hasAttribute("src")) { + var old = markers[key]._icon.children[0]["src"].substring(markers[key]._icon.children[0]["src"].indexOf("/", 7) + 1); if (old !== positionItem['Icon']) { - markers[key]._icon.children[0]["data"] = positionItem['Icon']; + markers[key]._icon.children[0]["src"] = positionItem['Icon']; } } } else { - if (markers[key]._icon.children.length === 1 && markers[key]._icon.children[0].hasAttribute("data")) { + if (markers[key]._icon.children.length === 1 && markers[key]._icon.children[0].hasAttribute("src")) { markers[key].removeFrom(mymap); markers[key] = L.marker([positionItem['Latitude'], positionItem['Longitude']], { 'title': positionItem['Name'] }).addTo(mymap).on("click", showMarkerInfo, key); } diff --git a/Lora-Map/resources/js/menu.js b/Lora-Map/resources/js/menu.js index a2ae642..da0e89d 100644 --- a/Lora-Map/resources/js/menu.js +++ b/Lora-Map/resources/js/menu.js @@ -96,16 +96,16 @@ function updateOverviewElement(positionItem, id) { document.getElementById("overview-update-id-" + id).innerText = "Letzte Werte: vor " + timeCalculation(positionItem["Recievedtime"], "difftext"); if (positionItem['Icon'] === null) { var icon = document.getElementById("overview-icon-id-" + id); - if (icon.children[0].hasAttribute("data")) { + if (icon.children[0].hasAttribute("rel")) { document.getElementById("overview-icon-id-" + id).innerHTML = ""; } } else { - if (document.getElementById("overview-icon-id-" + id).children[0].hasAttribute("data")) { - if (document.getElementById("overview-icon-id-" + id).children[0]["data"].substring(document.getElementById("overview-icon-id-" + id).children[0]["data"].indexOf("/", 7) + 1) !== positionItem['Icon'] + "&marker-bg=hidden") { - document.getElementById("overview-icon-id-" + id).children[0]["data"] = positionItem['Icon'] + "&marker-bg=hidden"; + if (document.getElementById("overview-icon-id-" + id).children[0].hasAttribute("src")) { + if (document.getElementById("overview-icon-id-" + id).children[0]["src"].substring(document.getElementById("overview-icon-id-" + id).children[0]["src"].indexOf("/", 7) + 1) !== positionItem['Icon'] + "&marker-bg=hidden") { + document.getElementById("overview-icon-id-" + id).children[0]["src"] = positionItem['Icon'] + "&marker-bg=hidden"; } } else { - document.getElementById("overview-icon-id-" + id).innerHTML = ""; + document.getElementById("overview-icon-id-" + id).innerHTML = ""; } } } @@ -117,9 +117,9 @@ function createOverviewElement(positionItem, id) { divItem.setAttribute("rel", id); divItem.innerHTML = ""; if (positionItem['Icon'] !== null) { - divItem.innerHTML += ""; + divItem.innerHTML += ""; } else { - divItem.innerHTML += ""; + divItem.innerHTML += ""; } divItem.innerHTML += "
" + "" +