getting coordinates right on fusion

rowers/dataprep.py

@@ -95,6 +95,22 @@ from scipy.signal import savgol_filter
 
 import datetime
 
+def get_latlon(id):
+    try:
+        w = Workout.objects.get(id=id)
+    except Workout.DoesNotExist:
+        return False
+        
+    rowdata = rdata(w.csvfilename)
+    try:
+	latitude = rowdata.df.ix[:,' latitude']
+        longitude = rowdata.df.ix[:,' longitude']
+    except KeyError:
+        latitude = 0*rowdata.df.ix[:,'TimeStamp (sec)']
+        latitude = 0*rowdata.df.ix[:,'TimeStamp (sec)']
+
+    return [latitude,longitude]
+
 def get_workouts(ids,userid):
     goodids = []
     for id in ids:
@@ -1107,6 +1123,13 @@ def datafusion(id1,id2,columns,offset):
                     'id'],
                    1,errors='ignore')
 
+    # Add coordinates to DataFrame
+    latitude,longitude = get_latlon(id1)
+    
+    df1[' latitude'] = latitude
+    df1[' longitude'] = longitude
+            
+
     df2 = getsmallrowdata_db(['time']+columns,ids=[id2],doclean=False)
     offsetmillisecs = offset.seconds*1000+offset.microseconds/1000.
     offsetmillisecs += offset.days*(3600*24*1000)