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

Merge branch 'release/v13.85' into master

Browse Source
This commit is contained in:
Sander Roosendaal
2020-09-13 10:13:22 +02:00
parent 4f867fd943 0099fc678a
commit 54c35bb65c
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
requirements.txt
View File

@@ -184,7 +184,7 @@ ratelim==0.1.6
redis==3.2.1 redis==3.2.1
requests==2.23.0 requests==2.23.0
requests-oauthlib==1.2.0 requests-oauthlib==1.2.0
rowingdata==2.9.3 rowingdata==2.9.7
rowingphysics==0.5.0 rowingphysics==0.5.0
rq==0.13.0 rq==0.13.0
rules==2.1 rules==2.1

2
rowers/dataprep.py
View File

@@ -1320,7 +1320,7 @@ def save_workout_database(f2, r, dosmooth=True, workouttype='rower',
tf = TimezoneFinder() tf = TimezoneFinder()
try: try:
timezone_str = tf.timezone_at(lng=lonavg, lat=latavg) timezone_str = tf.timezone_at(lng=lonavg, lat=latavg)
except ValueError: except (ValueError,OverflowError):
timezone_str = 'UTC' timezone_str = 'UTC'
if timezone_str == None: if timezone_str == None:
timezone_str = tf.closest_timezone_at(lng=lonavg, timezone_str = tf.closest_timezone_at(lng=lonavg,

7
rowers/tasks.py
View File

@@ -397,6 +397,11 @@ def handle_check_race_course(self,
except IOError: except IOError:
return 0 return 0
row.extend_data()
#row.df.interpolate(inplace=True)
row.calc_dist_from_gps() row.calc_dist_from_gps()
rowdata = row.df rowdata = row.df
rowdata['cum_dist'] = rowdata['gps_dist_calculated'] rowdata['cum_dist'] = rowdata['gps_dist_calculated']
@@ -420,6 +425,8 @@ def handle_check_race_course(self,
rowdata['dt'] = rowdata['time'].apply( rowdata['dt'] = rowdata['time'].apply(
lambda x: safetimedelta(x) lambda x: safetimedelta(x)
) )
rowdata = rowdata.resample('100ms',on='dt').mean() rowdata = rowdata.resample('100ms',on='dt').mean()
rowdata = rowdata.interpolate() rowdata = rowdata.interpolate()