From 971526855e2cfa26c1f494b1c12d2bf1014fc237 Mon Sep 17 00:00:00 2001
From: Paul Colby <git@colby.id.au>
Date: Fri, 14 Oct 2016 17:49:41 +1100
Subject: [PATCH] Use metres-per-second for TCX speeds #74

The Polar speed data in in kilometres-per-hour, but TCX uses metres-per-
second (apparently; the relevant schemas are not explicit about it).

For completeness, the HRM output is already using the correct units
(that is, kilometres-per-hour multiplied by 10 or 128 depending on the
situation), and the GPX output does not include speed data at all. So
neither of those formats needing correcting.
---
 src/polar/v2/trainingsession.cpp              |  4 +--
 ...ining-sessions-19401412.all-extensions.tcx | 20 +++++------
 ...ning-sessions-19401412.garmin-activity.tcx | 20 +++++------
 ...aining-sessions-19401412.garmin-course.tcx | 10 +++---
 .../testdata/training-sessions-19401412.tcx   | 10 +++---
 .../training-sessions-19401412.utc.tcx        | 10 +++---
 ...ining-sessions-19946380.all-extensions.tcx |  4 +--
 ...ning-sessions-19946380.garmin-activity.tcx |  4 +--
 ...aining-sessions-19946380.garmin-course.tcx |  2 +-
 .../testdata/training-sessions-19946380.tcx   |  2 +-
 .../training-sessions-19946380.utc.tcx        |  2 +-
 ...ining-sessions-22165267.all-extensions.tcx | 36 +++++++++----------
 ...ning-sessions-22165267.garmin-activity.tcx | 36 +++++++++----------
 ...aining-sessions-22165267.garmin-course.tcx | 18 +++++-----
 .../testdata/training-sessions-22165267.tcx   | 18 +++++-----
 .../training-sessions-22165267.utc.tcx        | 18 +++++-----
 ...ning-sessions-267510822.all-extensions.tcx |  4 +--
 ...ing-sessions-267510822.garmin-activity.tcx |  4 +--
 ...ining-sessions-267510822.garmin-course.tcx |  2 +-
 .../testdata/training-sessions-267510822.tcx  |  2 +-
 .../training-sessions-267510822.utc.tcx       |  2 +-
 21 files changed, 114 insertions(+), 114 deletions(-)

diff --git a/src/polar/v2/trainingsession.cpp b/src/polar/v2/trainingsession.cpp
index 5826a58a..b02d78a6 100644
--- a/src/polar/v2/trainingsession.cpp
+++ b/src/polar/v2/trainingsession.cpp
@@ -2189,7 +2189,7 @@ QDomDocument TrainingSession::toTCX(const QString &buildTime) const
                             lx.appendChild(doc.createElement(QLatin1String("AvgSpeed")))
                                 .appendChild(doc.createTextNode(QString::fromLatin1("%1")
                                     .arg(first(firstMap(stats.value(QLatin1String("speed")))
-                                        .value(QLatin1String("average"))).toDouble())));
+                                        .value(QLatin1String("average"))).toDouble() / 3.6)));
                         }
 
                         if (stats.contains(QLatin1String("cadence"))) {
@@ -2435,7 +2435,7 @@ void TrainingSession::addLapStats(QDomDocument &doc, QDomElement &lap,
         lap.appendChild(doc.createElement(QLatin1String("MaximumSpeed")))
             .appendChild(doc.createTextNode(QString::fromLatin1("%1")
                 .arg(first(firstMap(stats.value(QLatin1String("speed")))
-                    .value(QLatin1String("maximum"))).toDouble())));
+                    .value(QLatin1String("maximum"))).toDouble() / 3.6)));
     }
 
     // Calories is only available per exercise, not per lap, but it is required
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 45985947..0106ebcd 100644
--- a/test/polar/v2/testdata/training-sessions-19401412.all-extensions.tcx
+++ b/test/polar/v2/testdata/training-sessions-19401412.all-extensions.tcx
@@ -6,7 +6,7 @@
       <Lap StartTime="2014-07-13T07:26:23+10:00">
         <TotalTimeSeconds>1803.88</TotalTimeSeconds>
         <DistanceMeters>2941.6</DistanceMeters>
-        <MaximumSpeed>13.896</MaximumSpeed>
+        <MaximumSpeed>3.86</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>153</Value>
@@ -27080,7 +27080,7 @@
         </Track>
         <Extensions>
           <LX xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
-            <AvgSpeed>5.87056</AvgSpeed>
+            <AvgSpeed>1.63071</AvgSpeed>
           </LX>
           <CX xmlns="http://www.garmin.com/xmlschemas/CourseExtension/v1"/>
         </Extensions>
@@ -27088,7 +27088,7 @@
       <Lap StartTime="2014-07-13T07:56:27+10:00">
         <TotalTimeSeconds>1492.25</TotalTimeSeconds>
         <DistanceMeters>2033.9</DistanceMeters>
-        <MaximumSpeed>10.476</MaximumSpeed>
+        <MaximumSpeed>2.91</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>165</Value>
@@ -49497,7 +49497,7 @@
         </Track>
         <Extensions>
           <LX xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
-            <AvgSpeed>4.90671</AvgSpeed>
+            <AvgSpeed>1.36298</AvgSpeed>
           </LX>
           <CX xmlns="http://www.garmin.com/xmlschemas/CourseExtension/v1"/>
         </Extensions>
@@ -49505,7 +49505,7 @@
       <Lap StartTime="2014-07-13T08:21:20+10:00">
         <TotalTimeSeconds>227.5</TotalTimeSeconds>
         <DistanceMeters>529.7</DistanceMeters>
-        <MaximumSpeed>9.684</MaximumSpeed>
+        <MaximumSpeed>2.69</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>144</Value>
@@ -52924,7 +52924,7 @@
         </Track>
         <Extensions>
           <LX xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
-            <AvgSpeed>8.38207</AvgSpeed>
+            <AvgSpeed>2.32835</AvgSpeed>
           </LX>
           <CX xmlns="http://www.garmin.com/xmlschemas/CourseExtension/v1"/>
         </Extensions>
@@ -52932,7 +52932,7 @@
       <Lap StartTime="2014-07-13T08:25:07+10:00">
         <TotalTimeSeconds>1561.62</TotalTimeSeconds>
         <DistanceMeters>2594.9</DistanceMeters>
-        <MaximumSpeed>12.888</MaximumSpeed>
+        <MaximumSpeed>3.58</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>172</Value>
@@ -76376,7 +76376,7 @@
         </Track>
         <Extensions>
           <LX xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
-            <AvgSpeed>5.982</AvgSpeed>
+            <AvgSpeed>1.66167</AvgSpeed>
           </LX>
           <CX xmlns="http://www.garmin.com/xmlschemas/CourseExtension/v1"/>
         </Extensions>
@@ -76384,7 +76384,7 @@
       <Lap StartTime="2014-07-13T08:51:09+10:00">
         <TotalTimeSeconds>153.5</TotalTimeSeconds>
         <DistanceMeters>383.8</DistanceMeters>
-        <MaximumSpeed>11.088</MaximumSpeed>
+        <MaximumSpeed>3.08</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>158</Value>
@@ -78693,7 +78693,7 @@
         </Track>
         <Extensions>
           <LX xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
-            <AvgSpeed>9.00117</AvgSpeed>
+            <AvgSpeed>2.50033</AvgSpeed>
           </LX>
           <CX xmlns="http://www.garmin.com/xmlschemas/CourseExtension/v1"/>
         </Extensions>
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 ba756295..c0e6f13a 100644
--- a/test/polar/v2/testdata/training-sessions-19401412.garmin-activity.tcx
+++ b/test/polar/v2/testdata/training-sessions-19401412.garmin-activity.tcx
@@ -6,7 +6,7 @@
       <Lap StartTime="2014-07-13T07:26:23+10:00">
         <TotalTimeSeconds>1803.88</TotalTimeSeconds>
         <DistanceMeters>2941.6</DistanceMeters>
-        <MaximumSpeed>13.896</MaximumSpeed>
+        <MaximumSpeed>3.86</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>153</Value>
@@ -27080,14 +27080,14 @@
         </Track>
         <Extensions>
           <LX xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
-            <AvgSpeed>5.87056</AvgSpeed>
+            <AvgSpeed>1.63071</AvgSpeed>
           </LX>
         </Extensions>
       </Lap>
       <Lap StartTime="2014-07-13T07:56:27+10:00">
         <TotalTimeSeconds>1492.25</TotalTimeSeconds>
         <DistanceMeters>2033.9</DistanceMeters>
-        <MaximumSpeed>10.476</MaximumSpeed>
+        <MaximumSpeed>2.91</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>165</Value>
@@ -49496,14 +49496,14 @@
         </Track>
         <Extensions>
           <LX xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
-            <AvgSpeed>4.90671</AvgSpeed>
+            <AvgSpeed>1.36298</AvgSpeed>
           </LX>
         </Extensions>
       </Lap>
       <Lap StartTime="2014-07-13T08:21:20+10:00">
         <TotalTimeSeconds>227.5</TotalTimeSeconds>
         <DistanceMeters>529.7</DistanceMeters>
-        <MaximumSpeed>9.684</MaximumSpeed>
+        <MaximumSpeed>2.69</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>144</Value>
@@ -52922,14 +52922,14 @@
         </Track>
         <Extensions>
           <LX xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
-            <AvgSpeed>8.38207</AvgSpeed>
+            <AvgSpeed>2.32835</AvgSpeed>
           </LX>
         </Extensions>
       </Lap>
       <Lap StartTime="2014-07-13T08:25:07+10:00">
         <TotalTimeSeconds>1561.62</TotalTimeSeconds>
         <DistanceMeters>2594.9</DistanceMeters>
-        <MaximumSpeed>12.888</MaximumSpeed>
+        <MaximumSpeed>3.58</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>172</Value>
@@ -76373,14 +76373,14 @@
         </Track>
         <Extensions>
           <LX xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
-            <AvgSpeed>5.982</AvgSpeed>
+            <AvgSpeed>1.66167</AvgSpeed>
           </LX>
         </Extensions>
       </Lap>
       <Lap StartTime="2014-07-13T08:51:09+10:00">
         <TotalTimeSeconds>153.5</TotalTimeSeconds>
         <DistanceMeters>383.8</DistanceMeters>
-        <MaximumSpeed>11.088</MaximumSpeed>
+        <MaximumSpeed>3.08</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>158</Value>
@@ -78689,7 +78689,7 @@
         </Track>
         <Extensions>
           <LX xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
-            <AvgSpeed>9.00117</AvgSpeed>
+            <AvgSpeed>2.50033</AvgSpeed>
           </LX>
         </Extensions>
       </Lap>
diff --git a/test/polar/v2/testdata/training-sessions-19401412.garmin-course.tcx b/test/polar/v2/testdata/training-sessions-19401412.garmin-course.tcx
index 95283667..912f4931 100644
--- a/test/polar/v2/testdata/training-sessions-19401412.garmin-course.tcx
+++ b/test/polar/v2/testdata/training-sessions-19401412.garmin-course.tcx
@@ -6,7 +6,7 @@
       <Lap StartTime="2014-07-13T07:26:23+10:00">
         <TotalTimeSeconds>1803.88</TotalTimeSeconds>
         <DistanceMeters>2941.6</DistanceMeters>
-        <MaximumSpeed>13.896</MaximumSpeed>
+        <MaximumSpeed>3.86</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>153</Value>
@@ -21671,7 +21671,7 @@
       <Lap StartTime="2014-07-13T07:56:27+10:00">
         <TotalTimeSeconds>1492.25</TotalTimeSeconds>
         <DistanceMeters>2033.9</DistanceMeters>
-        <MaximumSpeed>10.476</MaximumSpeed>
+        <MaximumSpeed>2.91</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>165</Value>
@@ -39604,7 +39604,7 @@
       <Lap StartTime="2014-07-13T08:21:20+10:00">
         <TotalTimeSeconds>227.5</TotalTimeSeconds>
         <DistanceMeters>529.7</DistanceMeters>
-        <MaximumSpeed>9.684</MaximumSpeed>
+        <MaximumSpeed>2.69</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>144</Value>
@@ -42345,7 +42345,7 @@
       <Lap StartTime="2014-07-13T08:25:07+10:00">
         <TotalTimeSeconds>1561.62</TotalTimeSeconds>
         <DistanceMeters>2594.9</DistanceMeters>
-        <MaximumSpeed>12.888</MaximumSpeed>
+        <MaximumSpeed>3.58</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>172</Value>
@@ -61106,7 +61106,7 @@
       <Lap StartTime="2014-07-13T08:51:09+10:00">
         <TotalTimeSeconds>153.5</TotalTimeSeconds>
         <DistanceMeters>383.8</DistanceMeters>
