X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=bin%2Fplc-kml.py;h=6cd460db6e8bffd2845fca85aeb8050a39fd1d5e;hb=a455b90d009a6a43cf2c66e99aba9f639223c548;hp=3b0b8c62645398d88fe512289aeccddf33dadfef;hpb=82d099c7771dd3517bb300552e5b182f49bb27bc;p=myplc.git
diff --git a/bin/plc-kml.py b/bin/plc-kml.py
index 3b0b8c6..6cd460d 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
@@ -108,13 +109,7 @@ class KmlMap:
description += "
"
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 += " | "
@@ -168,7 +163,8 @@ class KmlMap:
description=""
# STYLE
- if self.options.use_google_icons:
+ # the size for google icons
+ if not self.options.use_custom_icons:
if not peer_id:
# local sites
iconfile=default_local_builtin
@@ -178,6 +174,7 @@ class KmlMap:
iconfile=default_foreign_builtin
xyspec="16003232"
iconurl="root://icons/%(iconfile)s"%locals()
+ # the size for our own brew of icons
else:
if not peer_id:
iconfile=self.options.local_icon
@@ -216,15 +213,16 @@ def main () :
parser.add_option("-n","--no-label",action="store_false",dest="labels",
default=True,
help="outputs only geographic positions, no labels")
- parser.add_option("-c","--custom",action="store_false",dest="use_google_icons",
- default=True,
- help="use locally customized icons rather than the google-provided defaults")
+ # default - for private depls. - is to use google-provided icons like palette-3
+ parser.add_option("-c","--custom",action="store_true",dest="use_custom_icons",
+ default=False,
+ help="use locally customized icons rather than the %s and %s defaults"%(default_local_builtin,default_foreign_builtin))
parser.add_option("-l","--local",action="store",dest="local_icon",
default=default_local_icon,
- help="set icon url to use for local sites marker -- default is %s"%default_local_icon)
+ help="set icon url to use for local sites marker -- requires -c -- default is %s"%default_local_icon)
parser.add_option("-f","--foreign",action="store",dest="foreign_icon",
default=default_foreign_icon,
- help="set icon url to use for foreign sites marker -- default is %s"%default_foreign_icon)
+ help="set icon url to use for foreign sites marker -- requires -c -- default is %s"%default_foreign_icon)
(options, args) = parser.parse_args()
if len(args) != 0:
|