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

Present speed only with one fractional digit.

Browse Source
This commit is contained in:
Dennis Guse
2020-09-05 17:00:21 +02:00
parent a1646e1b76
commit e956cf14c4
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/androidTest/java/de/dennisguse/opentracks/util/StringUtilsTest.java
+3 -3
View File
@@ -202,7 +202,7 @@ public class StringUtilsTest {
assertEquals("1", StringUtils.formatDecimal(1.1, 0)); assertEquals("1", StringUtils.formatDecimal(1.1, 0));
assertEquals("10", StringUtils.formatDecimal(10, 0)); assertEquals("10", StringUtils.formatDecimal(10, 0));
assertEquals("10", StringUtils.formatDecimal(10.1, 0)); assertEquals("10", StringUtils.formatDecimal(10.1, 0));
assertEquals("0", StringUtils.formatDecimal(-0.1, 0)); assertEquals("-0", StringUtils.formatDecimal(-0.1, 0));
assertEquals("0", StringUtils.formatDecimal(0.0, 2)); assertEquals("0", StringUtils.formatDecimal(0.0, 2));
assertEquals("0.1", StringUtils.formatDecimal(0.1, 2)); assertEquals("0.1", StringUtils.formatDecimal(0.1, 2));
@@ -220,8 +220,8 @@ public class StringUtilsTest {
assertEquals("4:59", StringUtils.getSpeedParts(context, 3.34, true, false).first); assertEquals("4:59", StringUtils.getSpeedParts(context, 3.34, true, false).first);
assertEquals("5:00", StringUtils.getSpeedParts(context, 3.33, true, false).first); assertEquals("5:00", StringUtils.getSpeedParts(context, 3.33, true, false).first);
assertEquals("11.99", StringUtils.getSpeedParts(context, 3.33, true, true).first); assertEquals("11.9", StringUtils.getSpeedParts(context, 3.31, true, true).first);
assertEquals("7.45", StringUtils.getSpeedParts(context, 3.33, false, true).first); assertEquals("7.5", StringUtils.getSpeedParts(context, 3.34, false, true).first);
assertEquals("min/km", StringUtils.getSpeedParts(context, 0, true, false).second); assertEquals("min/km", StringUtils.getSpeedParts(context, 0, true, false).second);
assertEquals("min/mi", StringUtils.getSpeedParts(context, 0, false, false).second); assertEquals("min/mi", StringUtils.getSpeedParts(context, 0, false, false).second);
src/main/java/de/dennisguse/opentracks/util/StringUtils.java
+6 -7
View File
@@ -22,6 +22,7 @@ import android.text.format.DateUtils;
import android.util.Log; import android.util.Log;
import android.util.Pair; import android.util.Pair;
import java.math.RoundingMode;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.time.Instant; import java.time.Instant;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@@ -125,12 +126,10 @@ public class StringUtils {
* Format a decimal number while removing trailing zeros of the decimal part (if present). * Format a decimal number while removing trailing zeros of the decimal part (if present).
*/ */
public static String formatDecimal(double value, int decimalPlaces) { public static String formatDecimal(double value, int decimalPlaces) {
if (decimalPlaces < 1) { DecimalFormat df = new DecimalFormat();
return Long.toString(Math.round(value)); df.setMaximumFractionDigits(decimalPlaces);
} df.setRoundingMode(RoundingMode.HALF_EVEN);
return df.format(value);
String format = "#." + new String(new char[decimalPlaces]).replace("\0", "#");
return new DecimalFormat(format).format(value);
} }
/** /**
@@ -204,7 +203,7 @@ public class StringUtils {
} }
if (reportSpeed) { if (reportSpeed) {
return new Pair<>(StringUtils.formatDecimal(speed * UnitConversions.S_TO_HR), unitString); return new Pair<>(StringUtils.formatDecimal(speed * UnitConversions.S_TO_HR, 1), unitString);
} }
int pace = speed == 0 ? 0 : (int) Math.round(1 / speed); //sec / [KM | MI] int pace = speed == 0 ? 0 : (int) Math.round(1 / speed); //sec / [KM | MI]