-        <MaximumSpeed>11.088</MaximumSpeed>
+        <MaximumSpeed>3.08</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>158</Value>
diff --git a/test/polar/v2/testdata/training-sessions-19401412.tcx b/test/polar/v2/testdata/training-sessions-19401412.tcx
index 4eb6c49c..5dad7bfa 100644
--- a/test/polar/v2/testdata/training-sessions-19401412.tcx
+++ b/test/polar/v2/testdata/training-sessions-19401412.tcx
@@ -6,7 +6,7 @@
       <Lap StartTime="2014-07-13T07:26:23+10:00">
         <TotalTimeSeconds>1803.875</TotalTimeSeconds>
         <DistanceMeters>2941.6</DistanceMeters>
-        <MaximumSpeed>13.896</MaximumSpeed>
+        <MaximumSpeed>3.86</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>153</Value>
@@ -21670,7 +21670,7 @@
       <Lap StartTime="2014-07-13T07:56:27+10:00">
         <TotalTimeSeconds>1492.25</TotalTimeSeconds>
         <DistanceMeters>2033.9</DistanceMeters>
-        <MaximumSpeed>10.476</MaximumSpeed>
+        <MaximumSpeed>2.91</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>165</Value>
@@ -39602,7 +39602,7 @@
       <Lap StartTime="2014-07-13T08:21:20+10:00">
         <TotalTimeSeconds>227.5</TotalTimeSeconds>
         <DistanceMeters>529.7</DistanceMeters>
-        <MaximumSpeed>9.684</MaximumSpeed>
+        <MaximumSpeed>2.69</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>144</Value>
@@ -42342,7 +42342,7 @@
       <Lap StartTime="2014-07-13T08:25:07+10:00">
         <TotalTimeSeconds>1561.625</TotalTimeSeconds>
         <DistanceMeters>2594.9</DistanceMeters>
-        <MaximumSpeed>12.888</MaximumSpeed>
+        <MaximumSpeed>3.58</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>172</Value>
@@ -61102,7 +61102,7 @@
       <Lap StartTime="2014-07-13T08:51:09+10:00">
         <TotalTimeSeconds>153.5</TotalTimeSeconds>
         <DistanceMeters>383.8</DistanceMeters>
-        <MaximumSpeed>11.088</MaximumSpeed>
+        <MaximumSpeed>3.08</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>158</Value>
diff --git a/test/polar/v2/testdata/training-sessions-19401412.utc.tcx b/test/polar/v2/testdata/training-sessions-19401412.utc.tcx
index 724b972a..7eb732de 100644
--- a/test/polar/v2/testdata/training-sessions-19401412.utc.tcx
+++ b/test/polar/v2/testdata/training-sessions-19401412.utc.tcx
@@ -6,7 +6,7 @@
       <Lap StartTime="2014-07-12T21:26:23Z">
         <TotalTimeSeconds>1803.88</TotalTimeSeconds>
         <DistanceMeters>2941.6</DistanceMeters>
-        <MaximumSpeed>13.896</MaximumSpeed>
+        <MaximumSpeed>3.86</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>153</Value>
@@ -21670,7 +21670,7 @@
       <Lap StartTime="2014-07-12T21:56:27Z">
         <TotalTimeSeconds>1492.25</TotalTimeSeconds>
         <DistanceMeters>2033.9</DistanceMeters>
-        <MaximumSpeed>10.476</MaximumSpeed>
+        <MaximumSpeed>2.91</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>165</Value>
@@ -39602,7 +39602,7 @@
       <Lap StartTime="2014-07-12T22:21:20Z">
         <TotalTimeSeconds>227.5</TotalTimeSeconds>
         <DistanceMeters>529.7</DistanceMeters>
-        <MaximumSpeed>9.684</MaximumSpeed>
+        <MaximumSpeed>2.69</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>144</Value>
@@ -42342,7 +42342,7 @@
       <Lap StartTime="2014-07-12T22:25:07Z">
         <TotalTimeSeconds>1561.62</TotalTimeSeconds>
         <DistanceMeters>2594.9</DistanceMeters>
-        <MaximumSpeed>12.888</MaximumSpeed>
+        <MaximumSpeed>3.58</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>172</Value>
@@ -61102,7 +61102,7 @@
       <Lap StartTime="2014-07-12T22:51:09Z">
         <TotalTimeSeconds>153.5</TotalTimeSeconds>
         <DistanceMeters>383.8</DistanceMeters>
-        <MaximumSpeed>11.088</MaximumSpeed>
+        <MaximumSpeed>3.08</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>158</Value>
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 ac0abcfc..20c257c9 100644
--- a/test/polar/v2/testdata/training-sessions-19946380.all-extensions.tcx
+++ b/test/polar/v2/testdata/training-sessions-19946380.all-extensions.tcx
@@ -6,7 +6,7 @@
       <Lap StartTime="2014-07-18T07:48:56+10:00">
         <TotalTimeSeconds>3900.25</TotalTimeSeconds>
         <DistanceMeters>4571.6</DistanceMeters>
-        <MaximumSpeed>8.388</MaximumSpeed>
+        <MaximumSpeed>2.33</MaximumSpeed>
         <Calories>537</Calories>
         <AverageHeartRateBpm>
           <Value>119</Value>
@@ -58313,7 +58313,7 @@
         </Track>
         <Extensions>
           <LX xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
-            <AvgSpeed>4.21967</AvgSpeed>
+            <AvgSpeed>1.17213</AvgSpeed>
           </LX>
           <CX xmlns="http://www.garmin.com/xmlschemas/CourseExtension/v1"/>
         </Extensions>
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 ce917f54..c9970f10 100644
--- a/test/polar/v2/testdata/training-sessions-19946380.garmin-activity.tcx
+++ b/test/polar/v2/testdata/training-sessions-19946380.garmin-activity.tcx
@@ -6,7 +6,7 @@
       <Lap StartTime="2014-07-18T07:48:56+10:00">
         <TotalTimeSeconds>3900.25</TotalTimeSeconds>
         <DistanceMeters>4571.6</DistanceMeters>
-        <MaximumSpeed>8.388</MaximumSpeed>
+        <MaximumSpeed>2.33</MaximumSpeed>
         <Calories>537</Calories>
         <AverageHeartRateBpm>
           <Value>119</Value>
@@ -58313,7 +58313,7 @@
         </Track>
         <Extensions>
           <LX xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
