better treatment of impeller

rowers/dataprep.py

@@ -1898,11 +1898,11 @@ def parsenonpainsled(fileformat,f2,summary,startdatetime='',empowerfirmware=None
 
     return row,hasrecognized,summary,fileformat
 
-def handle_nonpainsled(f2, fileformat, summary='',startdatetime='',empowerfirmware=None):
+def handle_nonpainsled(f2, fileformat, summary='',startdatetime='',empowerfirmware=None,impeller=False):
     oarlength = 2.89
     inboard = 0.88
     hasrecognized = False
-    impeller = False
+
 
     row,hasrecognized,summary,fileformat = parsenonpainsled(fileformat,f2,summary,startdatetime=startdatetime,
                                                             empowerfirmware=empowerfirmware)
@@ -1926,6 +1926,8 @@ def handle_nonpainsled(f2, fileformat, summary='',startdatetime='',empowerfirmwa
             impeller = True
         if impellerdata and not consistent:
             row2.use_gpsdata()
+        if impeller:
+            row2.use_impellerdata()
 
     row2.write_csv(f2, gzip=True)
 
@@ -2003,9 +2005,10 @@ def new_workout_from_file(r, f2,
                           oarlockfirmware='',
                           inboard=None,
                           oarlength=None,
+                          impeller=False,
                           uploadoptions={'boattype':'1x','workouttype':'rower'}):
     message = ""
-    impeller = False
+
     try:
         fileformat = get_file_type(f2)
     except (IOError,UnicodeDecodeError):
@@ -2022,7 +2025,7 @@ def new_workout_from_file(r, f2,
         uploadoptions['fromuploadform'] = True
         bodyyaml = yaml.safe_dump(uploadoptions,default_flow_style=False)
         f_to_be_deleted = f2
-        impeller = False
+
         workoutsbox = Mailbox.objects.filter(name='workouts')[0]
         msg = Message(mailbox=workoutsbox,
                       from_header=r.user.email,
@@ -2110,6 +2113,7 @@ def new_workout_from_file(r, f2,
             startdatetime=startdatetime,
             summary=summary,
             empowerfirmware=oarlockfirmware,
+            impeller=impeller,
         )
         if not f2:
             message = 'Something went wrong'