freifunk/ffmap-backend
8
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #1 from NeoRaider/master

Browse source 
Python3
This commit is contained in:
Nils Schneider 2012-04-30 07:15:37 -07:00
parent ba4709cf06 cd7b9cf235
commit bbf9b3780a
2 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
aliases.json
View file

@ -2,7 +2,7 @@
"04:11:6b:98:08:21" : {
"name" : "sellars"
},
"da:7b:6f:c1:63:d2" : {
"00:25:86:e6:f1:bf" : {
"name" : "krtek"
},
"b0:48:7a:e7:d3:64" : {
@ -12,8 +12,7 @@
"name" : "holstentor"
},
"56:47:05:ab:00:2b" : {
"name" : "aftermath",
"group" : 1
"name" : "aftermath"
},
"ca:96:05:3c:54:f9" : {
"name" : "prometheus"
@ -35,5 +34,8 @@
},
"ca:a8:ca:2d:c8:b2" : {
"name" : "prometheus"
},
"fa:d1:11:80:41:d4" : {
"name" : "confusion"
}
}

33
bat2nodes.py
View file

@ -4,7 +4,7 @@
# Gatewayliste
# aliases.json
import simplejson as json
import json
import fileinput
import argparse
@ -128,12 +128,13 @@ if options['aliases']:
if 'group' in alias:
node.group = alias['group']
for gateway in options['gateway']:
try:
node = maybe_node_by_mac(nodes, (gateway, ))
node.group = 2
except:
continue
if options['gateway']:
for gateway in options['gateway']:
try:
node = maybe_node_by_mac(nodes, (gateway, ))
node.group = 2
except:
continue
def map_link(nodes, pair):
distance = 80
@ -149,16 +150,16 @@ def map_link(nodes, pair):
return link
links = map(lambda x: map_link(nodes, x), links)
links = [map_link(nodes, x) for x in links]
output = dict()
output['nodes'] = map(lambda x: {'group': x.group, 'name': x.name,
'macs': ', '.join(x.macs)
}, nodes)
output['links'] = map(lambda x: {'source': x.pair[0], 'target': x.pair[1],
'distance': x.distance,
'strength': x.strength
}, links)
output['nodes'] = [{'group': x.group, 'name': x.name,
'macs': ', '.join(x.macs)
} for x in nodes]
output['links'] = [{'source': x.pair[0], 'target': x.pair[1],
'distance': x.distance,
'strength': x.strength
} for x in links]
print json.dumps(output)
print(json.dumps(output))