-            <AvgSpeed>4.21967</AvgSpeed>
+            <AvgSpeed>1.17213</AvgSpeed>
           </LX>
         </Extensions>
       </Lap>
diff --git a/test/polar/v2/testdata/training-sessions-19946380.garmin-course.tcx b/test/polar/v2/testdata/training-sessions-19946380.garmin-course.tcx
index 3aa541d0..2258c686 100644
--- a/test/polar/v2/testdata/training-sessions-19946380.garmin-course.tcx
+++ b/test/polar/v2/testdata/training-sessions-19946380.garmin-course.tcx
@@ -6,7 +6,7 @@
       <Lap StartTime="2014-07-18T07:48:56+10:00">
         <TotalTimeSeconds>3900.25</TotalTimeSeconds>
         <DistanceMeters>4571.6</DistanceMeters>
-        <MaximumSpeed>8.388</MaximumSpeed>
+        <MaximumSpeed>2.33</MaximumSpeed>
         <Calories>537</Calories>
         <AverageHeartRateBpm>
           <Value>119</Value>
diff --git a/test/polar/v2/testdata/training-sessions-19946380.tcx b/test/polar/v2/testdata/training-sessions-19946380.tcx
index f8bfac1b..1997ff7f 100644
--- a/test/polar/v2/testdata/training-sessions-19946380.tcx
+++ b/test/polar/v2/testdata/training-sessions-19946380.tcx
@@ -6,7 +6,7 @@
       <Lap StartTime="2014-07-18T07:48:56+10:00">
         <TotalTimeSeconds>3900.25</TotalTimeSeconds>
         <DistanceMeters>4571.6</DistanceMeters>
-        <MaximumSpeed>8.388</MaximumSpeed>
+        <MaximumSpeed>2.33</MaximumSpeed>
         <Calories>537</Calories>
         <AverageHeartRateBpm>
           <Value>119</Value>
diff --git a/test/polar/v2/testdata/training-sessions-19946380.utc.tcx b/test/polar/v2/testdata/training-sessions-19946380.utc.tcx
index e481cb91..c57d5fd0 100644
--- a/test/polar/v2/testdata/training-sessions-19946380.utc.tcx
+++ b/test/polar/v2/testdata/training-sessions-19946380.utc.tcx
@@ -6,7 +6,7 @@
       <Lap StartTime="2014-07-17T21:48:56Z">
         <TotalTimeSeconds>3900.25</TotalTimeSeconds>
         <DistanceMeters>4571.6</DistanceMeters>
-        <MaximumSpeed>8.388</MaximumSpeed>
+        <MaximumSpeed>2.33</MaximumSpeed>
         <Calories>537</Calories>
         <AverageHeartRateBpm>
           <Value>119</Value>
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 127a7ec5..aa4fbd6d 100644
--- a/test/polar/v2/testdata/training-sessions-22165267.all-extensions.tcx
+++ b/test/polar/v2/testdata/training-sessions-22165267.all-extensions.tcx
@@ -6,7 +6,7 @@
       <Lap StartTime="2014-08-07T17:25:01+10:00">
         <TotalTimeSeconds>238.5</TotalTimeSeconds>
         <DistanceMeters>664</DistanceMeters>
-        <MaximumSpeed>11.3721</MaximumSpeed>
+        <MaximumSpeed>3.15893</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>153</Value>
@@ -4561,7 +4561,7 @@
         </Track>
         <Extensions>
           <LX xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
-            <AvgSpeed>10.0226</AvgSpeed>
+            <AvgSpeed>2.78407</AvgSpeed>
             <AvgRunCadence>80</AvgRunCadence>
             <MaxRunCadence>84</MaxRunCadence>
           </LX>
@@ -4571,7 +4571,7 @@
       <Lap StartTime="2014-08-07T17:29:00+10:00">
         <TotalTimeSeconds>242</TotalTimeSeconds>
         <DistanceMeters>662</DistanceMeters>
-        <MaximumSpeed>10.6787</MaximumSpeed>
+        <MaximumSpeed>2.96631</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>160</Value>
@@ -9184,7 +9184,7 @@
         </Track>
         <Extensions>
           <LX xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
-            <AvgSpeed>9.84793</AvgSpeed>
+            <AvgSpeed>2.73554</AvgSpeed>
             <AvgRunCadence>83</AvgRunCadence>
             <MaxRunCadence>85</MaxRunCadence>
           </LX>
@@ -9194,7 +9194,7 @@
       <Lap StartTime="2014-08-07T17:33:02+10:00">
         <TotalTimeSeconds>237.5</TotalTimeSeconds>
         <DistanceMeters>665.2</DistanceMeters>
-        <MaximumSpeed>11.1641</MaximumSpeed>
+        <MaximumSpeed>3.10114</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>166</Value>
@@ -13731,7 +13731,7 @@
         </Track>
         <Extensions>
           <LX xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
-            <AvgSpeed>10.083</AvgSpeed>
+            <AvgSpeed>2.80084</AvgSpeed>
             <AvgRunCadence>83</AvgRunCadence>
             <MaxRunCadence>86</MaxRunCadence>
           </LX>
@@ -13741,7 +13741,7 @@
       <Lap StartTime="2014-08-07T17:37:00+10:00">
         <TotalTimeSeconds>175</TotalTimeSeconds>
         <DistanceMeters>662.1</DistanceMeters>
-        <MaximumSpeed>14.1458</MaximumSpeed>
+        <MaximumSpeed>3.9294</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>184</Value>
@@ -17081,7 +17081,7 @@
         </Track>
         <Extensions>
           <LX xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
-            <AvgSpeed>13.6203</AvgSpeed>
+            <AvgSpeed>3.78343</AvgSpeed>
             <AvgRunCadence>85</AvgRunCadence>
             <MaxRunCadence>89</MaxRunCadence>
           </LX>
@@ -17091,7 +17091,7 @@
       <Lap StartTime="2014-08-07T17:39:55+10:00">
         <TotalTimeSeconds>264.5</TotalTimeSeconds>
         <DistanceMeters>668</DistanceMeters>
-        <MaximumSpeed>13.8685</MaximumSpeed>
+        <MaximumSpeed>3.85235</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>169</Value>
@@ -22122,7 +22122,7 @@
         </Track>
         <Extensions>
           <LX xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
-            <AvgSpeed>9.09187</AvgSpeed>
+            <AvgSpeed>2.52552</AvgSpeed>
             <AvgRunCadence>81</AvgRunCadence>
             <MaxRunCadence>84</MaxRunCadence>
           </LX>
