From: Scott Baker <smbaker@gmail.com>
Date: Thu, 26 Jun 2014 17:28:03 +0000 (-0700)
Subject: Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
X-Git-Url: http://git.onelab.eu/?p=plstackapi.git;a=commitdiff_plain;h=c7b478bc4a261a9a942a0e96e4f8abca769876c5;hp=8ccabb929b07c8fabac475b2eca14c20c64efc78

Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
---

diff --git a/planetstack/core/dashboard/views/view_common.py b/planetstack/core/dashboard/views/view_common.py
index 4efb8c2..db842cb 100644
--- a/planetstack/core/dashboard/views/view_common.py
+++ b/planetstack/core/dashboard/views/view_common.py
@@ -141,10 +141,16 @@ def getCDNOperatorData(randomizeData = False, wait=True):
         cpu=float(max_cpu)/100.0
         hotness = max(0.0, ((cpu*RED_LOAD) - BLUE_LOAD)/(RED_LOAD-BLUE_LOAD))
 
+        try:
+           lat=float(site.location.longitude)
+           long=float(site.location.longitude)
+        except:
+           lat=0
+           long=0
+
         # format it to what that CDN Operations View is expecting
-        new_row = {"lat": float(site.location.longitude),
-               "long": float(site.location.longitude),
-               "lat": float(site.location.latitude),
+        new_row = {"lat": lat,
+               "long": long,
                "health": 0,
                "numNodes": int(site.nodes.count()),
                "activeHPCSlivers": int(stats_row.get("count_hostname", 0)),     # measured number of slivers, from bigquery statistics