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

Merge branch 'develop' into feature/fastestchallenges

Browse Source
This commit is contained in:
Sander Roosendaal
2020-11-12 16:14:37 +01:00
parent 1afd8b8d16 011cfc8cca
commit 3fe50b3a8c
3 changed files with 18 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rowers/views/workoutviews.py
View File

@@ -2431,9 +2431,15 @@ def workout_view(request,id=0,raceresult=0,sessionresult=0,nocourseraceresult=0)
if hascoordinates:
mapscript,mapdiv = leaflet_chart(rowdata.df[' latitude'],
rowdata.df[' longitude'],
row.name)
if intervaldata:
rowdata.df['reltime'] = rowdata.df['TimeStamp (sec)']-rowdata.df.loc[0,'TimeStamp (sec)']
mask = (rowdata.df['reltime']>startsecond) & (rowdata.df['reltime']<endsecond)
latitudes = rowdata.df.loc[mask,' latitude']
longitudes = rowdata.df.loc[mask,' longitude']
else:
latitudes = rowdata.df[' latitude']
longitudes = rowdata.df[' longitude']
mapscript,mapdiv = leaflet_chart(latitudes,longitudes,row.name,)
else: