strava bug fixed

rowers/stravastuff.py

@@ -322,7 +322,7 @@ def get_workout(user,stravaid):
         velo = get_strava_stream(r,'velocity_smooth',stravaid)
         d = get_strava_stream(r,'distance',stravaid)
         coords = get_strava_stream(r,'latlng',stravaid)
-        power = get_strava_stream(r,'power',stravaid)
+        power = get_strava_stream(r,'watts',stravaid)
 
         if t is not None:
             nr_rows = len(t)
@@ -388,6 +388,8 @@ def get_workout(user,stravaid):
                            'strokelength':strokelength,
                            })
 
+
+
         # startdatetime = datetime.datetime.strptime(startdatetime,"%Y-%m-%d-%H:%M:%S")
 
         return [workoutsummary,df]
@@ -736,7 +738,7 @@ def handle_strava_import_stroke_data(title,
     velo = get_strava_stream(r,'velocity_smooth',stravaid)
     d = get_strava_stream(r,'distance',stravaid)
     coords = get_strava_stream(r,'latlng',stravaid)
-    power = get_strava_stream(r,'power',stravaid)
+    power = get_strava_stream(r,'watts',stravaid)
 
     if t is not None:
         nr_rows = len(t)
@@ -800,6 +802,9 @@ def handle_strava_import_stroke_data(title,
 
     strokedistance = 60.*velo2/spm
 
+    if workouttype == 'rower' and pd.Series(power).mean() == 0:
+        power = 2.8*(velo2**3)
+
     nr_strokes = len(t)
 
     df = pd.DataFrame({'TimeStamp (sec)':unixtime,
@@ -824,6 +829,8 @@ def handle_strava_import_stroke_data(title,
     })
 
 
+
+
     df.sort_values(by='TimeStamp (sec)',ascending=True)
 
     res = df.to_csv(csvfilename,index_label='index')

rowers/utils.py

@@ -474,6 +474,9 @@ def get_strava_stream(r,metric,stravaid,series_type='time',fetchresolution='high
 	       'Content-Type': 'application/json',
 	       'resolution': 'medium',}
 
+    if metric == 'power':
+        metric = 'watts'
+
     url = "https://www.strava.com/api/v3/activities/{stravaid}/streams/{metric}?resolution={fetchresolution}&series_type={series_type}".format(
         stravaid=stravaid,
         fetchresolution=fetchresolution,
@@ -484,6 +487,12 @@ def get_strava_stream(r,metric,stravaid,series_type='time',fetchresolution='high
 
     s = requests.get(url,headers=headers)
 
+
+    if metric=='power':
+        with open('data.txt', 'w') as outfile:
+            json.dump(s.json(), outfile)
+            print('saved to file')
+
     for data in s.json():
         y = None
         try: