forked from upstream-mirrors/OpenTracks
Added value object: AltitudeExtremities.
This commit is contained in:
-1
@@ -57,7 +57,6 @@ public class TrackRecordingServiceNotificationManagerTest {
|
|||||||
null,
|
null,
|
||||||
null,
|
null,
|
||||||
null,
|
null,
|
||||||
null,
|
|
||||||
null
|
null
|
||||||
));
|
));
|
||||||
when(notificationCompatBuilder.setOnlyAlertOnce(anyBoolean()))
|
when(notificationCompatBuilder.setOnlyAlertOnce(anyBoolean()))
|
||||||
|
|||||||
@@ -339,7 +339,7 @@ public class ContentProviderUtils {
|
|||||||
values.put(TracksColumns.AVGMOVINGSPEED, trackStatistics.getAverageMovingSpeed().toMPS());
|
values.put(TracksColumns.AVGMOVINGSPEED, trackStatistics.getAverageMovingSpeed().toMPS());
|
||||||
values.put(TracksColumns.MAXSPEED, trackStatistics.maxSpeed().toMPS());
|
values.put(TracksColumns.MAXSPEED, trackStatistics.maxSpeed().toMPS());
|
||||||
|
|
||||||
if (track.getTrackStatistics().hasAltitudeExtremities()) {
|
if (trackStatistics.altitudeExtremities() != null) {
|
||||||
values.put(TracksColumns.MIN_ALTITUDE, trackStatistics.getMinAltitude());
|
values.put(TracksColumns.MIN_ALTITUDE, trackStatistics.getMinAltitude());
|
||||||
values.put(TracksColumns.MAX_ALTITUDE, trackStatistics.getMaxAltitude());
|
values.put(TracksColumns.MAX_ALTITUDE, trackStatistics.getMaxAltitude());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,4 @@
|
|||||||
|
package de.dennisguse.opentracks.data.models;
|
||||||
|
|
||||||
|
public record AltitudeExtremities(double min_m, double max_m) {
|
||||||
|
}
|
||||||
@@ -17,11 +17,8 @@ public record Statistics(
|
|||||||
boolean isIdle, //TODO Check if this is persisted; if not: remove
|
boolean isIdle, //TODO Check if this is persisted; if not: remove
|
||||||
Speed maxSpeed,
|
Speed maxSpeed,
|
||||||
|
|
||||||
//TODO Create record for min/max altitude
|
|
||||||
@Nullable
|
@Nullable
|
||||||
Double altitudeMin_m,
|
AltitudeExtremities altitudeExtremities,
|
||||||
@Nullable
|
|
||||||
Double altitudeMax_m,
|
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
AltitudeGainLoss altitudeGainLoss,
|
AltitudeGainLoss altitudeGainLoss,
|
||||||
@@ -49,14 +46,14 @@ public record Statistics(
|
|||||||
@Deprecated
|
@Deprecated
|
||||||
//TODO null should be return (need adjusting ContentPtoviderUtils.createContentValues()
|
//TODO null should be return (need adjusting ContentPtoviderUtils.createContentValues()
|
||||||
public double getMinAltitude() {
|
public double getMinAltitude() {
|
||||||
if (altitudeMin_m == null) return 0;
|
if (altitudeExtremities == null) return 0;
|
||||||
return altitudeMin_m;
|
return altitudeExtremities.min_m();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Deprecated
|
@Deprecated
|
||||||
//TODO null should be return (need adjusting ContentPtoviderUtils.createContentValues()
|
//TODO null should be return (need adjusting ContentPtoviderUtils.createContentValues()
|
||||||
public double getMaxAltitude() {
|
public double getMaxAltitude() {
|
||||||
if (altitudeMax_m == null) return 0;
|
if (altitudeExtremities == null) return 0;
|
||||||
return altitudeMax_m;
|
return altitudeExtremities.max_m();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -109,9 +109,9 @@ public class TrackShareSummaryGenerator {
|
|||||||
writePace(stats.maxSpeed(), builder, R.string.description_fastest_pace_in_minute);
|
writePace(stats.maxSpeed(), builder, R.string.description_fastest_pace_in_minute);
|
||||||
|
|
||||||
// Min and Max altitude
|
// Min and Max altitude
|
||||||
if (stats.altitudeMax_m() != null & stats.altitudeMin_m() != null) {
|
if (stats.altitudeExtremities() != null) {
|
||||||
writeAltitude(stats.altitudeMax_m(), builder, R.string.description_max_altitude);
|
writeAltitude(stats.altitudeExtremities().max_m(), builder, R.string.description_max_altitude);
|
||||||
writeAltitude(stats.altitudeMin_m(), builder, R.string.description_min_altitude);
|
writeAltitude(stats.altitudeExtremities().min_m(), builder, R.string.description_min_altitude);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Altitude gain & loss
|
// Altitude gain & loss
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ import java.time.Duration;
|
|||||||
import java.time.Instant;
|
import java.time.Instant;
|
||||||
|
|
||||||
import de.dennisguse.opentracks.data.models.Altitude;
|
import de.dennisguse.opentracks.data.models.Altitude;
|
||||||
|
import de.dennisguse.opentracks.data.models.AltitudeExtremities;
|
||||||
import de.dennisguse.opentracks.data.models.AltitudeGainLoss;
|
import de.dennisguse.opentracks.data.models.AltitudeGainLoss;
|
||||||
import de.dennisguse.opentracks.data.models.Distance;
|
import de.dennisguse.opentracks.data.models.Distance;
|
||||||
import de.dennisguse.opentracks.data.models.HeartRate;
|
import de.dennisguse.opentracks.data.models.HeartRate;
|
||||||
@@ -85,7 +86,9 @@ public class SegmentStatisticUpdater {
|
|||||||
totalTime = statistics.totalTime();
|
totalTime = statistics.totalTime();
|
||||||
movingTime = statistics.movingTime();
|
movingTime = statistics.movingTime();
|
||||||
maxSpeed = statistics.maxSpeed();
|
maxSpeed = statistics.maxSpeed();
|
||||||
altitudeExtremities.set(statistics.altitudeMin_m(), statistics.altitudeMax_m());
|
if (statistics.altitudeExtremities() != null) {
|
||||||
|
altitudeExtremities.set(statistics.altitudeExtremities().min_m(), statistics.altitudeExtremities().max_m());
|
||||||
|
}
|
||||||
if (statistics.altitudeGainLoss() != null) {
|
if (statistics.altitudeGainLoss() != null) {
|
||||||
totalAltitudeGain_m = statistics.altitudeGainLoss().gain_m();
|
totalAltitudeGain_m = statistics.altitudeGainLoss().gain_m();
|
||||||
totalAltitudeLoss_m = statistics.altitudeGainLoss().loss_m();
|
totalAltitudeLoss_m = statistics.altitudeGainLoss().loss_m();
|
||||||
@@ -217,8 +220,7 @@ public class SegmentStatisticUpdater {
|
|||||||
totalDistance,
|
totalDistance,
|
||||||
isIdle,
|
isIdle,
|
||||||
getMaxSpeed(),
|
getMaxSpeed(),
|
||||||
altitudeExtremities.hasData() ? altitudeExtremities.getMin() : null,
|
altitudeExtremities.hasData() ? new AltitudeExtremities(altitudeExtremities.getMin(), altitudeExtremities.getMax()) : null,
|
||||||
altitudeExtremities.hasData() ? altitudeExtremities.getMax() : null,
|
|
||||||
totalAltitudeGain_m != null && totalAltitudeLoss_m != null ? new AltitudeGainLoss(totalAltitudeGain_m, totalAltitudeLoss_m) : null,
|
totalAltitudeGain_m != null && totalAltitudeLoss_m != null ? new AltitudeGainLoss(totalAltitudeGain_m, totalAltitudeLoss_m) : null,
|
||||||
avgHeartRate,
|
avgHeartRate,
|
||||||
avgPower
|
avgPower
|
||||||
@@ -343,10 +345,6 @@ public class SegmentStatisticUpdater {
|
|||||||
this.maxSpeed = maxSpeed;
|
this.maxSpeed = maxSpeed;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean hasAltitudeExtremities() {
|
|
||||||
return altitudeExtremities.hasData();
|
|
||||||
}
|
|
||||||
|
|
||||||
public double getMinAltitude() {
|
public double getMinAltitude() {
|
||||||
return altitudeExtremities.getMin();
|
return altitudeExtremities.getMin();
|
||||||
}
|
}
|
||||||
|
|||||||
-1
@@ -49,7 +49,6 @@ public class SettingsCustomLayoutEditAdapter extends RecyclerView.Adapter<Recycl
|
|||||||
false,
|
false,
|
||||||
Speed.of(0),
|
Speed.of(0),
|
||||||
null,
|
null,
|
||||||
null,
|
|
||||||
|
|
||||||
new AltitudeGainLoss(0f, 0f),
|
new AltitudeGainLoss(0f, 0f),
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user