@@ -22132,7 +22132,7 @@
       <Lap StartTime="2014-08-07T17:44:19+10:00">
         <TotalTimeSeconds>257.5</TotalTimeSeconds>
         <DistanceMeters>659.2</DistanceMeters>
-        <MaximumSpeed>10.1933</MaximumSpeed>
+        <MaximumSpeed>2.83148</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>165</Value>
@@ -27049,7 +27049,7 @@
         </Track>
         <Extensions>
           <LX xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
-            <AvgSpeed>9.216</AvgSpeed>
+            <AvgSpeed>2.56</AvgSpeed>
             <AvgRunCadence>82</AvgRunCadence>
             <MaxRunCadence>85</MaxRunCadence>
           </LX>
@@ -27059,7 +27059,7 @@
       <Lap StartTime="2014-08-07T17:48:37+10:00">
         <TotalTimeSeconds>186</TotalTimeSeconds>
         <DistanceMeters>673.6</DistanceMeters>
-        <MaximumSpeed>13.6604</MaximumSpeed>
+        <MaximumSpeed>3.79456</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>182</Value>
@@ -30608,7 +30608,7 @@
         </Track>
         <Extensions>
           <LX xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
-            <AvgSpeed>13.0374</AvgSpeed>
+            <AvgSpeed>3.62151</AvgSpeed>
             <AvgRunCadence>84</AvgRunCadence>
             <MaxRunCadence>86</MaxRunCadence>
           </LX>
@@ -30618,7 +30618,7 @@
       <Lap StartTime="2014-08-07T17:51:43+10:00">
         <TotalTimeSeconds>269.5</TotalTimeSeconds>
         <DistanceMeters>670.6</DistanceMeters>
-        <MaximumSpeed>13.175</MaximumSpeed>
+        <MaximumSpeed>3.65973</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>167</Value>
@@ -35744,7 +35744,7 @@
         </Track>
         <Extensions>
           <LX xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
-            <AvgSpeed>8.95792</AvgSpeed>
+            <AvgSpeed>2.48831</AvgSpeed>
             <AvgRunCadence>81</AvgRunCadence>
             <MaxRunCadence>83</MaxRunCadence>
           </LX>
@@ -35754,7 +35754,7 @@
       <Lap StartTime="2014-08-07T17:56:12+10:00">
         <TotalTimeSeconds>234.5</TotalTimeSeconds>
         <DistanceMeters>676</DistanceMeters>
-        <MaximumSpeed>11.6495</MaximumSpeed>
+        <MaximumSpeed>3.23597</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>169</Value>
@@ -40234,7 +40234,7 @@
         </Track>
         <Extensions>
           <LX xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
-            <AvgSpeed>10.3778</AvgSpeed>
+            <AvgSpeed>2.88273</AvgSpeed>
             <AvgRunCadence>81</AvgRunCadence>
             <MaxRunCadence>84</MaxRunCadence>
           </LX>
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 db35c6ca..c9f649ba 100644
--- a/test/polar/v2/testdata/training-sessions-22165267.garmin-activity.tcx
+++ b/test/polar/v2/testdata/training-sessions-22165267.garmin-activity.tcx
@@ -6,7 +6,7 @@
       <Lap StartTime="2014-08-07T17:25:01+10:00">
         <TotalTimeSeconds>238.5</TotalTimeSeconds>
         <DistanceMeters>664</DistanceMeters>
-        <MaximumSpeed>11.3721</MaximumSpeed>
+        <MaximumSpeed>3.15893</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>153</Value>
@@ -4561,7 +4561,7 @@
         </Track>
         <Extensions>
           <LX xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
-            <AvgSpeed>10.0226</AvgSpeed>
+            <AvgSpeed>2.78407</AvgSpeed>
             <AvgRunCadence>80</AvgRunCadence>
             <MaxRunCadence>84</MaxRunCadence>
           </LX>
@@ -4570,7 +4570,7 @@
       <Lap StartTime="2014-08-07T17:29:00+10:00">
         <TotalTimeSeconds>242</TotalTimeSeconds>
         <DistanceMeters>662</DistanceMeters>
-        <MaximumSpeed>10.6787</MaximumSpeed>
+        <MaximumSpeed>2.96631</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>160</Value>
@@ -9183,7 +9183,7 @@
         </Track>
         <Extensions>
           <LX xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
-            <AvgSpeed>9.84793</AvgSpeed>
+            <AvgSpeed>2.73554</AvgSpeed>
             <AvgRunCadence>83</AvgRunCadence>
             <MaxRunCadence>85</MaxRunCadence>
           </LX>
@@ -9192,7 +9192,7 @@
       <Lap StartTime="2014-08-07T17:33:02+10:00">
         <TotalTimeSeconds>237.5</TotalTimeSeconds>
         <DistanceMeters>665.2</DistanceMeters>
-        <MaximumSpeed>11.1641</MaximumSpeed>
+        <MaximumSpeed>3.10114</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>166</Value>
@@ -13729,7 +13729,7 @@
         </Track>
         <Extensions>
           <LX xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
-            <AvgSpeed>10.083</AvgSpeed>
+            <AvgSpeed>2.80084</AvgSpeed>
             <AvgRunCadence>83</AvgRunCadence>
             <MaxRunCadence>86</MaxRunCadence>
           </LX>
@@ -13738,7 +13738,7 @@
       <Lap StartTime="2014-08-07T17:37:00+10:00">
         <TotalTimeSeconds>175</TotalTimeSeconds>
         <DistanceMeters>662.1</DistanceMeters>
-        <MaximumSpeed>14.1458</MaximumSpeed>
+        <MaximumSpeed>3.9294</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>184</Value>
@@ -17078,7 +17078,7 @@
         </Track>
         <Extensions>
           <LX xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
-            <AvgSpeed>13.6203</AvgSpeed>
+            <AvgSpeed>3.78343</AvgSpeed>
             <AvgRunCadence>85</AvgRunCadence>
             <MaxRunCadence>89</MaxRunCadence>
           </LX>
@@ -17087,7 +17087,7 @@
       <Lap StartTime="2014-08-07T17:39:55+10:00">
         <TotalTimeSeconds>264.5</TotalTimeSeconds>
         <DistanceMeters>668</DistanceMeters>
-        <MaximumSpeed>13.8685</MaximumSpeed>
+        <MaximumSpeed>3.85235</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>169</Value>
@@ -22118,7 +22118,7 @@
         </Track>
         <Extensions>
           <LX xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
