Private
Public Access
1
0

Merge branch 'release/v13.85' into master

This commit is contained in:
Sander Roosendaal
2020-09-13 10:13:22 +02:00
3 changed files with 9 additions and 2 deletions

View File

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

View File

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

View File

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