karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Bugfix: formatting of pace was not formatted correctly (e.g., 4:60).

Browse Source 
Fixes #370.
This commit is contained in:
Dennis Guse
2020-08-15 20:19:46 +02:00
parent ea97ff65df
commit 04f146c641
7 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/util/StringUtils.java
+7 -7
View File
@@ -227,19 +227,19 @@ public class StringUtils {
speed_mps = 0;
}
speed_mps *= UnitConversions.MS_TO_KMH;
double speed = speed_mps * UnitConversions.M_TO_KM; //KM p sec
if (!metricUnits) {
speed_mps *= UnitConversions.KM_TO_MI;
speed *= UnitConversions.KM_TO_MI;
}
if (reportSpeed) {
return new Pair<>(StringUtils.formatDecimal(speed_mps), unitString);
return new Pair<>(StringUtils.formatDecimal(speed * UnitConversions.S_TO_HR), unitString);
}
// convert from hours to minutes
double pace = speed_mps == 0 ? 0.0 : 60.0 / speed_mps;
int minutes = (int) pace;
int seconds = (int) Math.round((pace - minutes) * 60.0);
int pace = speed == 0 ? 0 : (int) Math.round(1 / speed); //sec / [KM | MI]
int minutes = pace / 60;
int seconds = pace % 60;
return new Pair<>(String.format(Locale.US, "%d:%02d", minutes, seconds), unitString);
}