-            <AvgSpeed>9.09187</AvgSpeed>
+            <AvgSpeed>2.52552</AvgSpeed>
             <AvgRunCadence>81</AvgRunCadence>
             <MaxRunCadence>84</MaxRunCadence>
           </LX>
@@ -22127,7 +22127,7 @@
       <Lap StartTime="2014-08-07T17:44:19+10:00">
         <TotalTimeSeconds>257.5</TotalTimeSeconds>
         <DistanceMeters>659.2</DistanceMeters>
-        <MaximumSpeed>10.1933</MaximumSpeed>
+        <MaximumSpeed>2.83148</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>165</Value>
@@ -27044,7 +27044,7 @@
         </Track>
         <Extensions>
           <LX xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
-            <AvgSpeed>9.216</AvgSpeed>
+            <AvgSpeed>2.56</AvgSpeed>
             <AvgRunCadence>82</AvgRunCadence>
             <MaxRunCadence>85</MaxRunCadence>
           </LX>
@@ -27053,7 +27053,7 @@
       <Lap StartTime="2014-08-07T17:48:37+10:00">
         <TotalTimeSeconds>186</TotalTimeSeconds>
         <DistanceMeters>673.6</DistanceMeters>
-        <MaximumSpeed>13.6604</MaximumSpeed>
+        <MaximumSpeed>3.79456</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>182</Value>
@@ -30602,7 +30602,7 @@
         </Track>
         <Extensions>
           <LX xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
-            <AvgSpeed>13.0374</AvgSpeed>
+            <AvgSpeed>3.62151</AvgSpeed>
             <AvgRunCadence>84</AvgRunCadence>
             <MaxRunCadence>86</MaxRunCadence>
           </LX>
@@ -30611,7 +30611,7 @@
       <Lap StartTime="2014-08-07T17:51:43+10:00">
         <TotalTimeSeconds>269.5</TotalTimeSeconds>
         <DistanceMeters>670.6</DistanceMeters>
-        <MaximumSpeed>13.175</MaximumSpeed>
+        <MaximumSpeed>3.65973</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>167</Value>
@@ -35737,7 +35737,7 @@
         </Track>
         <Extensions>
           <LX xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
-            <AvgSpeed>8.95792</AvgSpeed>
+            <AvgSpeed>2.48831</AvgSpeed>
             <AvgRunCadence>81</AvgRunCadence>
             <MaxRunCadence>83</MaxRunCadence>
           </LX>
@@ -35746,7 +35746,7 @@
       <Lap StartTime="2014-08-07T17:56:12+10:00">
         <TotalTimeSeconds>234.5</TotalTimeSeconds>
         <DistanceMeters>676</DistanceMeters>
-        <MaximumSpeed>11.6495</MaximumSpeed>
+        <MaximumSpeed>3.23597</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>169</Value>
@@ -40226,7 +40226,7 @@
         </Track>
         <Extensions>
           <LX xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
-            <AvgSpeed>10.3778</AvgSpeed>
+            <AvgSpeed>2.88273</AvgSpeed>
             <AvgRunCadence>81</AvgRunCadence>
             <MaxRunCadence>84</MaxRunCadence>
           </LX>
diff --git a/test/polar/v2/testdata/training-sessions-22165267.garmin-course.tcx b/test/polar/v2/testdata/training-sessions-22165267.garmin-course.tcx
index 81ac6ab6..685b355f 100644
--- a/test/polar/v2/testdata/training-sessions-22165267.garmin-course.tcx
+++ b/test/polar/v2/testdata/training-sessions-22165267.garmin-course.tcx
@@ -6,7 +6,7 @@
       <Lap StartTime="2014-08-07T17:25:01+10:00">
         <TotalTimeSeconds>238.5</TotalTimeSeconds>
         <DistanceMeters>664</DistanceMeters>
-        <MaximumSpeed>11.3721</MaximumSpeed>
+        <MaximumSpeed>3.15893</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>153</Value>
@@ -3130,7 +3130,7 @@
       <Lap StartTime="2014-08-07T17:29:00+10:00">
         <TotalTimeSeconds>242</TotalTimeSeconds>
         <DistanceMeters>662</DistanceMeters>
-        <MaximumSpeed>10.6787</MaximumSpeed>
+        <MaximumSpeed>2.96631</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>160</Value>
@@ -6294,7 +6294,7 @@
       <Lap StartTime="2014-08-07T17:33:02+10:00">
         <TotalTimeSeconds>237.5</TotalTimeSeconds>
         <DistanceMeters>665.2</DistanceMeters>
-        <MaximumSpeed>11.1641</MaximumSpeed>
+        <MaximumSpeed>3.10114</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>166</Value>
@@ -9406,7 +9406,7 @@
       <Lap StartTime="2014-08-07T17:37:00+10:00">
         <TotalTimeSeconds>175</TotalTimeSeconds>
         <DistanceMeters>662.1</DistanceMeters>
-        <MaximumSpeed>14.1458</MaximumSpeed>
+        <MaximumSpeed>3.9294</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>184</Value>
@@ -11699,7 +11699,7 @@
       <Lap StartTime="2014-08-07T17:39:55+10:00">
         <TotalTimeSeconds>264.5</TotalTimeSeconds>
         <DistanceMeters>668</DistanceMeters>
-        <MaximumSpeed>13.8685</MaximumSpeed>
+        <MaximumSpeed>3.85235</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>169</Value>
@@ -15149,7 +15149,7 @@
       <Lap StartTime="2014-08-07T17:44:19+10:00">
         <TotalTimeSeconds>257.5</TotalTimeSeconds>
         <DistanceMeters>659.2</DistanceMeters>
-        <MaximumSpeed>10.1933</MaximumSpeed>
+        <MaximumSpeed>2.83148</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>165</Value>
@@ -18521,7 +18521,7 @@
       <Lap StartTime="2014-08-07T17:48:37+10:00">
         <TotalTimeSeconds>186</TotalTimeSeconds>
         <DistanceMeters>673.6</DistanceMeters>
-        <MaximumSpeed>13.6604</MaximumSpeed>
+        <MaximumSpeed>3.79456</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>182</Value>
@@ -20957,7 +20957,7 @@
       <Lap StartTime="2014-08-07T17:51:43+10:00">
         <TotalTimeSeconds>269.5</TotalTimeSeconds>
         <DistanceMeters>670.6</DistanceMeters>
