sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

bug fix

Browse Source
This commit is contained in:
Sander Roosendaal
2020-06-12 18:17:28 +02:00
parent c6e58771e6
commit f9b72f6310
1 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
rowers/interactiveplots.py
View File

@@ -2064,24 +2064,25 @@ def leaflet_chart(lat,lon,name=""):
def leaflet_chart_compare(course,workoutids,labeldict={},startenddict={}): def leaflet_chart_compare(course,workoutids,labeldict={},startenddict={}):
data = [] data = []
for id in workoutids: for id in workoutids:
try: if id != 0 and id is not None:
w = Workout.objects.get(id=id) try:
rowdata = rdata(w.csvfilename) w = Workout.objects.get(id=id)
time = rowdata.df['TimeStamp (sec)'] rowdata = rdata(w.csvfilename)
df = pd.DataFrame({ time = rowdata.df['TimeStamp (sec)']
'workoutid':id, df = pd.DataFrame({
'lat':rowdata.df[' latitude'], 'workoutid':id,
'lon':rowdata.df[' longitude'], 'lat':rowdata.df[' latitude'],
'time':time-time[0], 'lon':rowdata.df[' longitude'],
}) 'time':time-time[0],
except Workout.DoesNotExist: })
df = pd.DataFrame({ except Workout.DoesNotExist:
'workoutid':id, df = pd.DataFrame({
'lat':[], 'workoutid':id,
'lon':[]} 'lat':[],
) 'lon':[]}
)
data.append(df) data.append(df)
df = pd.concat(data,axis=0) df = pd.concat(data,axis=0)