Changeset c555386 in OpenWorkouts-current

Timestamp:

Jan 11, 2019, 11:56:20 AM (5 years ago)

Author:

borja <borja@…>

Branches:

current, feature/docs, master

Children:

d17dffe

Parents:

b73ae09

Message:

(#26) Several bugfixes when loading data from fit, then generating gpx code

from it:

• Ensure track points are added to a generated gpx (from a fit file) if they exist.

• Ensure ascent (uphill), descent (downhill) and distance data is added to the Workout object if there is any in the fit file (fixes loading fit files for indoor training without gps data on them)

• Load the "sport" property from the fit file when loading data from fit into a Workout object

Location:

ow

Files:

• fit.py (modified) (2 diffs)
• models/workout.py (modified) (2 diffs)
• tests/fixtures/20181230_101115.gpx (modified) (1 diff)

ow/fit.py

@@ -116 +116 @@
         # The schema namespaces info is very important, in order to support
         # all the data we will extract from the fit file.
+
         gpx = gpxpy.gpx.GPX()
         gpx.creator = 'OpenWorkouts'
@@ -202 +203 @@
                     latitude=semicircles_to_degrees(values['position_lat']),
                     longitude=semicircles_to_degrees(values['position_long']),
-                    elevation=values['enhanced_altitude'],
-                    speed=values['enhanced_speed'],
                     time=values['timestamp']
                 )
 
-            track_point.extensions.append(extensions_root)
-
-            gpx_segment.points.append(track_point)
+                if 'enhanced_altitude' in values.keys():
+                    track_point.elevation = values['enhanced_altitude']
+
+                if 'enhanced_speed' in values.keys():
+                    track_point.speed = values['enhanced_speed']
+
+                track_point.extensions.append(extensions_root)
+
+                gpx_segment.points.append(track_point)
 
         # if the fit file has temperature data, calculate the avg

ow/models/workout.py

@@ -360 +360 @@
 
         # grab the needed data from the fit file, update the workout
+        self.sport = fit.data['sport']
         self.start = fit.data['start']
         # ensure this datetime start object is timezone-aware
@@ -365 +366 @@
         # duration comes in seconds, store a timedelta
         self.duration = timedelta(seconds=fit.data['duration'])
-        # distance comes in meters
-        self.distance = Decimal(fit.data['distance']) / Decimal(1000.00)
-        self.uphill = Decimal(fit.data['uphill'])
-        self.downhill = Decimal(fit.data['downhill'])
+        if fit.data['distance']:
+            # distance comes in meters
+            self.distance = Decimal(fit.data['distance']) / Decimal(1000.00)
+        if fit.data['uphill']:
+            self.uphill = Decimal(fit.data['uphill'])
+        if fit.data['downhill']:
+            self.downhill = Decimal(fit.data['downhill'])
         # If the user did not provide us with a title, build one from the
         # info in the fit file

ow/tests/fixtures/20181230_101115.gpx

@@ -58269 +58269 @@
             <gpxtpx:cad>0</gpxtpx:cad>
           </gpxtpx:TrackPointExtension>
-          <gpxtpx:TrackPointExtension>
-            <gpxtpx:atemp>3</gpxtpx:atemp>
-            <gpxtpx:hr>139</gpxtpx:hr>
-            <gpxtpx:cad>0</gpxtpx:cad>
-          </gpxtpx:TrackPointExtension>
-        </extensions>
-      </trkpt>
-      <trkpt lat="43.02351839840412" lon="-7.338556135073304">
-        <ele>726.0</ele>
-        <time>2018-12-30T11:48:21Z</time>
-        <extensions>
-          <gpxtpx:TrackPointExtension>
-            <gpxtpx:atemp>3</gpxtpx:atemp>
-            <gpxtpx:hr>140</gpxtpx:hr>
-            <gpxtpx:cad>0</gpxtpx:cad>
-          </gpxtpx:TrackPointExtension>
-          <gpxtpx:TrackPointExtension>
-            <gpxtpx:atemp>3</gpxtpx:atemp>
-            <gpxtpx:hr>139</gpxtpx:hr>
-            <gpxtpx:cad>0</gpxtpx:cad>
-          </gpxtpx:TrackPointExtension>
         </extensions>
       </trkpt>