diff --git a/rowers/views.py b/rowers/views.py index 537762e7..99d52253 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -489,30 +489,30 @@ def add_workout_from_strokedata(user,importid,data,strokedata, timestr = strftime("%Y%m%d-%H%M%S") - # auto smoothing - pace = df[' Stroke500mPace (sec/500m)'].values - velo = 500./pace + # # auto smoothing + # pace = df[' Stroke500mPace (sec/500m)'].values + # velo = 500./pace - f = df['TimeStamp (sec)'].diff().mean() - windowsize = 2*(int(10./(f)))+1 - if windowsize <= 3: - windowsize = 5 + # f = df['TimeStamp (sec)'].diff().mean() + # windowsize = 2*(int(10./(f)))+1 + # if windowsize <= 3: + # windowsize = 5 - df['originalvelo'] = velo + # df['originalvelo'] = velo - if windowsize > 3 and windowsize < len(velo): - velo2 = savgol_filter(velo,windowsize,3) - else: - velo2=velo + # if windowsize > 3 and windowsize < len(velo): + # velo2 = savgol_filter(velo,windowsize,3) + # else: + # velo2=velo - velo3 = pd.Series(velo2) - velo3 = velo3.replace([-np.inf,np.inf],np.nan) - velo3 = velo3.fillna(method='ffill') + # velo3 = pd.Series(velo2) + # velo3 = velo3.replace([-np.inf,np.inf],np.nan) + # velo3 = velo3.fillna(method='ffill') - pace2 = 500./abs(velo3) - df[' Stroke500mPace (sec/500m)'] = pace2 + # pace2 = 500./abs(velo3) + # df[' Stroke500mPace (sec/500m)'] = pace2 - df = df.fillna(0) + # df = df.fillna(0) # end autosmoothing @@ -681,9 +681,9 @@ def add_workout_from_runkeeperdata(user,importid,data): dt = np.diff(cum_time).mean() wsize = round(5./dt) - velo2 = stravastuff.ewmovingaverage(velo,wsize) + # velo2 = stravastuff.ewmovingaverage(velo,wsize) - df[' Stroke500mPace (sec/500m)'] = 500./velo2 + # df[' Stroke500mPace (sec/500m)'] = 500./velo2 df = df.fillna(0) @@ -1015,9 +1015,9 @@ def add_workout_from_underarmourdata(user,importid,data): dt = np.diff(cum_time).mean() wsize = round(5./dt) - velo2 = stravastuff.ewmovingaverage(velo,wsize) + # velo2 = stravastuff.ewmovingaverage(velo,wsize) - df[' Stroke500mPace (sec/500m)'] = 500./velo2 + # df[' Stroke500mPace (sec/500m)'] = 500./velo2 df = df.fillna(0) diff --git a/rowsandall_app/settings.py b/rowsandall_app/settings.py index 17b26242..0bf59f32 100644 --- a/rowsandall_app/settings.py +++ b/rowsandall_app/settings.py @@ -233,7 +233,8 @@ SPORTTRACKS_REDIRECT_URI = "http://rowsandall.com/sporttracks_callback" RUNKEEPER_CLIENT_ID = CFG['runkeeper_client_id'] RUNKEEPER_CLIENT_SECRET = CFG['runkeeper_client_secret'] -RUNKEEPER_REDIRECT_URI = "http://rowsandall.com/runkeeper_callback" +RUNKEEPER_REDIRECT_URI = CFG['runkeeper_callback'] + # Under Armour