-        <MaximumSpeed>13.175</MaximumSpeed>
+        <MaximumSpeed>3.65973</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>167</Value>
@@ -24472,7 +24472,7 @@
       <Lap StartTime="2014-08-07T17:56:12+10:00">
         <TotalTimeSeconds>234.5</TotalTimeSeconds>
         <DistanceMeters>676</DistanceMeters>
-        <MaximumSpeed>11.6495</MaximumSpeed>
+        <MaximumSpeed>3.23597</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>169</Value>
diff --git a/test/polar/v2/testdata/training-sessions-22165267.tcx b/test/polar/v2/testdata/training-sessions-22165267.tcx
index e67af851..b5b2be29 100644
--- a/test/polar/v2/testdata/training-sessions-22165267.tcx
+++ b/test/polar/v2/testdata/training-sessions-22165267.tcx
@@ -6,7 +6,7 @@
       <Lap StartTime="2014-08-07T17:25:01+10:00">
         <TotalTimeSeconds>238.5</TotalTimeSeconds>
         <DistanceMeters>664</DistanceMeters>
-        <MaximumSpeed>11.3721</MaximumSpeed>
+        <MaximumSpeed>3.15893</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>153</Value>
@@ -3129,7 +3129,7 @@
       <Lap StartTime="2014-08-07T17:29:00+10:00">
         <TotalTimeSeconds>242</TotalTimeSeconds>
         <DistanceMeters>662</DistanceMeters>
-        <MaximumSpeed>10.6787</MaximumSpeed>
+        <MaximumSpeed>2.96631</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>160</Value>
@@ -6292,7 +6292,7 @@
       <Lap StartTime="2014-08-07T17:33:02+10:00">
         <TotalTimeSeconds>237.5</TotalTimeSeconds>
         <DistanceMeters>665.2</DistanceMeters>
-        <MaximumSpeed>11.1641</MaximumSpeed>
+        <MaximumSpeed>3.10114</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>166</Value>
@@ -9403,7 +9403,7 @@
       <Lap StartTime="2014-08-07T17:37:00+10:00">
         <TotalTimeSeconds>175</TotalTimeSeconds>
         <DistanceMeters>662.1</DistanceMeters>
-        <MaximumSpeed>14.1458</MaximumSpeed>
+        <MaximumSpeed>3.9294</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>184</Value>
@@ -11695,7 +11695,7 @@
       <Lap StartTime="2014-08-07T17:39:55+10:00">
         <TotalTimeSeconds>264.5</TotalTimeSeconds>
         <DistanceMeters>668</DistanceMeters>
-        <MaximumSpeed>13.8685</MaximumSpeed>
+        <MaximumSpeed>3.85235</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>169</Value>
@@ -15144,7 +15144,7 @@
       <Lap StartTime="2014-08-07T17:44:19+10:00">
         <TotalTimeSeconds>257.5</TotalTimeSeconds>
         <DistanceMeters>659.2</DistanceMeters>
-        <MaximumSpeed>10.1933</MaximumSpeed>
+        <MaximumSpeed>2.83148</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>165</Value>
@@ -18515,7 +18515,7 @@
       <Lap StartTime="2014-08-07T17:48:37+10:00">
         <TotalTimeSeconds>186</TotalTimeSeconds>
         <DistanceMeters>673.6</DistanceMeters>
-        <MaximumSpeed>13.6604</MaximumSpeed>
+        <MaximumSpeed>3.79456</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>182</Value>
@@ -20950,7 +20950,7 @@
       <Lap StartTime="2014-08-07T17:51:43+10:00">
         <TotalTimeSeconds>269.5</TotalTimeSeconds>
         <DistanceMeters>670.6</DistanceMeters>
-        <MaximumSpeed>13.175</MaximumSpeed>
+        <MaximumSpeed>3.65973</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>167</Value>
@@ -24464,7 +24464,7 @@
       <Lap StartTime="2014-08-07T17:56:12+10:00">
         <TotalTimeSeconds>234.5</TotalTimeSeconds>
         <DistanceMeters>676</DistanceMeters>
-        <MaximumSpeed>11.6495</MaximumSpeed>
+        <MaximumSpeed>3.23597</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>169</Value>
diff --git a/test/polar/v2/testdata/training-sessions-22165267.utc.tcx b/test/polar/v2/testdata/training-sessions-22165267.utc.tcx
index 2d7b041c..71fbda3b 100644
--- a/test/polar/v2/testdata/training-sessions-22165267.utc.tcx
+++ b/test/polar/v2/testdata/training-sessions-22165267.utc.tcx
@@ -6,7 +6,7 @@
       <Lap StartTime="2014-08-07T07:25:01Z">
         <TotalTimeSeconds>238.5</TotalTimeSeconds>
         <DistanceMeters>664</DistanceMeters>
-        <MaximumSpeed>11.3721</MaximumSpeed>
+        <MaximumSpeed>3.15893</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>153</Value>
@@ -3129,7 +3129,7 @@
       <Lap StartTime="2014-08-07T07:29:00Z">
         <TotalTimeSeconds>242</TotalTimeSeconds>
         <DistanceMeters>662</DistanceMeters>
-        <MaximumSpeed>10.6787</MaximumSpeed>
+        <MaximumSpeed>2.96631</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>160</Value>
@@ -6292,7 +6292,7 @@
       <Lap StartTime="2014-08-07T07:33:02Z">
         <TotalTimeSeconds>237.5</TotalTimeSeconds>
         <DistanceMeters>665.2</DistanceMeters>
-        <MaximumSpeed>11.1641</MaximumSpeed>
+        <MaximumSpeed>3.10114</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>166</Value>
@@ -9403,7 +9403,7 @@
       <Lap StartTime="2014-08-07T07:37:00Z">
         <TotalTimeSeconds>175</TotalTimeSeconds>
         <DistanceMeters>662.1</DistanceMeters>
-        <MaximumSpeed>14.1458</MaximumSpeed>
+        <MaximumSpeed>3.9294</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>184</Value>
@@ -11695,7 +11695,7 @@
       <Lap StartTime="2014-08-07T07:39:55Z">
         <TotalTimeSeconds>264.5</TotalTimeSeconds>
         <DistanceMeters>668</DistanceMeters>
-        <MaximumSpeed>13.8685</MaximumSpeed>
+        <MaximumSpeed>3.85235</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>169</Value>
@@ -15144,7 +15144,7 @@
       <Lap StartTime="2014-08-07T07:44:19Z">
         <TotalTimeSeconds>257.5</TotalTimeSeconds>
         <DistanceMeters>659.2</DistanceMeters>
