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

Merge branch 'hotfix/v9.78'

Browse Source
This commit is contained in:
Sander Roosendaal
2019-04-16 21:10:38 -07:00
parent b663032e30 34d47892ec
commit 6c9db92d3e
1 changed files with 30 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
rowers/stravastuff.py
View File

@@ -693,50 +693,35 @@ def handle_strava_import_stroke_data(title,
r = type('Rower', (object,), {"stravatoken": stravatoken}) r = type('Rower', (object,), {"stravatoken": stravatoken})
spmjson = get_strava_stream(r,'cadence',stravaid) spm = get_strava_stream(r,'cadence',stravaid)
hrjson = get_strava_stream(r,'heartrate',stravaid) hr = get_strava_stream(r,'heartrate',stravaid)
timejson = get_strava_stream(r,'time',stravaid) t = get_strava_stream(r,'time',stravaid)
velojson = get_strava_stream(r,'velocity_smooth',stravaid) velo = get_strava_stream(r,'velocity_smooth',stravaid)
distancejson = get_strava_stream(r,'distance',stravaid) d = get_strava_stream(r,'distance',stravaid)
latlongjson = get_strava_stream(r,'latlng',stravaid) coords = get_strava_stream(r,'latlng',stravaid)
wattsjson = get_strava_stream(r,'watts',stravaid) power = get_strava_stream(r,'power',stravaid)
try: nr_rows = len(t)
t = np.array(timejson.json()[0]['data'])
nr_rows = len(t) if nr_rows == 0:
d = np.array(distancejson.json()[1]['data'])
if nr_rows == 0:
return 0
except IndexError:
d = 0*t
# return (0,"Error: No Distance information in the Strava data")
except KeyError:
return 0 return 0
try: if d is None:
spm = np.array(spmjson.json()[1]['data']) d = 0*t
except:
if spm is None:
spm = np.zeros(nr_rows) spm = np.zeros(nr_rows)
try: if power is None:
watts = np.array(wattsjson.json()[1]['data']) power = np.zeros(nr_rows)
except:
watts = np.zeros(nr_rows)
try: if hr is None:
hr = np.array(hrjson.json()[1]['data'])
except IndexError:
hr = np.zeros(nr_rows)
except KeyError:
hr = np.zeros(nr_rows) hr = np.zeros(nr_rows)
try: if velo is None:
velo = np.array(velojson.json()[1]['data'])
except IndexError:
velo = np.zeros(nr_rows)
except KeyError:
velo = np.zeros(nr_rows) velo = np.zeros(nr_rows)
f = np.diff(t).mean() f = np.diff(t).mean()
if f != 0: if f != 0:
windowsize = 2*(int(10./(f)))+1 windowsize = 2*(int(10./(f)))+1
@@ -748,14 +733,14 @@ def handle_strava_import_stroke_data(title,
else: else:
velo2 = velo velo2 = velo
coords = np.array(latlongjson.json()[0]['data']) if coords is not None:
try: try:
lat = coords[:,0] lat = coords[:,0]
lon = coords[:,1] lon = coords[:,1]
except IndexError: except IndexError:
lat = np.zeros(len(t)) lat = np.zeros(len(t))
lon = np.zeros(len(t)) lon = np.zeros(len(t))
except KeyError: else:
lat = np.zeros(len(t)) lat = np.zeros(len(t))
lon = np.zeros(len(t)) lon = np.zeros(len(t))
@@ -789,7 +774,7 @@ def handle_strava_import_stroke_data(title,
' AverageDriveForce (lbs)':np.zeros(nr_strokes), ' AverageDriveForce (lbs)':np.zeros(nr_strokes),
' PeakDriveForce (lbs)':np.zeros(nr_strokes), ' PeakDriveForce (lbs)':np.zeros(nr_strokes),
' lapIdx':np.zeros(nr_strokes), ' lapIdx':np.zeros(nr_strokes),
' Power (watts)':watts, ' Power (watts)':power,
}) })