From 32603fbfea9e4b0ec972b67cb78f29f13e412018 Mon Sep 17 00:00:00 2001
From: Paul Colby <git@colby.id.au>
Date: Mon, 5 Jan 2015 18:20:13 +1100
Subject: [PATCH] Include power data in TCX output (#31, #43, #47)

TCX has no support for power data per se, however, both the Garmin
Activity Extension (#31) and the Garmin Course Extension (#47) support
power data.  This change includes power data for both extensions.

Note, the Garmin Course Extension is currently not unit tested (will
add unit tests shortly).  Also, there are a few code paths added in
this change that cannot be tested until we get a data set that includes
*both* power data and lap data (#46).
---
 src/polar/v2/trainingsession.cpp              | 53 ++++++++++++++++++-
 src/polar/v2/trainingsession.h                |  2 +-
 .../training-sessions-1.all-extensions.tcx    |  2 +-
 .../training-sessions-1.garmin-activity.tcx   |  2 +-
 ...ining-sessions-19401412.all-extensions.tcx |  7 ++-
 ...ning-sessions-19401412.garmin-activity.tcx |  2 +-
 ...ining-sessions-19946380.all-extensions.tcx |  3 +-
 ...ning-sessions-19946380.garmin-activity.tcx |  2 +-
 .../training-sessions-2.all-extensions.tcx    |  2 +-
 .../training-sessions-2.garmin-activity.tcx   |  2 +-
 ...ining-sessions-22165267.all-extensions.tcx | 12 ++++-
 ...ning-sessions-22165267.garmin-activity.tcx |  2 +-
 ...ining-sessions-42261903.all-extensions.tcx | 32 ++++++++++-
 ...ning-sessions-42261903.garmin-activity.tcx | 31 ++++++++++-
 test/polar/v2/testtrainingsession.cpp         |  1 +
 test/polar/v2/testtrainingsession.h           |  4 ++
 16 files changed, 144 insertions(+), 15 deletions(-)

diff --git a/src/polar/v2/trainingsession.cpp b/src/polar/v2/trainingsession.cpp
index 3be9de30..b98f0386 100644
--- a/src/polar/v2/trainingsession.cpp
+++ b/src/polar/v2/trainingsession.cpp
@@ -1794,6 +1794,10 @@ QDomDocument TrainingSession::toTCX(const QString &buildTime) const
         tcx.setAttribute(QLatin1String("xmlns:ax2"),
                          QLatin1String("http://www.garmin.com/xmlschemas/ActivityExtension/v2"));
     }
+    if (tcxOptions.testFlag(GarminCourseExtension)) {
+        tcx.setAttribute(QLatin1String("xmlns:cx1"),
+                         QLatin1String("http://www.garmin.com/xmlschemas/CourseExtension/v1"));
+    }
     doc.appendChild(tcx);
 
     QDomElement activities = doc.createElement(QLatin1String("Activities"));
@@ -1825,6 +1829,8 @@ QDomDocument TrainingSession::toTCX(const QString &buildTime) const
         // Get the "samples" samples.
         const QVariantList altitude    = samples.value(QLatin1String("altitude")).toList();
         const QVariantList cadence     = samples.value(QLatin1String("cadence")).toList();
+        const QVariantList powerLeft   = samples.value(QLatin1String("left-pedal-power")).toList();
+        const QVariantList powerRight  = samples.value(QLatin1String("right-pedal-power")).toList();
         const QVariantList distance    = samples.value(QLatin1String("distance")).toList();
         const QVariantList heartrate   = samples.value(QLatin1String("heartrate")).toList();
         const QVariantList speed       = samples.value(QLatin1String("speed")).toList();
@@ -1955,7 +1961,9 @@ QDomDocument TrainingSession::toTCX(const QString &buildTime) const
                 lap.appendChild(track);
 
                 // Add any enabled extensions.
-                if (tcxOptions.testFlag(GarminActivityExtension)) {
+                if (tcxOptions.testFlag(GarminActivityExtension) ||
+                    tcxOptions.testFlag(GarminCourseExtension))
+                {
                     QDomElement extensions = doc.createElement(QLatin1String("Extensions"));
                     lap.appendChild(extensions);
 
@@ -1996,7 +2004,37 @@ QDomDocument TrainingSession::toTCX(const QString &buildTime) const
                                         .arg(first(cadence.value(QLatin1String("maximum"))).toUInt())));
                             }
 
-                            /// @todo AvgWatts and MaxWatts when power data is available.
+                            /// @todo Steps
+
+                            // Note, AvgWatts is defined by both the Garmin Activity
+                            // Extension and the Garmin Course Extension schemas.
+                            const QVariantMap power = firstMap(base.value(QLatin1String("power")));
+                            if (power.contains(QLatin1String("average"))) {
+                                lx.appendChild(doc.createElement(QLatin1String("AvgWatts")))
+                                    .appendChild(doc.createTextNode(QString::fromLatin1("%1")
+                                        .arg(first(power.value(QLatin1String("average"))).toUInt())));
+                            }
+                            if (power.contains(QLatin1String("maximum"))) {
+                                lx.appendChild(doc.createElement(QLatin1String("MaxWatts")))
+                                    .appendChild(doc.createTextNode(QString::fromLatin1("%1")
+                                        .arg(first(power.value(QLatin1String("maximum"))).toUInt())));
+                            }
+                        }
+
+                        if (tcxOptions.testFlag(GarminCourseExtension)) {
+                            QDomElement cx = doc.createElement(QLatin1String("CX"));
+                            cx.setAttribute(QLatin1String("xmlns"),
+                                QLatin1String("http://www.garmin.com/xmlschemas/CourseExtension/v1"));
+                            extensions.appendChild(cx);
+
+                            // Note, AvgWatts is defined by both the Garmin Activity
+                            // Extension and the Garmin Course Extension schemas.
+                            const QVariantMap power = firstMap(base.value(QLatin1String("power")));
+                            if (power.contains(QLatin1String("average"))) {
+                                cx.appendChild(doc.createElement(QLatin1String("AvgWatts")))
+                                    .appendChild(doc.createTextNode(QString::fromLatin1("%1")
+                                        .arg(first(power.value(QLatin1String("average"))).toUInt())));
+                            }
                         }
                     }
                 }
