Freifunk-Troisdorf/meshviewer
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use has_location

Browse Source
This commit is contained in:
Nils Schneider 2015-03-22 15:27:16 +01:00
parent 730670fdee
commit a911e8cc5c
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
history.js
View File

@ -229,9 +229,7 @@ function mkmap(map, newnodes, lostnodes, onlinenodes, graph, gotoAnything) {
var markersDict = addLinksToMap(map, graph, gotoAnything) var markersDict = addLinksToMap(map, graph, gotoAnything)
var nodes = newnodes.concat(lostnodes).filter( function (d) { var nodes = newnodes.concat(lostnodes).filter(has_location)
return "location" in d.nodeinfo
})
var markers = nodes.map( function (d) { var markers = nodes.map( function (d) {
var icon = L.AwesomeMarkers.icon({ markerColor: d.flags.online ? "green" : "red", var icon = L.AwesomeMarkers.icon({ markerColor: d.flags.online ? "green" : "red",
@ -372,7 +370,7 @@ function addToList(el, showContact, tf, gotoProxy, list) {
a.onclick = gotoProxy(d) a.onclick = gotoProxy(d)
td1.appendChild(a) td1.appendChild(a)
if ("location" in d.nodeinfo) { if (has_location(d)) {
var span = document.createElement("span") var span = document.createElement("span")
span.classList.add("icon") span.classList.add("icon")
span.classList.add("ion-location") span.classList.add("ion-location")
@ -443,7 +441,7 @@ function showNodeinfo(config, gotoAnything, d) {
attributes.classList.add("attributes") attributes.classList.add("attributes")
attributeEntry(attributes, "Gateway", d.flags.gateway ? "ja" : null) attributeEntry(attributes, "Gateway", d.flags.gateway ? "ja" : null)
attributeEntry(attributes, "In der Karte", "location" in d.nodeinfo ? "ja" : "nein") attributeEntry(attributes, "In der Karte", has_location(d) ? "ja" : "nein")
if (config.showContact) if (config.showContact)
attributeEntry(attributes, "Kontakt", dictGet(d.nodeinfo, ["owner", "contact"])) attributeEntry(attributes, "Kontakt", dictGet(d.nodeinfo, ["owner", "contact"]))