freifunk/hopglass
8
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

clicking on map marker opens infobox

Browse source
This commit is contained in:
Nils Schneider 2015-03-21 16:51:07 +01:00
parent 45a8e48a49
commit e1b859c1be
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
history.js
View file

@ -153,9 +153,9 @@ function handle_data(config, map) {
}).reverse().slice(0, Math.ceil(config.longLinkPercentile * graph.length)) }).reverse().slice(0, Math.ceil(config.longLinkPercentile * graph.length))
var markers = mkmap(map, newnodes, lostnodes, onlinenodes, graph) var markers = mkmap(map, newnodes, lostnodes, onlinenodes, graph, showNodeinfo, showLinkinfo)
var gotoAnything = gotoBuilder(markers, showNodeinfo) var gotoAnything = gotoBuilder(markers, showNodeinfo, showLinkinfo)
addToList(document.getElementById("newnodes"), config.showContact, "firstseen", gotoAnything.node, newnodes) addToList(document.getElementById("newnodes"), config.showContact, "firstseen", gotoAnything.node, newnodes)
addToList(document.getElementById("lostnodes"), config.showContact, "lastseen", gotoAnything.node, lostnodes) addToList(document.getElementById("lostnodes"), config.showContact, "lastseen", gotoAnything.node, lostnodes)
@ -181,7 +181,7 @@ function linkId(d) {
return d.source.node.nodeinfo.node_id + "-" + d.target.node.nodeinfo.node_id return d.source.node.nodeinfo.node_id + "-" + d.target.node.nodeinfo.node_id
} }
function mkmap(map, newnodes, lostnodes, onlinenodes, graph) { function mkmap(map, newnodes, lostnodes, onlinenodes, graph, showNodeinfo, showLinkinfo) {
L.control.zoom({ position: "topright" }).addTo(map) L.control.zoom({ position: "topright" }).addTo(map)
L.tileLayer("http://otile{s}.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.jpg", { L.tileLayer("http://otile{s}.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.jpg", {
@ -191,7 +191,7 @@ function mkmap(map, newnodes, lostnodes, onlinenodes, graph) {
maxZoom: 18 maxZoom: 18
}).addTo(map) }).addTo(map)
var markersDict = addLinksToMap(map, graph) var markersDict = addLinksToMap(map, graph, showLinkinfo)
var nodes = newnodes.concat(lostnodes).filter( function (d) { var nodes = newnodes.concat(lostnodes).filter( function (d) {
return "location" in d.nodeinfo return "location" in d.nodeinfo
@ -207,6 +207,7 @@ function mkmap(map, newnodes, lostnodes, onlinenodes, graph) {
var m = L.marker([d.nodeinfo.location.latitude, d.nodeinfo.location.longitude], opt) var m = L.marker([d.nodeinfo.location.latitude, d.nodeinfo.location.longitude], opt)
m.on('click', function () { return showNodeinfo(d) })
m.bindPopup(d.nodeinfo.hostname) m.bindPopup(d.nodeinfo.hostname)
markersDict[d.nodeinfo.node_id] = m markersDict[d.nodeinfo.node_id] = m
@ -224,6 +225,7 @@ function mkmap(map, newnodes, lostnodes, onlinenodes, graph) {
var m = L.circleMarker([d.nodeinfo.location.latitude, d.nodeinfo.location.longitude], opt) var m = L.circleMarker([d.nodeinfo.location.latitude, d.nodeinfo.location.longitude], opt)
m.on('click', function () { return showNodeinfo(d) })
m.bindPopup(d.nodeinfo.hostname) m.bindPopup(d.nodeinfo.hostname)
markersDict[d.nodeinfo.node_id] = m markersDict[d.nodeinfo.node_id] = m
@ -257,7 +259,7 @@ function mkmap(map, newnodes, lostnodes, onlinenodes, graph) {
return funcDict return funcDict
} }
function addLinksToMap(map, graph) { function addLinksToMap(map, graph, showLinkinfo) {
var markersDict = {} var markersDict = {}
var scale = chroma.scale(['green', 'orange', 'red']).domain([1, 10]) var scale = chroma.scale(['green', 'orange', 'red']).domain([1, 10])
@ -270,6 +272,7 @@ function addLinksToMap(map, graph) {
var line = L.polyline(d.latlngs, opts) var line = L.polyline(d.latlngs, opts)
line.bindPopup(d.source.node.nodeinfo.hostname + " – " + d.target.node.nodeinfo.hostname + "<br><strong>" + showDistance(d) + " / " + showTq(d) + "</strong>") line.bindPopup(d.source.node.nodeinfo.hostname + " – " + d.target.node.nodeinfo.hostname + "<br><strong>" + showDistance(d) + " / " + showTq(d) + "</strong>")
line.on('click', function () { return showLinkinfo(d) })
markersDict[linkId(d)] = line markersDict[linkId(d)] = line
@ -392,7 +395,10 @@ function showNodeinfo(d) {
} }
} }
function gotoBuilder(markers, nodes) { function showLinkinfo(d) {
}
function gotoBuilder(markers, nodes, links) {
function gotoNode(d) { function gotoNode(d) {
if (d.nodeinfo.node_id in markers) if (d.nodeinfo.node_id in markers)
markers[d.nodeinfo.node_id]() markers[d.nodeinfo.node_id]()
@ -406,6 +412,8 @@ function gotoBuilder(markers, nodes) {
if (linkId(d) in markers) if (linkId(d) in markers)
markers[linkId(d)]() markers[linkId(d)]()
links(d)
return false return false
} }