@@ -2061,6 +2099,17 @@ QDomDocument TrainingSession::toTCX(const QString &buildTime) const
                             .appendChild(doc.createTextNode(cadence.at(index).toString()));
                     }
                 }
+
+                const int currentPowerLeft = (index < powerLeft.length()) ?
+                    first(powerLeft.at(index).toMap().value(QLatin1String("current-power"))).toInt() : 0;
+                const int currentPowerRight = (index < powerRight.length()) ?
+                    first(powerRight.at(index).toMap().value(QLatin1String("current-power"))).toInt() : 0;
+                const int currentPower = currentPowerLeft + currentPowerRight;
+                if (currentPower != 0) {
+                    tpx.appendChild(doc.createElement(QLatin1String("Watts")))
+                        .appendChild(doc.createTextNode(QString::fromLatin1("%1")
+                            .arg(currentPower)));
+                }
             }
 
             if (trackPoint.hasChildNodes()) {
diff --git a/src/polar/v2/trainingsession.h b/src/polar/v2/trainingsession.h
index 873a7874..16072bc2 100644
--- a/src/polar/v2/trainingsession.h
+++ b/src/polar/v2/trainingsession.h
@@ -66,7 +66,7 @@ class TrainingSession : public QObject {
     enum TcxOption {
         ForceTcxUTC = 0x0001,
         GarminActivityExtension = 0x0100,
-      //GarminCourseExtension   = 0x0200, //< Needs power support.
+        GarminCourseExtension   = 0x0200,
     };
     Q_DECLARE_FLAGS(TcxOptions, TcxOption)
 
diff --git a/test/polar/v2/testdata/training-sessions-1.all-extensions.tcx b/test/polar/v2/testdata/training-sessions-1.all-extensions.tcx
index 7c0f79c7..c193671d 100644
--- a/test/polar/v2/testdata/training-sessions-1.all-extensions.tcx
+++ b/test/polar/v2/testdata/training-sessions-1.all-extensions.tcx
@@ -1,5 +1,5 @@
 <?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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2" xmlns:ax2="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
+<TrainingCenterDatabase xmlns:ax2="http://www.garmin.com/xmlschemas/ActivityExtension/v2" xmlns:cx1="http://www.garmin.com/xmlschemas/CourseExtension/v1" 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">
   <Author xsi:type="Application_t">
     <Name>Bipolar</Name>
     <Build>
diff --git a/test/polar/v2/testdata/training-sessions-1.garmin-activity.tcx b/test/polar/v2/testdata/training-sessions-1.garmin-activity.tcx
index 7c0f79c7..102cbc1b 100644
--- a/test/polar/v2/testdata/training-sessions-1.garmin-activity.tcx
+++ b/test/polar/v2/testdata/training-sessions-1.garmin-activity.tcx
@@ -1,5 +1,5 @@
 <?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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2" xmlns:ax2="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
+<TrainingCenterDatabase xmlns:ax2="http://www.garmin.com/xmlschemas/ActivityExtension/v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2" xsi:schemaLocation="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2 http://www.garmin.com/xmlschemas/TrainingCenterDatabasev2.xsd">
   <Author xsi:type="Application_t">
     <Name>Bipolar</Name>
     <Build>
diff --git a/test/polar/v2/testdata/training-sessions-19401412.all-extensions.tcx b/test/polar/v2/testdata/training-sessions-19401412.all-extensions.tcx
index 0da8397c..72bbd96b 100644
--- a/test/polar/v2/testdata/training-sessions-19401412.all-extensions.tcx
+++ b/test/polar/v2/testdata/training-sessions-19401412.all-extensions.tcx
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<TrainingCenterDatabase xmlns="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2" xsi:schemaLocation="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2 http://www.garmin.com/xmlschemas/TrainingCenterDatabasev2.xsd" xmlns:ax2="http://www.garmin.com/xmlschemas/ActivityExtension/v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<TrainingCenterDatabase xmlns:ax2="http://www.garmin.com/xmlschemas/ActivityExtension/v2" xmlns:cx1="http://www.garmin.com/xmlschemas/CourseExtension/v1" 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>
@@ -27082,6 +27082,7 @@
           <LX xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
             <AvgSpeed>5.87056</AvgSpeed>
           </LX>
+          <CX xmlns="http://www.garmin.com/xmlschemas/CourseExtension/v1"/>
         </Extensions>
       </Lap>
       <Lap StartTime="2014-07-13T07:56:27+10:00">
@@ -49498,6 +49499,7 @@
           <LX xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
             <AvgSpeed>4.90671</AvgSpeed>
           </LX>
+          <CX xmlns="http://www.garmin.com/xmlschemas/CourseExtension/v1"/>
         </Extensions>
       </Lap>
       <Lap StartTime="2014-07-13T08:21:20+10:00">
@@ -52924,6 +52926,7 @@
           <LX xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
             <AvgSpeed>8.38207</AvgSpeed>
           </LX>
+          <CX xmlns="http://www.garmin.com/xmlschemas/CourseExtension/v1"/>
         </Extensions>
       </Lap>
       <Lap StartTime="2014-07-13T08:25:07+10:00">
@@ -76375,6 +76378,7 @@
           <LX xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
             <AvgSpeed>5.982</AvgSpeed>
           </LX>
+          <CX xmlns="http://www.garmin.com/xmlschemas/CourseExtension/v1"/>
         </Extensions>
       </Lap>
       <Lap StartTime="2014-07-13T08:51:09+10:00">
@@ -78691,6 +78695,7 @@
           <LX xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
             <AvgSpeed>9.00117</AvgSpeed>
           </LX>
+          <CX xmlns="http://www.garmin.com/xmlschemas/CourseExtension/v1"/>
         </Extensions>
       </Lap>
     </Activity>
diff --git a/test/polar/v2/testdata/training-sessions-19401412.garmin-activity.tcx b/test/polar/v2/testdata/training-sessions-19401412.garmin-activity.tcx
index 0da8397c..3abf69fb 100644
--- a/test/polar/v2/testdata/training-sessions-19401412.garmin-activity.tcx
+++ b/test/polar/v2/testdata/training-sessions-19401412.garmin-activity.tcx
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<TrainingCenterDatabase xmlns="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2" xsi:schemaLocation="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2 http://www.garmin.com/xmlschemas/TrainingCenterDatabasev2.xsd" xmlns:ax2="http://www.garmin.com/xmlschemas/ActivityExtension/v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<TrainingCenterDatabase xmlns:ax2="http://www.garmin.com/xmlschemas/ActivityExtension/v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2" xsi:schemaLocation="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2 http://www.garmin.com/xmlschemas/TrainingCenterDatabasev2.xsd">
   <Activities>
     <Activity Sport="Running">
       <Id>2014-07-13T07:26:23+10:00</Id>
diff --git a/test/polar/v2/testdata/training-sessions-19946380.all-extensions.tcx b/test/polar/v2/testdata/training-sessions-19946380.all-extensions.tcx
index f620669d..d3e4bced 100644
--- a/test/polar/v2/testdata/training-sessions-19946380.all-extensions.tcx
+++ b/test/polar/v2/testdata/training-sessions-19946380.all-extensions.tcx
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<TrainingCenterDatabase xmlns="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2" xsi:schemaLocation="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2 http://www.garmin.com/xmlschemas/TrainingCenterDatabasev2.xsd" xmlns:ax2="http://www.garmin.com/xmlschemas/ActivityExtension/v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<TrainingCenterDatabase xmlns:ax2="http://www.garmin.com/xmlschemas/ActivityExtension/v2" xmlns:cx1="http://www.garmin.com/xmlschemas/CourseExtension/v1" 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>
@@ -58315,6 +58315,7 @@
           <LX xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
             <AvgSpeed>4.21967</AvgSpeed>
           </LX>
+          <CX xmlns="http://www.garmin.com/xmlschemas/CourseExtension/v1"/>
         </Extensions>
       </Lap>
     </Activity>
diff --git a/test/polar/v2/testdata/training-sessions-19946380.garmin-activity.tcx b/test/polar/v2/testdata/training-sessions-19946380.garmin-activity.tcx
index f620669d..6b00a8ee 100644
--- a/test/polar/v2/testdata/training-sessions-19946380.garmin-activity.tcx
+++ b/test/polar/v2/testdata/training-sessions-19946380.garmin-activity.tcx
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<TrainingCenterDatabase xmlns="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2" xsi:schemaLocation="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2 http://www.garmin.com/xmlschemas/TrainingCenterDatabasev2.xsd" xmlns:ax2="http://www.garmin.com/xmlschemas/ActivityExtension/v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<TrainingCenterDatabase xmlns:ax2="http://www.garmin.com/xmlschemas/ActivityExtension/v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2" xsi:schemaLocation="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2 http://www.garmin.com/xmlschemas/TrainingCenterDatabasev2.xsd">
   <Activities>
     <Activity Sport="Other">
       <Id>2014-07-18T07:48:56+10:00</Id>
diff --git a/test/polar/v2/testdata/training-sessions-2.all-extensions.tcx b/test/polar/v2/testdata/training-sessions-2.all-extensions.tcx
index 7c0f79c7..c193671d 100644
--- a/test/polar/v2/testdata/training-sessions-2.all-extensions.tcx
+++ b/test/polar/v2/testdata/training-sessions-2.all-extensions.tcx
@@ -1,5 +1,5 @@
 <?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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2" xmlns:ax2="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
+<TrainingCenterDatabase xmlns:ax2="http://www.garmin.com/xmlschemas/ActivityExtension/v2" xmlns:cx1="http://www.garmin.com/xmlschemas/CourseExtension/v1" 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">
   <Author xsi:type="Application_t">
     <Name>Bipolar</Name>
     <Build>
diff --git a/test/polar/v2/testdata/training-sessions-2.garmin-activity.tcx b/test/polar/v2/testdata/training-sessions-2.garmin-activity.tcx
index 7c0f79c7..102cbc1b 100644
--- a/test/polar/v2/testdata/training-sessions-2.garmin-activity.tcx
+++ b/test/polar/v2/testdata/training-sessions-2.garmin-activity.tcx
@@ -1,5 +1,5 @@
 <?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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2" xmlns:ax2="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
+<TrainingCenterDatabase xmlns:ax2="http://www.garmin.com/xmlschemas/ActivityExtension/v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2" xsi:schemaLocation="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2 http://www.garmin.com/xmlschemas/TrainingCenterDatabasev2.xsd">
   <Author xsi:type="Application_t">
     <Name>Bipolar</Name>
     <Build>
diff --git a/test/polar/v2/testdata/training-sessions-22165267.all-extensions.tcx b/test/polar/v2/testdata/training-sessions-22165267.all-extensions.tcx
index ec4803ab..6046b4f4 100644
--- a/test/polar/v2/testdata/training-sessions-22165267.all-extensions.tcx
+++ b/test/polar/v2/testdata/training-sessions-22165267.all-extensions.tcx
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<TrainingCenterDatabase xmlns="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2" xsi:schemaLocation="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2 http://www.garmin.com/xmlschemas/TrainingCenterDatabasev2.xsd" xmlns:ax2="http://www.garmin.com/xmlschemas/ActivityExtension/v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<TrainingCenterDatabase xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2" xsi:schemaLocation="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2 http://www.garmin.com/xmlschemas/TrainingCenterDatabasev2.xsd" xmlns:ax2="http://www.garmin.com/xmlschemas/ActivityExtension/v2" xmlns:cx1="http://www.garmin.com/xmlschemas/CourseExtension/v1">
   <Activities>
     <Activity Sport="Running">
       <Id>2014-08-07T17:25:01+10:00</Id>
@@ -4565,6 +4565,7 @@
             <AvgRunCadence>80</AvgRunCadence>
             <MaxRunCadence>84</MaxRunCadence>
           </LX>
+          <CX xmlns="http://www.garmin.com/xmlschemas/CourseExtension/v1"/>
         </Extensions>
       </Lap>
       <Lap StartTime="2014-08-07T17:29:00+10:00">
@@ -9187,6 +9188,7 @@
             <AvgRunCadence>83</AvgRunCadence>
             <MaxRunCadence>85</MaxRunCadence>
           </LX>
+          <CX xmlns="http://www.garmin.com/xmlschemas/CourseExtension/v1"/>
         </Extensions>
       </Lap>
       <Lap StartTime="2014-08-07T17:33:02+10:00">
@@ -13733,6 +13735,7 @@
             <AvgRunCadence>83</AvgRunCadence>
             <MaxRunCadence>86</MaxRunCadence>
           </LX>
+          <CX xmlns="http://www.garmin.com/xmlschemas/CourseExtension/v1"/>
         </Extensions>
       </Lap>
       <Lap StartTime="2014-08-07T17:37:00+10:00">
@@ -17082,6 +17085,7 @@
             <AvgRunCadence>85</AvgRunCadence>
             <MaxRunCadence>89</MaxRunCadence>
           </LX>
+          <CX xmlns="http://www.garmin.com/xmlschemas/CourseExtension/v1"/>
         </Extensions>
       </Lap>
       <Lap StartTime="2014-08-07T17:39:55+10:00">
@@ -22122,6 +22126,7 @@
             <AvgRunCadence>81</AvgRunCadence>
             <MaxRunCadence>84</MaxRunCadence>
           </LX>
+          <CX xmlns="http://www.garmin.com/xmlschemas/CourseExtension/v1"/>
         </Extensions>
       </Lap>
       <Lap StartTime="2014-08-07T17:44:19+10:00">
@@ -27048,6 +27053,7 @@
             <AvgRunCadence>82</AvgRunCadence>
             <MaxRunCadence>85</MaxRunCadence>
           </LX>
+          <CX xmlns="http://www.garmin.com/xmlschemas/CourseExtension/v1"/>
         </Extensions>
       </Lap>
       <Lap StartTime="2014-08-07T17:48:37+10:00">
@@ -30606,6 +30612,7 @@
             <AvgRunCadence>84</AvgRunCadence>
             <MaxRunCadence>86</MaxRunCadence>
           </LX>
+          <CX xmlns="http://www.garmin.com/xmlschemas/CourseExtension/v1"/>
         </Extensions>
       </Lap>
       <Lap StartTime="2014-08-07T17:51:43+10:00">
@@ -35741,6 +35748,7 @@
             <AvgRunCadence>81</AvgRunCadence>
             <MaxRunCadence>83</MaxRunCadence>
           </LX>
+          <CX xmlns="http://www.garmin.com/xmlschemas/CourseExtension/v1"/>
         </Extensions>
       </Lap>
       <Lap StartTime="2014-08-07T17:56:12+10:00">
@@ -40230,6 +40238,7 @@
             <AvgRunCadence>81</AvgRunCadence>
             <MaxRunCadence>84</MaxRunCadence>
           </LX>
+          <CX xmlns="http://www.garmin.com/xmlschemas/CourseExtension/v1"/>
         </Extensions>
       </Lap>
       <Lap StartTime="2014-08-07T18:00:07+10:00">
@@ -40717,6 +40726,7 @@
         </Track>
         <Extensions>
           <LX xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2"/>
+          <CX xmlns="http://www.garmin.com/xmlschemas/CourseExtension/v1"/>
         </Extensions>
       </Lap>
     </Activity>
diff --git a/test/polar/v2/testdata/training-sessions-22165267.garmin-activity.tcx b/test/polar/v2/testdata/training-sessions-22165267.garmin-activity.tcx
index ec4803ab..d7ec6486 100644
--- a/test/polar/v2/testdata/training-sessions-22165267.garmin-activity.tcx
+++ b/test/polar/v2/testdata/training-sessions-22165267.garmin-activity.tcx
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<TrainingCenterDatabase xmlns="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2" xsi:schemaLocation="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2 http://www.garmin.com/xmlschemas/TrainingCenterDatabasev2.xsd" xmlns:ax2="http://www.garmin.com/xmlschemas/ActivityExtension/v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<TrainingCenterDatabase xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2" xsi:schemaLocation="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2 http://www.garmin.com/xmlschemas/TrainingCenterDatabasev2.xsd" xmlns:ax2="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
   <Activities>
     <Activity Sport="Running">
       <Id>2014-08-07T17:25:01+10:00</Id>
diff --git a/test/polar/v2/testdata/training-sessions-42261903.all-extensions.tcx b/test/polar/v2/testdata/training-sessions-42261903.all-extensions.tcx
index 4c3a4c6c..f7724765 100644
--- a/test/polar/v2/testdata/training-sessions-42261903.all-extensions.tcx
+++ b/test/polar/v2/testdata/training-sessions-42261903.all-extensions.tcx
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<TrainingCenterDatabase xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2" xsi:schemaLocation="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2 http://www.garmin.com/xmlschemas/TrainingCenterDatabasev2.xsd" xmlns:ax2="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
+<TrainingCenterDatabase xmlns:ax2="http://www.garmin.com/xmlschemas/ActivityExtension/v2" xmlns:cx1="http://www.garmin.com/xmlschemas/CourseExtension/v1" 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="Biking">
       <Id>2014-12-29T12:58:44+01:00</Id>
@@ -54,6 +54,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>30</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -64,6 +65,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>25</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -74,6 +76,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>37</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -84,6 +87,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>55</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -94,6 +98,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>61</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -104,6 +109,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>31</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -114,6 +120,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>71</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -124,6 +131,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>101</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -134,6 +142,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>142</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -144,6 +153,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>123</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -154,6 +164,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>119</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -164,6 +175,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>47</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -174,6 +186,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>77</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -184,6 +197,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>105</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -194,6 +208,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>136</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -204,6 +219,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>141</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -214,6 +230,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>142</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -224,6 +241,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>132</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -234,6 +252,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>128</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -244,6 +263,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>136</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -254,6 +274,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>113</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -264,6 +285,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>51</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -274,6 +296,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>15</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -284,6 +307,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>19</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -294,6 +318,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>93</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -304,6 +329,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>271</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -314,6 +340,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>287</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -324,6 +351,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>249</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -334,6 +362,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>94</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -373,6 +402,7 @@
             <MaxBikeCadence>106</MaxBikeCadence>
             <AvgRunCadence>62</AvgRunCadence>
           </LX>
+          <CX xmlns="http://www.garmin.com/xmlschemas/CourseExtension/v1"/>
         </Extensions>
       </Lap>
     </Activity>
diff --git a/test/polar/v2/testdata/training-sessions-42261903.garmin-activity.tcx b/test/polar/v2/testdata/training-sessions-42261903.garmin-activity.tcx
index 4c3a4c6c..4ebb13aa 100644
--- a/test/polar/v2/testdata/training-sessions-42261903.garmin-activity.tcx
+++ b/test/polar/v2/testdata/training-sessions-42261903.garmin-activity.tcx
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<TrainingCenterDatabase xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2" xsi:schemaLocation="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2 http://www.garmin.com/xmlschemas/TrainingCenterDatabasev2.xsd" xmlns:ax2="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
+<TrainingCenterDatabase xmlns:ax2="http://www.garmin.com/xmlschemas/ActivityExtension/v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2" xsi:schemaLocation="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2 http://www.garmin.com/xmlschemas/TrainingCenterDatabasev2.xsd">
   <Activities>
     <Activity Sport="Biking">
       <Id>2014-12-29T12:58:44+01:00</Id>
@@ -54,6 +54,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>30</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -64,6 +65,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>25</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -74,6 +76,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>37</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -84,6 +87,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>55</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -94,6 +98,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>61</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -104,6 +109,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>31</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -114,6 +120,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>71</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -124,6 +131,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>101</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -134,6 +142,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>142</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -144,6 +153,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>123</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -154,6 +164,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>119</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -164,6 +175,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>47</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -174,6 +186,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>77</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -184,6 +197,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>105</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -194,6 +208,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>136</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -204,6 +219,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>141</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -214,6 +230,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>142</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -224,6 +241,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>132</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -234,6 +252,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>128</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -244,6 +263,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>136</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -254,6 +274,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>113</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -264,6 +285,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>51</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -274,6 +296,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>15</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -284,6 +307,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>19</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -294,6 +318,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>93</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -304,6 +329,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>271</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -314,6 +340,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>287</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -324,6 +351,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>249</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
@@ -334,6 +362,7 @@
             <Extensions>
               <TPX CadenceSensor="Bike" xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
                 <Speed>0</Speed>
+                <Watts>94</Watts>
               </TPX>
             </Extensions>
           </Trackpoint>
diff --git a/test/polar/v2/testtrainingsession.cpp b/test/polar/v2/testtrainingsession.cpp
index f2f864db..091f2727 100644
--- a/test/polar/v2/testtrainingsession.cpp
+++ b/test/polar/v2/testtrainingsession.cpp
@@ -1364,6 +1364,7 @@ void TestTrainingSession::toTCX_AllExtensions()
     polar::v2::TrainingSession session(baseName);
     QVERIFY(session.parse());
     session.setTcxOption(polar::v2::TrainingSession::GarminActivityExtension);
+    session.setTcxOption(polar::v2::TrainingSession::GarminCourseExtension);
     QDomDocument tcx = session.toTCX(QLatin1String("Jul 17 2014 21:02:38"));
 
     // Write the result to an XML file for optional post-mortem investigations.
diff --git a/test/polar/v2/testtrainingsession.h b/test/polar/v2/testtrainingsession.h
index e1e406b2..886a7ae7 100644
--- a/test/polar/v2/testtrainingsession.h
+++ b/test/polar/v2/testtrainingsession.h
@@ -92,6 +92,10 @@ private slots:
     void toTCX_GarminActivity_data();
     void toTCX_GarminActivity();
 
+    /// @todo Include Garmin Course Extension tests.
+  //void toTCX_GarminCourse_data();
+  //void toTCX_GarminCourse();
+
     void toTCX_UTC_data();
     void toTCX_UTC();