forked from upstream-mirrors/OpenTracks
Cleanup: TrackStatistics has altitudeExtremities or not.
This commit is contained in:
@@ -132,13 +132,9 @@ public class DescriptionGenerator {
|
|||||||
// Fastest pace
|
// Fastest pace
|
||||||
writePace(stats.getMaxSpeed(), builder, R.string.description_fastest_pace_in_minute, lineBreak);
|
writePace(stats.getMaxSpeed(), builder, R.string.description_fastest_pace_in_minute, lineBreak);
|
||||||
|
|
||||||
// Max altitude
|
// Min and Max altitude
|
||||||
if (stats.hasAltitudeMax()) {
|
if (stats.hasAltitudeExtremities()) {
|
||||||
writeAltitude(stats.getMaxAltitude(), builder, R.string.description_max_altitude, lineBreak);
|
writeAltitude(stats.getMaxAltitude(), builder, R.string.description_max_altitude, lineBreak);
|
||||||
}
|
|
||||||
|
|
||||||
// Min altitude
|
|
||||||
if (stats.hasAltitudeMin()) {
|
|
||||||
writeAltitude(stats.getMinAltitude(), builder, R.string.description_min_altitude, lineBreak);
|
writeAltitude(stats.getMinAltitude(), builder, R.string.description_min_altitude, lineBreak);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -37,7 +37,6 @@ import de.dennisguse.opentracks.data.models.TrackPoint;
|
|||||||
*
|
*
|
||||||
* @author Rodrigo Damazio
|
* @author Rodrigo Damazio
|
||||||
*/
|
*/
|
||||||
//TODO Use null instead of Double.isInfinite
|
|
||||||
//TODO Check that data ranges are valid (not less than zero etc.)
|
//TODO Check that data ranges are valid (not less than zero etc.)
|
||||||
//TODO Should be a Java record
|
//TODO Should be a Java record
|
||||||
public class TrackStatistics {
|
public class TrackStatistics {
|
||||||
@@ -321,8 +320,8 @@ public class TrackStatistics {
|
|||||||
this.maxSpeed = maxSpeed;
|
this.maxSpeed = maxSpeed;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean hasAltitudeMin() {
|
public boolean hasAltitudeExtremities() {
|
||||||
return !Double.isInfinite(getMinAltitude());
|
return altitudeExtremities.hasData();
|
||||||
}
|
}
|
||||||
|
|
||||||
public double getMinAltitude() {
|
public double getMinAltitude() {
|
||||||
@@ -333,10 +332,6 @@ public class TrackStatistics {
|
|||||||
altitudeExtremities.setMin(altitude_m);
|
altitudeExtremities.setMin(altitude_m);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean hasAltitudeMax() {
|
|
||||||
return !Double.isInfinite(getMaxAltitude());
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets the maximum altitude.
|
* Gets the maximum altitude.
|
||||||
* This is calculated from the smoothed altitude, so this can actually be less than the current altitude.
|
* This is calculated from the smoothed altitude, so this can actually be less than the current altitude.
|
||||||
|
|||||||
Reference in New Issue
Block a user