X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=bin%2Fplc-kml.py;h=b246300ed2eced4dfca89ae71fb77bfafa9a63fa;hb=dbf0fc19b34d57bbb2645c03739d326fb07ba8be;hp=3b0b8c62645398d88fe512289aeccddf33dadfef;hpb=82d099c7771dd3517bb300552e5b182f49bb27bc;p=myplc.git
diff --git a/bin/plc-kml.py b/bin/plc-kml.py
index 3b0b8c6..b246300 100755
--- a/bin/plc-kml.py
+++ b/bin/plc-kml.py
@@ -46,7 +46,7 @@ class KmlMap:
self.open()
self.write_header()
# cache peers
- peers = GetPeers({},['peer_id','peername'])
+ peers = GetPeers()
all_sites = GetSites({'enabled':True,'is_public':True})
all_sites.sort(KmlMap.site_compare)
for site in all_sites:
@@ -75,12 +75,13 @@ class KmlMap:
self.write("""
""")
- def peer_name (self,site, peers):
+ def peer_info (self,site, peers):
if not site['peer_id']:
- return "local"
+ return (api.config.PLC_NAME, "http://%s/"%api.config.PLC_API_HOST,)
for peer in peers:
if peer['peer_id'] == site['peer_id']:
- return peer['peername']
+ return (peer['peername'],peer['peer_url'].replace("PLCAPI/",""),)
+ return "Unknown peer_name"
def write_site (self, site, peers):
# discard sites with missing lat or lon
@@ -100,6 +101,29 @@ class KmlMap:
baseurl='http://%s'%api.config.PLC_WWW_HOST
peer_id=site['peer_id']
+ # STYLE
+ # the size for google icons
+ if not self.options.use_custom_icons:
+ if not peer_id:
+ # local sites
+ iconfile=default_local_builtin
+ xyspec="
" description += "Testbed" description += " | " - if peer_id: - peername = 'PlanetLab Central' - peerurl = 'http://www.planet-lab.org' - #self.peer_name(site,peers) - else: - peername = 'PlanetLab Europe' - peerurl = 'http://www.planet-lab.eu' + (peername,peerurl) = self.peer_info (site,peers) description += " %(peername)s "%locals() #description += "[description]"%locals() description += " | " - if peer_id: - description += ""%locals() - else: - description += ""%locals() + description += ""%locals() description += " |