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

Merge branch 'barometer#10' into main

Browse Source
This commit is contained in:
Dennis Guse
2020-09-06 22:34:54 +02:00
parent 80dbbbc1ed 6e1aba6fa0
commit 0d493c410e
30 changed files with 716 additions and 94 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
@@ -323,21 +323,21 @@ public class StringUtils {
}
/**
* Sets an elevation value.
* Sets an elevation_m value.
*
* @param context the context
* @param elevation the elevation in meters
* @param elevation_m the elevation_m
* @param metricUnits true if metric units
* @return the formatted elevation (or null) and it's unit as {@link Pair}
* @return the formatted elevation_m (or null) and it's unit as {@link Pair}
*/
public static Pair<String, String> formatElevation(Context context, double elevation, boolean metricUnits) {
public static Pair<String, String> formatElevation(Context context, Float elevation_m, boolean metricUnits) {
String value = context.getString(R.string.value_unknown);
String unit = context.getString(metricUnits ? R.string.unit_meter : R.string.unit_feet);
if (!Double.isNaN(elevation) && !Double.isInfinite(elevation)) {
if (elevation_m != null) {
if (!metricUnits) {
elevation *= UnitConversions.M_TO_FT;
elevation_m *= (float) UnitConversions.M_TO_FT;
}
value = StringUtils.formatDecimal(elevation, 0);
value = StringUtils.formatDecimal(elevation_m, 0);
}
return new Pair<>(value, unit);
}