-        <MaximumSpeed>10.1933</MaximumSpeed>
+        <MaximumSpeed>2.83148</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>165</Value>
@@ -18515,7 +18515,7 @@
       <Lap StartTime="2014-08-07T07:48:37Z">
         <TotalTimeSeconds>186</TotalTimeSeconds>
         <DistanceMeters>673.6</DistanceMeters>
-        <MaximumSpeed>13.6604</MaximumSpeed>
+        <MaximumSpeed>3.79456</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>182</Value>
@@ -20950,7 +20950,7 @@
       <Lap StartTime="2014-08-07T07:51:43Z">
         <TotalTimeSeconds>269.5</TotalTimeSeconds>
         <DistanceMeters>670.6</DistanceMeters>
-        <MaximumSpeed>13.175</MaximumSpeed>
+        <MaximumSpeed>3.65973</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>167</Value>
@@ -24464,7 +24464,7 @@
       <Lap StartTime="2014-08-07T07:56:12Z">
         <TotalTimeSeconds>234.5</TotalTimeSeconds>
         <DistanceMeters>676</DistanceMeters>
-        <MaximumSpeed>11.6495</MaximumSpeed>
+        <MaximumSpeed>3.23597</MaximumSpeed>
         <Calories>0</Calories>
         <AverageHeartRateBpm>
           <Value>169</Value>
diff --git a/test/polar/v2/testdata/training-sessions-267510822.all-extensions.tcx b/test/polar/v2/testdata/training-sessions-267510822.all-extensions.tcx
index 011ab1ab..82291851 100644
--- a/test/polar/v2/testdata/training-sessions-267510822.all-extensions.tcx
+++ b/test/polar/v2/testdata/training-sessions-267510822.all-extensions.tcx
@@ -6,7 +6,7 @@
       <Lap StartTime="2015-11-01T12:17:52+01:00">
         <TotalTimeSeconds>6127.25</TotalTimeSeconds>
         <DistanceMeters>42809.3</DistanceMeters>
-        <MaximumSpeed>60.9</MaximumSpeed>
+        <MaximumSpeed>16.9167</MaximumSpeed>
         <Calories>1638</Calories>
         <AverageHeartRateBpm>
           <Value>149</Value>
@@ -91934,7 +91934,7 @@
         </Track>
         <Extensions>
           <LX xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
-            <AvgSpeed>25.1521</AvgSpeed>
+            <AvgSpeed>6.98671</AvgSpeed>
             <MaxBikeCadence>114</MaxBikeCadence>
             <AvgRunCadence>90</AvgRunCadence>
           </LX>
diff --git a/test/polar/v2/testdata/training-sessions-267510822.garmin-activity.tcx b/test/polar/v2/testdata/training-sessions-267510822.garmin-activity.tcx
index 05525ecb..2d4ae79d 100644
--- a/test/polar/v2/testdata/training-sessions-267510822.garmin-activity.tcx
+++ b/test/polar/v2/testdata/training-sessions-267510822.garmin-activity.tcx
@@ -6,7 +6,7 @@
       <Lap StartTime="2015-11-01T12:17:52+01:00">
         <TotalTimeSeconds>6127.25</TotalTimeSeconds>
         <DistanceMeters>42809.3</DistanceMeters>
-        <MaximumSpeed>60.9</MaximumSpeed>
+        <MaximumSpeed>16.9167</MaximumSpeed>
         <Calories>1638</Calories>
         <AverageHeartRateBpm>
           <Value>149</Value>
@@ -91934,7 +91934,7 @@
         </Track>
         <Extensions>
           <LX xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
-            <AvgSpeed>25.1521</AvgSpeed>
+            <AvgSpeed>6.98671</AvgSpeed>
             <MaxBikeCadence>114</MaxBikeCadence>
             <AvgRunCadence>90</AvgRunCadence>
           </LX>
diff --git a/test/polar/v2/testdata/training-sessions-267510822.garmin-course.tcx b/test/polar/v2/testdata/training-sessions-267510822.garmin-course.tcx
index d9933df4..6220ddeb 100644
--- a/test/polar/v2/testdata/training-sessions-267510822.garmin-course.tcx
+++ b/test/polar/v2/testdata/training-sessions-267510822.garmin-course.tcx
@@ -6,7 +6,7 @@
       <Lap StartTime="2015-11-01T12:17:52+01:00">
         <TotalTimeSeconds>6127.25</TotalTimeSeconds>
         <DistanceMeters>42809.3</DistanceMeters>
-        <MaximumSpeed>60.9</MaximumSpeed>
+        <MaximumSpeed>16.9167</MaximumSpeed>
         <Calories>1638</Calories>
         <AverageHeartRateBpm>
           <Value>149</Value>
diff --git a/test/polar/v2/testdata/training-sessions-267510822.tcx b/test/polar/v2/testdata/training-sessions-267510822.tcx
index 6cbd2848..1d151ade 100644
--- a/test/polar/v2/testdata/training-sessions-267510822.tcx
+++ b/test/polar/v2/testdata/training-sessions-267510822.tcx
@@ -6,7 +6,7 @@
       <Lap StartTime="2015-11-01T12:17:52+01:00">
         <TotalTimeSeconds>6127.25</TotalTimeSeconds>
         <DistanceMeters>42809.3</DistanceMeters>
-        <MaximumSpeed>60.9</MaximumSpeed>
+        <MaximumSpeed>16.9167</MaximumSpeed>
         <Calories>1638</Calories>
         <AverageHeartRateBpm>
           <Value>149</Value>
diff --git a/test/polar/v2/testdata/training-sessions-267510822.utc.tcx b/test/polar/v2/testdata/training-sessions-267510822.utc.tcx
index eca1e34a..5f53c114 100644
--- a/test/polar/v2/testdata/training-sessions-267510822.utc.tcx
+++ b/test/polar/v2/testdata/training-sessions-267510822.utc.tcx
@@ -6,7 +6,7 @@
       <Lap StartTime="2015-11-01T11:17:52Z">
         <TotalTimeSeconds>6127.25</TotalTimeSeconds>
         <DistanceMeters>42809.3</DistanceMeters>
-        <MaximumSpeed>60.9</MaximumSpeed>
+        <MaximumSpeed>16.9167</MaximumSpeed>
         <Calories>1638</Calories>
         <AverageHeartRateBpm>
           <Value>149</Value>