Skip to content

Commit

Permalink
Use metres-per-second for TCX speeds #74
Browse files Browse the repository at this point in the history 
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.
  • Loading branch information
@pcolby
pcolby committed Oct 14, 2016
1 parent acca459 commit 9715268
Show file tree
Hide file tree
Showing 21 changed files with 114 additions and 114 deletions.
4 changes: 2 additions & 2 deletions src/polar/v2/trainingsession.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"))) {
Expand Down Expand Up @@ -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
Expand Down
20 changes: 10 additions & 10 deletions test/polar/v2/testdata/training-sessions-19401412.all-extensions.tcx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -27080,15 +27080,15 @@
</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>
</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>
Expand Down Expand Up @@ -49497,15 +49497,15 @@
</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>
</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>
Expand Down Expand Up @@ -52924,15 +52924,15 @@
</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>
</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>
Expand Down Expand Up @@ -76376,15 +76376,15 @@
</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>
</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>
Expand Down Expand Up @@ -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>
Expand Down
20 changes: 10 additions & 10 deletions test/polar/v2/testdata/training-sessions-19401412.garmin-activity.tcx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
10 changes: 5 additions & 5 deletions test/polar/v2/testdata/training-sessions-19401412.garmin-course.tcx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
10 changes: 5 additions & 5 deletions test/polar/v2/testdata/training-sessions-19401412.tcx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
10 changes: 5 additions & 5 deletions test/polar/v2/testdata/training-sessions-19401412.utc.tcx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions test/polar/v2/testdata/training-sessions-19946380.all-extensions.tcx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions test/polar/v2/testdata/training-sessions-19946380.garmin-activity.tcx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion test/polar/v2/testdata/training-sessions-19946380.garmin-course.tcx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion test/polar/v2/testdata/training-sessions-19946380.tcx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion test/polar/v2/testdata/training-sessions-19946380.utc.tcx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading

0 comments on commit 9715268

Please sign in to comment.