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

history: fetch graph.json too

Browse source
This commit is contained in:
Nils Schneider 2015-03-20 13:43:30 +01:00
parent b7fa08ef2a
commit f31c0650e4
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
history.js
View file

@ -45,7 +45,13 @@ function main() {
map.invalidateSize() map.invalidateSize()
} }
getJSON('nodes.json').then(handle_data(map))
var urls = [ 'https://map.luebeck.freifunk.net/data/nodes.json',
'https://map.luebeck.freifunk.net/data/graph.json'
]
var p = Promise.all(urls.map(getJSON))
p.then(handle_data(map))
} }
function sort(key, d) { function sort(key, d) {
@ -86,7 +92,8 @@ function subtract(a, b) {
function handle_data(map) { function handle_data(map) {
return function (data) { return function (data) {
var nodes = Object.keys(data.nodes).map(function (key) { return data.nodes[key] }) var nodedict = data[0]
var nodes = Object.keys(nodedict.nodes).map(function (key) { return nodedict.nodes[key] })
nodes = nodes.filter( function (d) { nodes = nodes.filter( function (d) {
return "firstseen" in d && "lastseen" in d return "firstseen" in d && "lastseen" in d