From 05a99fcaf74a5bae3b2f8a4463c3c7b9d4e2d14a Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 13 Sep 2020 09:01:41 +0200 Subject: [PATCH 1/2] bug fix --- rowers/dataprep.py | 2 +- rowers/tasks.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index 21434cf8..4fb84783 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -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, diff --git a/rowers/tasks.py b/rowers/tasks.py index 4d7ee6f5..d15f06d8 100644 --- a/rowers/tasks.py +++ b/rowers/tasks.py @@ -420,6 +420,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() From 0099fc678a3741c6392a765462b9124a3510a15f Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 13 Sep 2020 10:05:57 +0200 Subject: [PATCH 2/2] releasing trajectory extend at finish for virtual challenges --- requirements.txt | 2 +- rowers/tasks.py | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index bb926960..2b1029ca 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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 diff --git a/rowers/tasks.py b/rowers/tasks.py index d15f06d8..ec9a5bac 100644 --- a/rowers/tasks.py +++ b/rowers/tasks.py @@ -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']