|
@@ -1,14 +1,14 @@
|
|
|
-define(["config", "moment", "chroma-js", "router", "map", "sidebar", "tabs", "container", "meshstats", "linklist", "nodelist", "simplenodelist", "infobox/main"],
|
|
|
-function (config, moment, chroma, Router, Map, Sidebar, Tabs, Container, Meshstats, Linklist, Nodelist, SimpleNodelist, Infobox) {
|
|
|
+define(["config", "moment", "chroma-js", "router", "map", "sidebar", "tabs", "container", "meshstats", "linklist", "nodelist", "simplenodelist", "infobox/main", "leaflet"],
|
|
|
+function (config, moment, chroma, Router, Map, Sidebar, Tabs, Container, Meshstats, Linklist, Nodelist, SimpleNodelist, Infobox, L) {
|
|
|
return function () {
|
|
|
var linklist, lostnodeslist, map, meshstats, newnodeslist, nodelist, router
|
|
|
|
|
|
function createGUI() {
|
|
|
moment.locale("de")
|
|
|
|
|
|
- router = new Router(config)
|
|
|
+ router = new Router()
|
|
|
|
|
|
- var linkScale = chroma.scale(chroma.interpolate.bezier(['green', 'yellow', 'red'])).domain([1, 5])
|
|
|
+ var linkScale = chroma.scale(chroma.interpolate.bezier(["green", "yellow", "red"])).domain([1, 5])
|
|
|
var sidebar = new Sidebar(document.body)
|
|
|
var infobox = new Infobox(config, sidebar, router)
|
|
|
var tabs = new Tabs()
|
|
@@ -36,16 +36,7 @@ function (config, moment, chroma, Router, Map, Sidebar, Tabs, Container, Meshsta
|
|
|
router.addTarget(map)
|
|
|
}
|
|
|
|
|
|
- var urls = [ config.dataPath + 'nodes.json',
|
|
|
- config.dataPath + 'graph.json'
|
|
|
- ]
|
|
|
-
|
|
|
- Promise.all(urls.map(getJSON))
|
|
|
- .then(function (d) { createGUI(); return d })
|
|
|
- .then(handle_data)
|
|
|
- .then(function () { router.start() })
|
|
|
-
|
|
|
- function handle_data(data) {
|
|
|
+ function handleData(data) {
|
|
|
var nodedict = data[0]
|
|
|
var nodes = Object.keys(nodedict.nodes).map(function (key) { return nodedict.nodes[key] })
|
|
|
|
|
@@ -59,7 +50,7 @@ function (config, moment, chroma, Router, Map, Sidebar, Tabs, Container, Meshsta
|
|
|
})
|
|
|
|
|
|
var now = moment()
|
|
|
- var age = moment(now).subtract(14, 'days')
|
|
|
+ var age = moment(now).subtract(14, "days")
|
|
|
|
|
|
var newnodes = limit("firstseen", age, sortByKey("firstseen", nodes).filter(online))
|
|
|
var lostnodes = limit("lastseen", age, sortByKey("lastseen", nodes).filter(offline))
|
|
@@ -116,5 +107,18 @@ function (config, moment, chroma, Router, Map, Sidebar, Tabs, Container, Meshsta
|
|
|
lostnodeslist.setData(lostnodes)
|
|
|
router.setData(nodes, links)
|
|
|
}
|
|
|
+
|
|
|
+ var urls = [ config.dataPath + "nodes.json",
|
|
|
+ config.dataPath + "graph.json"
|
|
|
+ ]
|
|
|
+
|
|
|
+ Promise.all(urls.map(getJSON))
|
|
|
+ .then(function (d) {
|
|
|
+ createGUI()
|
|
|
+ return d
|
|
|
+ })
|
|
|
+ .then(handleData)
|
|
|
+ .then(function () { router.start() })
|
|
|
+
|
|
|
}
|
|
|
})
|