Index: /nodes/make-map.py =================================================================== --- /nodes/make-map.py (revision 8283) +++ /nodes/make-map.py (revision 8285) @@ -4,13 +4,10 @@ # Build topological network graph # Rick van der Zwet + +import cgi +import gformat import re import sys -import glob -import tempfile -import subprocess -import gformat - import urllib -import re import yaml @@ -65,115 +62,32 @@ def make_graph(): f = open('kmlfile.kml', 'w') - f.write(""" - + f.write(""" - KML Samples + WirelessLeiden Nodemap 1 - Unleash your creativity with the help of these examples! - - - - - - - - - - - - - Paths + Nodes 0 - Examples of paths. Note that the tessellate tag is by default - set to 0. If you want to create tessellated lines, they must be authored - (or edited) directly in KML. + All active nodes and links """) @@ -201,37 +115,45 @@ poel[addr] = [host] # Assume all eth2wifibridge to be 11a for a moment - if datadump[iface_key].has_key('eth2wifibridge'): + iface_parent = '_'.join(iface_key.split('_')[0:2]) + if datadump[iface_parent].has_key('extra_type') and datadump[iface_parent]['extra_type'] == 'eth2wifibridge': link_type[addr] = '11a' else: - link_type[addr] = datadump[iface_key]['type'] + link_type[addr] = datadump[iface_parent]['type'] print "### %s [%s] is of type %s" % (gformat.showaddr(addr), iface_key, link_type[addr]) lam, phi = rd2etrs(datadump['rdnap_x'], datadump['rdnap_y']) node[host] = (lam, phi) f.write(""" - - Blue Icon - Just another blue icon. - ./styles.kml#blueIcons - - %s,%s,630 - - - """ % (lam, phi)) + All active nodes + + Node %(name)s + %(desc)s> + #node_status_up + %(lam)s,%(phi)s,0 + + """ % {'name' : host, 'desc' : cgi.escape(datadump['location']), 'lam' : lam, 'phi' : phi}) nodes += [("POINT(%s, %s)" % (lam, phi))] except (KeyError, ValueError), e: print "[FOUT] in '%s' interface '%s'" % (host,iface_key) - print e + raise sys.exit(1) + f.write(""" + + + Links + 0 + All links + """) for addr,leden in poel.iteritems(): if link_type[addr] == '11a': - color = 'red' + color = '#ff0000ff' + weight = 2 + elif link_type[addr] == 'eth': + color = '#ffff0000' weight = 4 - elif link_type[addr] == 'eth': - color = 'blue' - weight = 8 else: - color = 'black' + color = '#ff000000' weight = 1 + leden = sorted(set(leden)) for index,lid in enumerate(leden[:-1]): @@ -239,14 +161,22 @@ f.write(""" - Untessellated + %(name)s 0 - tag has a value of 0, the line follow a simple straight-line path from point to point]]> + %(desc)s 0 - %s, %s, 0 - %s , %s, 0 + %(lam1)s, %(phi1)s, 0 + %(lam2)s , %(phi2)s, 0 + - """ % (node[lid][0], node[lid][1], node[buur][0], node[buur][1])) + """ % { 'lam1' : node[lid][0], + 'phi1' : node[lid][1], + 'lam2' : node[buur][0], + 'phi2' : node[buur][1], + 'name' : "Interlink: %s --- %s" % (lid, buur), + 'desc' : "%s [%s]" % (gformat.showaddr(addr), link_type[addr]), + 'style' : "%s%s" % (color, weight), + }) f.write(""" Index: /nodes/nodemap.html =================================================================== --- /nodes/nodemap.html (revision 8283) +++ /nodes/nodemap.html (revision 8285) @@ -9,5 +9,5 @@ } - + @@ -60,9 +60,16 @@ extractStyles: true, extractAttributes: true, - maxDepth: 2 + maxDepth: 5 } }); map.addLayer(kml); + select = new OpenLayers.Control.SelectFeature(kml); + kml.events.on( { + "featureselected": onKMLFeatureSelect, + "featureunselected": onKMLFeatureUnselect + }); + map.addControl(select); + select.activate(); var vectors = new OpenLayers.Layer.Vector("Vector Layer") @@ -75,4 +82,5 @@ map.addControl(new OpenLayers.Control.ScaleLine()); map.addControl(new OpenLayers.Control.KeyboardDefaults()); + map.addControl(new OpenLayers.Control.ZoomBox()); //var in_options = { @@ -162,4 +170,29 @@ } + function onPopupClose(evt) { + select.unselectAll(); + } + + + function onKMLFeatureSelect(event) { + var feature = event.feature; + var content = "

"+feature.attributes.name + "

" + feature.attributes.description; + popup = new OpenLayers.Popup.FramedCloud("chicken", + feature.geometry.getBounds().getCenterLonLat(), + new OpenLayers.Size(100,100), + content, + null, true, onPopupClose); + feature.popup = popup; + map.addPopup(popup); + } + + function onKMLFeatureUnselect(event) { + var feature = event.feature; + if(feature.popup) { + map.removePopup(feature.popup); + feature.popup.destroy(); + delete feature.popup; + } + } function handleMeasurements(event) { @@ -199,4 +232,13 @@ } + function toggleInfo() { + var e = document.getElementById('infofield'); + if (e.style.visibility == "hidden") { + e.style.visibility = "visible"; + } else { + e.style.visibility = "hidden"; + }; + } + // http://openlayers.org/dev/examples/strategy-cluster-threshold.html @@ -204,9 +246,16 @@

holding down shift, whilst dragging the mouse to do box zooming
Keyboard Navigation is enabled