Implement TCX {Average,Maximum}HeartRateBpm elements

Relates to issue #16.
pcolby · Aug 1, 2014 · ca66f99 · ca66f99
1 parent 163ae23
commit ca66f99
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/src/polar/v2/trainingsession.cpp b/src/polar/v2/trainingsession.cpp
@@ -1425,6 +1425,8 @@ QDomDocument TrainingSession::toTCX(const QString &buildTime) const
             qWarning() << "skipping exercise with no 'create' request data";
             continue;
         }
+        const QVariantMap create = map.value(CREATE).toMap();
+        const QVariantMap stats  = map.value(STATISTICS).toMap();
 
         QDomElement activity = doc.createElement(QLatin1String("Activity"));
         if (multiSportSession.isNull()) {
@@ -1440,7 +1442,6 @@ QDomDocument TrainingSession::toTCX(const QString &buildTime) const
         }
         Q_ASSERT(!activity.parentNode().isNull());
 
-        const QVariantMap create = map.value(CREATE).toMap();
 
         // Get the sport type.
         activity.setAttribute(QLatin1String("Sport"),
@@ -1467,8 +1468,13 @@ QDomDocument TrainingSession::toTCX(const QString &buildTime) const
             lap.appendChild(doc.createElement(QLatin1String("Calories")))
                 .appendChild(doc.createTextNode(QString::fromLatin1("%1")
                     .arg(first(create.value(QLatin1String("calories"))).toUInt())));
-            /// @todo [Optional] AverageHeartRateBpm/Value (ubyte)
-            /// @todo [Optional] MaximumHeartRateBpm/Value (ubyte)
+            const QVariantMap hrStats = firstMap(stats.value(QLatin1String("heartrate")));
+            lap.appendChild(doc.createElement(QLatin1String("AverageHeartRateBpm")))
+                .appendChild(doc.createElement(QLatin1String("Value")))
+                    .appendChild(doc.createTextNode(first(hrStats.value(QLatin1String("average"))).toString()));
+            lap.appendChild(doc.createElement(QLatin1String("MaximumHeartRateBpm")))
+                .appendChild(doc.createElement(QLatin1String("Value")))
+                    .appendChild(doc.createTextNode(first(hrStats.value(QLatin1String("maximum"))).toString()));
             /// @todo Intensity must be one of: Active, Resting.
             lap.appendChild(doc.createElement(QLatin1String("Intensity")))
                 .appendChild(doc.createTextNode(QString::fromLatin1("Active")));

diff --git a/test/polar/v2/testdata/training-sessions-19401412.tcx b/test/polar/v2/testdata/training-sessions-19401412.tcx
@@ -1,12 +1,18 @@
 <?xml version='1.0' encoding='utf-8'?>
-<TrainingCenterDatabase xmlns="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2 http://www.garmin.com/xmlschemas/TrainingCenterDatabasev2.xsd">
+<TrainingCenterDatabase xsi:schemaLocation="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2 http://www.garmin.com/xmlschemas/TrainingCenterDatabasev2.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2">
   <Activities>
     <Activity Sport="Running">
       <Id>2014-07-13T07:26:23+10:00</Id>
       <Lap StartTime="2014-07-13T07:26:23+10:00">
         <TotalTimeSeconds>5238.75</TotalTimeSeconds>
         <DistanceMeters>8483.9</DistanceMeters>
         <Calories>1212</Calories>
+        <AverageHeartRateBpm>
+          <Value>162</Value>
+        </AverageHeartRateBpm>
+        <MaximumHeartRateBpm>
+          <Value>181</Value>
+        </MaximumHeartRateBpm>
         <Intensity>Active</Intensity>
         <TriggerMethod>Manual</TriggerMethod>
         <Track>

diff --git a/test/polar/v2/testdata/training-sessions-19946380.tcx b/test/polar/v2/testdata/training-sessions-19946380.tcx
@@ -1,12 +1,18 @@
 <?xml version='1.0' encoding='utf-8'?>
-<TrainingCenterDatabase xsi:schemaLocation="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2 http://www.garmin.com/xmlschemas/TrainingCenterDatabasev2.xsd" xmlns="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<TrainingCenterDatabase xsi:schemaLocation="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2 http://www.garmin.com/xmlschemas/TrainingCenterDatabasev2.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2">
   <Activities>
     <Activity Sport="Other">
       <Id>2014-07-18T07:48:56+10:00</Id>
       <Lap StartTime="2014-07-18T07:48:56+10:00">
         <TotalTimeSeconds>3900.25</TotalTimeSeconds>
         <DistanceMeters>4571.6</DistanceMeters>
         <Calories>537</Calories>
+        <AverageHeartRateBpm>
+          <Value>119</Value>
+        </AverageHeartRateBpm>
+        <MaximumHeartRateBpm>
+          <Value>161</Value>
+        </MaximumHeartRateBpm>
         <Intensity>Active</Intensity>
         <TriggerMethod>Manual</TriggerMethod>
         <Track>