diff --git a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java index fa00a7577..2c1d9d370 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java @@ -209,8 +209,8 @@ public class ExportImportTest { assertEquals(Instant.parse("2020-02-02T02:02:02Z"), trackStatistics.startTime()); assertEquals(Instant.parse("2020-02-02T02:04:00Z"), trackStatistics.stopTime()); - assertEquals(Duration.ofSeconds(56), trackStatistics.totalTime()); - assertEquals(Duration.ofSeconds(26), trackStatistics.movingTime()); //TODO Likely too low + assertEquals(Duration.ofSeconds(56), trackStatistics.totalDuration()); + assertEquals(Duration.ofSeconds(26), trackStatistics.movingDuration()); //TODO Likely too low // Distance assertEquals(222049.34375, trackStatistics.totalDistance().toM(), 0.01); //TODO Too low @@ -333,8 +333,8 @@ public class ExportImportTest { assertEquals(Instant.parse("2020-02-02T02:02:02Z"), importedTrackStatistics.startTime()); assertEquals(Instant.parse("2020-02-02T02:04:00Z"), importedTrackStatistics.stopTime()); - assertEquals(Duration.ofSeconds(56), importedTrackStatistics.totalTime()); - assertEquals(Duration.ofSeconds(26), importedTrackStatistics.movingTime()); + assertEquals(Duration.ofSeconds(56), importedTrackStatistics.totalDuration()); + assertEquals(Duration.ofSeconds(26), importedTrackStatistics.movingDuration()); // Distance assertEquals(222049.421, importedTrackStatistics.totalDistance().toM(), 0.01); @@ -473,8 +473,8 @@ public class ExportImportTest { assertEquals(Instant.parse("2020-02-02T02:02:03Z"), importedTrackStatistics.startTime()); assertEquals(Instant.parse("2020-02-02T02:03:50Z"), importedTrackStatistics.stopTime()); - assertEquals(Duration.ofSeconds(107), importedTrackStatistics.totalTime()); - assertEquals(Duration.ofSeconds(107), importedTrackStatistics.movingTime()); + assertEquals(Duration.ofSeconds(107), importedTrackStatistics.totalDuration()); + assertEquals(Duration.ofSeconds(107), importedTrackStatistics.movingDuration()); // Distance assertEquals(222271.734, importedTrackStatistics.totalDistance().toM(), 0.01); diff --git a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GPXTrackImporterTest.java b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GPXTrackImporterTest.java index e3c80be8b..85e963c7f 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GPXTrackImporterTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GPXTrackImporterTest.java @@ -151,7 +151,7 @@ public class GPXTrackImporterTest { // 3. trackstatistics Statistics trackStatistics = importedTrack.getStatistics(); assertEquals(0.75, trackStatistics.maxSpeed().toMPS(), 0.01); - assertEquals(Duration.ofSeconds(101), trackStatistics.movingTime()); + assertEquals(Duration.ofSeconds(101), trackStatistics.movingDuration()); // 4. trackpoints List importedTrackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, importTrackId); @@ -206,7 +206,7 @@ public class GPXTrackImporterTest { // 3. trackstatistics Statistics trackStatistics = importedTrack.getStatistics(); assertEquals(5.0, trackStatistics.maxSpeed().toMPS(), 0.01); - assertEquals(Duration.ofSeconds(101), trackStatistics.movingTime()); + assertEquals(Duration.ofSeconds(101), trackStatistics.movingDuration()); // 4. trackpoints List importedTrackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, importTrackId); diff --git a/src/androidTest/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdaterTest.java b/src/androidTest/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdaterTest.java index a4969ffab..ba1502892 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdaterTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdaterTest.java @@ -246,7 +246,7 @@ public class TrackStatisticsUpdaterTest { )); // then - assertEquals(Duration.ofSeconds(35), subject.getSegmentStatisticUpdater().getStatistics().movingTime()); + assertEquals(Duration.ofSeconds(35), subject.getSegmentStatisticUpdater().getStatistics().movingDuration()); } @Test @@ -276,7 +276,7 @@ public class TrackStatisticsUpdaterTest { )); // then - assertEquals(Duration.ofSeconds(40), subject.getSegmentStatisticUpdater().getStatistics().movingTime()); + assertEquals(Duration.ofSeconds(40), subject.getSegmentStatisticUpdater().getStatistics().movingDuration()); assertEquals(Distance.of(1040), subject.getSegmentStatisticUpdater().getStatistics().totalDistance()); } @@ -294,8 +294,8 @@ public class TrackStatisticsUpdaterTest { subject.addTrackPoint(new TrackPoint(TrackPoint.Type.IDLE, Instant.ofEpochSecond(30))); // then assertTrue(subject.getSegmentStatisticUpdater().isIdle()); - assertEquals(Duration.ofSeconds(30), subject.getSegmentStatisticUpdater().getStatistics().movingTime()); - assertEquals(Duration.ofSeconds(30), subject.getSegmentStatisticUpdater().getStatistics().totalTime()); + assertEquals(Duration.ofSeconds(30), subject.getSegmentStatisticUpdater().getStatistics().movingDuration()); + assertEquals(Duration.ofSeconds(30), subject.getSegmentStatisticUpdater().getStatistics().totalDuration()); assertEquals(Distance.of(10), subject.getSegmentStatisticUpdater().getStatistics().totalDistance()); // when @@ -304,8 +304,8 @@ public class TrackStatisticsUpdaterTest { .setSensorDistance(Distance.ZERO)); // then assertTrue(subject.getSegmentStatisticUpdater().isIdle()); - assertEquals(Duration.ofSeconds(30), subject.getSegmentStatisticUpdater().getStatistics().movingTime()); - assertEquals(Duration.ofSeconds(40), subject.getSegmentStatisticUpdater().getStatistics().totalTime()); + assertEquals(Duration.ofSeconds(30), subject.getSegmentStatisticUpdater().getStatistics().movingDuration()); + assertEquals(Duration.ofSeconds(40), subject.getSegmentStatisticUpdater().getStatistics().totalDuration()); assertEquals(Distance.of(10), subject.getSegmentStatisticUpdater().getStatistics().totalDistance()); // when @@ -314,8 +314,8 @@ public class TrackStatisticsUpdaterTest { .setSensorDistance(Distance.of(1))); // then assertTrue(subject.getSegmentStatisticUpdater().isIdle()); - assertEquals(Duration.ofSeconds(30), subject.getSegmentStatisticUpdater().getStatistics().movingTime()); - assertEquals(Duration.ofSeconds(45), subject.getSegmentStatisticUpdater().getStatistics().totalTime()); + assertEquals(Duration.ofSeconds(30), subject.getSegmentStatisticUpdater().getStatistics().movingDuration()); + assertEquals(Duration.ofSeconds(45), subject.getSegmentStatisticUpdater().getStatistics().totalDuration()); assertEquals(Distance.of(11), subject.getSegmentStatisticUpdater().getStatistics().totalDistance()); // when @@ -324,8 +324,8 @@ public class TrackStatisticsUpdaterTest { .setSensorDistance(Distance.of(10))); // then assertFalse(subject.getSegmentStatisticUpdater().isIdle()); - assertEquals(Duration.ofSeconds(30), subject.getSegmentStatisticUpdater().getStatistics().movingTime()); - assertEquals(Duration.ofSeconds(50), subject.getSegmentStatisticUpdater().getStatistics().totalTime()); + assertEquals(Duration.ofSeconds(30), subject.getSegmentStatisticUpdater().getStatistics().movingDuration()); + assertEquals(Duration.ofSeconds(50), subject.getSegmentStatisticUpdater().getStatistics().totalDuration()); assertEquals(Distance.of(21), subject.getSegmentStatisticUpdater().getStatistics().totalDistance()); // when @@ -333,8 +333,8 @@ public class TrackStatisticsUpdaterTest { // then assertFalse(subject.getSegmentStatisticUpdater().isIdle()); - assertEquals(Duration.ofSeconds(40), subject.getSegmentStatisticUpdater().getStatistics().movingTime()); - assertEquals(Duration.ofSeconds(60), subject.getSegmentStatisticUpdater().getStatistics().totalTime()); + assertEquals(Duration.ofSeconds(40), subject.getSegmentStatisticUpdater().getStatistics().movingDuration()); + assertEquals(Duration.ofSeconds(60), subject.getSegmentStatisticUpdater().getStatistics().totalDuration()); assertEquals(Distance.of(21), subject.getSegmentStatisticUpdater().getStatistics().totalDistance()); } diff --git a/src/androidTest/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsUpdaterTest.java b/src/androidTest/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsUpdaterTest.java index 48bcb62ba..4e4d527d2 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsUpdaterTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsUpdaterTest.java @@ -150,7 +150,7 @@ public class IntervalStatisticsUpdaterTest { } // then - assertEquals(track.getStatistics().totalTime().toSeconds(), totalTime, 0.01); + assertEquals(track.getStatistics().totalDuration().toSeconds(), totalTime, 0.01); assertEquals(track.getStatistics().totalDistance().toM(), totalDistance.toM(), 0.01); assertEquals(intervalList.size(), (int) Math.ceil(track.getStatistics().totalDistance().toM() / distanceInterval)); if (totalGain != null && totalLoss != null) { diff --git a/src/main/java/de/dennisguse/opentracks/TrackStoppedActivity.java b/src/main/java/de/dennisguse/opentracks/TrackStoppedActivity.java index 3d65d59b3..7e0e05787 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackStoppedActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackStoppedActivity.java @@ -68,7 +68,7 @@ public class TrackStoppedActivity extends AbstractTrackDeleteActivity implements viewBinding.trackEditDescription.setText(track.getDescription()); - viewBinding.time.setText(StringUtils.formatElapsedTime(track.getStatistics().movingTime())); + viewBinding.time.setText(StringUtils.formatElapsedTime(track.getStatistics().movingDuration())); { Pair parts = SpeedFormatter.Builder() diff --git a/src/main/java/de/dennisguse/opentracks/chart/ChartPoint.java b/src/main/java/de/dennisguse/opentracks/chart/ChartPoint.java index a12426d51..d7e20c0ae 100644 --- a/src/main/java/de/dennisguse/opentracks/chart/ChartPoint.java +++ b/src/main/java/de/dennisguse/opentracks/chart/ChartPoint.java @@ -26,7 +26,7 @@ public record ChartPoint( return new ChartPoint( chartByDistance ? trackStatistics.totalDistance().toKM_Miles(unitSystem) - : trackStatistics.totalTime().toMillis(), + : trackStatistics.totalDuration().toMillis(), trackPoint.hasAltitude() ? Distance.of(trackPoint.getAltitude().toM()).toM_FT(unitSystem) : null, diff --git a/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java b/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java index 8204efc80..8fa1945ce 100644 --- a/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java +++ b/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java @@ -308,8 +308,8 @@ public class ContentProviderUtils { values.put(TracksColumns.STOPTIME, trackStatistics.stopTime().toEpochMilli()); } values.put(TracksColumns.TOTALDISTANCE, trackStatistics.totalDistance().toM()); - values.put(TracksColumns.TOTALTIME, trackStatistics.totalTime().toMillis()); - values.put(TracksColumns.MOVINGTIME, trackStatistics.movingTime().toMillis()); + values.put(TracksColumns.TOTALTIME, trackStatistics.totalDuration().toMillis()); + values.put(TracksColumns.MOVINGTIME, trackStatistics.movingDuration().toMillis()); values.put(TracksColumns.MAXSPEED, trackStatistics.maxSpeed().toMPS()); if (trackStatistics.altitudeExtremities() != null) { @@ -338,8 +338,8 @@ public class ContentProviderUtils { values.put(TracksColumns.STOPTIME, trackStatistics.stopTime().toEpochMilli()); } values.put(TracksColumns.TOTALDISTANCE, trackStatistics.totalDistance().toM()); - values.put(TracksColumns.TOTALTIME, trackStatistics.totalTime().toMillis()); - values.put(TracksColumns.MOVINGTIME, trackStatistics.movingTime().toMillis()); + values.put(TracksColumns.TOTALTIME, trackStatistics.totalDuration().toMillis()); + values.put(TracksColumns.MOVINGTIME, trackStatistics.movingDuration().toMillis()); values.put(TracksColumns.MAXSPEED, trackStatistics.maxSpeed().toMPS()); values.put(TracksColumns.MIN_ALTITUDE, trackStatistics.getMinAltitude()); values.put(TracksColumns.MAX_ALTITUDE, trackStatistics.getMaxAltitude()); diff --git a/src/main/java/de/dennisguse/opentracks/data/models/Statistics.java b/src/main/java/de/dennisguse/opentracks/data/models/Statistics.java index cf5f9980f..20134cae3 100644 --- a/src/main/java/de/dennisguse/opentracks/data/models/Statistics.java +++ b/src/main/java/de/dennisguse/opentracks/data/models/Statistics.java @@ -9,10 +9,8 @@ import java.time.Instant; public record Statistics( Instant startTime, Instant stopTime, - //TODO Rename to totalDuration - Duration totalTime, - //TODO Rename to movingDuration - Duration movingTime, // Based on when we believe the user is traveling + Duration totalDuration, + Duration movingDuration, // Based on when we believe the user is traveling Distance totalDistance, @@ -32,15 +30,15 @@ public record Statistics( ) { public Duration getStoppedTime() { - return totalTime.minus(movingTime); + return totalDuration.minus(movingDuration); } public Speed getAverageSpeed() { - return Speed.of(totalDistance, totalTime); + return Speed.of(totalDistance, totalDuration); } public Speed getAverageMovingSpeed() { - return Speed.of(totalDistance, movingTime); + return Speed.of(totalDistance, movingDuration); } @Deprecated diff --git a/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordedFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordedFragment.java index 78f788ddc..bb9a966ce 100644 --- a/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordedFragment.java +++ b/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordedFragment.java @@ -184,8 +184,8 @@ public class StatisticsRecordedFragment extends Fragment { // Set time and start datetime { - viewBinding.statsMovingTimeValue.setText(StringUtils.formatElapsedTime(trackStatistics.movingTime())); - viewBinding.statsTotalTimeValue.setText(StringUtils.formatElapsedTime(trackStatistics.totalTime())); + viewBinding.statsMovingTimeValue.setText(StringUtils.formatElapsedTime(trackStatistics.movingDuration())); + viewBinding.statsTotalTimeValue.setText(StringUtils.formatElapsedTime(trackStatistics.totalDuration())); } SpeedFormatter formatter = SpeedFormatter.Builder().setUnit(unitSystem).setReportSpeedOrPace(preferenceReportSpeed).build(getContext()); diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/GPXTrackExporter.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/GPXTrackExporter.java index 033bc2a88..7e1a4ca93 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/GPXTrackExporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/GPXTrackExporter.java @@ -282,8 +282,8 @@ public class GPXTrackExporter implements TrackExporter { Statistics trackStatistics = track.getStatistics(); printWriter.println(""); printWriter.println("" + trackStatistics.totalDistance().toM() + ""); - printWriter.println("" + trackStatistics.totalTime().getSeconds() + ""); - printWriter.println("" + trackStatistics.movingTime().getSeconds() + ""); + printWriter.println("" + trackStatistics.totalDuration().getSeconds() + ""); + printWriter.println("" + trackStatistics.movingDuration().getSeconds() + ""); printWriter.println("" + trackStatistics.getStoppedTime().getSeconds() + ""); printWriter.println("" + trackStatistics.maxSpeed().toMPS() + ""); if (trackStatistics.altitudeGainLoss() != null) { diff --git a/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementManager.java b/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementManager.java index 917339e90..057df1fd7 100644 --- a/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementManager.java +++ b/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementManager.java @@ -130,7 +130,7 @@ public class VoiceAnnouncementManager implements SharedPreferences.OnSharedPrefe updateNextTaskDistance(); announce = true; } - if (!trackStatistics.totalTime().minus(nextTotalTime).isNegative()) { + if (!trackStatistics.totalDuration().minus(nextTotalTime).isNegative()) { updateNextDuration(); announce = true; } @@ -196,9 +196,9 @@ public class VoiceAnnouncementManager implements SharedPreferences.OnSharedPrefe nextTotalTime = TOTALTIME_OFF; } else { - Duration intervalMod = Duration.ofMillis(trackStatistics.totalTime().toMillis() % totalTimeFrequency.toMillis()); + Duration intervalMod = Duration.ofMillis(trackStatistics.totalDuration().toMillis() % totalTimeFrequency.toMillis()); - nextTotalTime = trackStatistics.totalTime().plus(totalTimeFrequency.minus(intervalMod)); + nextTotalTime = trackStatistics.totalDuration().plus(totalTimeFrequency.minus(intervalMod)); } } diff --git a/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtils.java b/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtils.java index 86a626ec2..fd89ae61a 100644 --- a/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtils.java +++ b/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtils.java @@ -111,7 +111,7 @@ class VoiceAnnouncementUtils { boolean hasTravelledDistance = !totalDistance.isZero(); // Announce time - Duration movingTime = trackStatistics.movingTime(); + Duration movingTime = trackStatistics.movingDuration(); if (shouldVoiceAnnounceMovingTime() && hasTravelledDistance && !movingTime.isZero()) { appendDuration(context, builder, movingTime); builder.append("."); diff --git a/src/main/java/de/dennisguse/opentracks/share/TrackShareSummaryGenerator.java b/src/main/java/de/dennisguse/opentracks/share/TrackShareSummaryGenerator.java index 355d28956..a22365083 100644 --- a/src/main/java/de/dennisguse/opentracks/share/TrackShareSummaryGenerator.java +++ b/src/main/java/de/dennisguse/opentracks/share/TrackShareSummaryGenerator.java @@ -85,10 +85,10 @@ public class TrackShareSummaryGenerator { writeDistance(stats.totalDistance(), builder, R.string.description_total_distance); // Total time - writeTime(stats.totalTime(), builder, R.string.description_total_time); + writeTime(stats.totalDuration(), builder, R.string.description_total_time); // Moving time - writeTime(stats.movingTime(), builder, R.string.description_moving_time); + writeTime(stats.movingDuration(), builder, R.string.description_moving_time); // Average speed writeSpeed(stats.getAverageSpeed(), builder, R.string.description_average_speed); diff --git a/src/main/java/de/dennisguse/opentracks/stats/SegmentStatisticUpdater.java b/src/main/java/de/dennisguse/opentracks/stats/SegmentStatisticUpdater.java index 0c803d4ec..387f5dcdc 100644 --- a/src/main/java/de/dennisguse/opentracks/stats/SegmentStatisticUpdater.java +++ b/src/main/java/de/dennisguse/opentracks/stats/SegmentStatisticUpdater.java @@ -54,11 +54,11 @@ public class SegmentStatisticUpdater { /** * Updated when new points are received, may be stale. * This statistic is only updated when a new point is added to the statistics, so it may be off. - * If you need to calculate the proper totalTime, use startTime with the current time. + * If you need to calculate the proper totalDuration, use startTime with the current time. */ - private Duration totalTime; + private Duration totalDuration; // Based on when we believe the user is traveling. - private Duration movingTime; + private Duration movingDuration; // The maximum speed (meters/second) that we believe is valid. private Speed maxSpeed; private Float totalAltitudeGain_m = null; @@ -87,8 +87,8 @@ public class SegmentStatisticUpdater { startTime = statistics.startTime(); stopTime = statistics.stopTime(); totalDistance = statistics.totalDistance(); - totalTime = statistics.totalTime(); - movingTime = statistics.movingTime(); + totalDuration = statistics.totalDuration(); + movingDuration = statistics.movingDuration(); maxSpeed = statistics.maxSpeed(); if (statistics.altitudeExtremities() != null) { altitudeExtremities.set(statistics.altitudeExtremities().min_m(), statistics.altitudeExtremities().max_m()); @@ -129,8 +129,8 @@ public class SegmentStatisticUpdater { // Using total time as weights for the averaging. // Important to do this before total time is updated avgHeartRate = HeartRate.of( - (totalTime.getSeconds() * avgHeartRate.getBPM() + other.totalTime.getSeconds() * other.avgHeartRate.getBPM()) - / (totalTime.getSeconds() + other.totalTime.getSeconds()) + (totalDuration.getSeconds() * avgHeartRate.getBPM() + other.totalDuration.getSeconds() * other.avgHeartRate.getBPM()) + / (totalDuration.getSeconds() + other.totalDuration.getSeconds()) ); } } @@ -142,15 +142,15 @@ public class SegmentStatisticUpdater { // Using total time as weights for the averaging. // Important to do this before total time is updated avgPower = Power.of( - (totalTime.getSeconds() * avgPower.getW() + other.totalTime.getSeconds() * other.avgPower.getW()) - / (totalTime.getSeconds() + other.totalTime.getSeconds()) + (totalDuration.getSeconds() * avgPower.getW() + other.totalDuration.getSeconds() * other.avgPower.getW()) + / (totalDuration.getSeconds() + other.totalDuration.getSeconds()) ); } } totalDistance = totalDistance.plus(other.totalDistance); - totalTime = totalTime.plus(other.totalTime); - movingTime = movingTime.plus(other.movingTime); + totalDuration = totalDuration.plus(other.totalDuration); + movingDuration = movingDuration.plus(other.movingDuration); maxSpeed = Speed.max(maxSpeed, other.maxSpeed); if (other.altitudeExtremities.hasData()) { altitudeExtremities.update(other.altitudeExtremities.getMin()); @@ -184,8 +184,8 @@ public class SegmentStatisticUpdater { startTime = null; stopTime = null; - totalTime = Duration.ZERO; - movingTime = Duration.ZERO; + totalDuration = Duration.ZERO; + movingDuration = Duration.ZERO; totalDistance = Distance.ZERO; maxSpeed = Speed.ZERO; totalAltitudeGain_m = null; @@ -204,8 +204,8 @@ public class SegmentStatisticUpdater { return new Statistics( startTime, stopTime, - totalTime, - movingTime, + totalDuration, + movingDuration, totalDistance, getMaxSpeed(), @@ -244,7 +244,7 @@ public class SegmentStatisticUpdater { } public void updateTotalTime(Instant now) { - this.totalTime = Duration.between(startTime, now); + this.totalDuration = Duration.between(startTime, now); } public void addMovingTime(TrackPoint trackPoint, TrackPoint lastTrackPoint) { @@ -253,7 +253,7 @@ public class SegmentStatisticUpdater { if (movingDuration.isNegative()) { throw new RuntimeException("Moving time cannot be negative"); } - movingTime = movingTime.plus(movingDuration); + this.movingDuration = this.movingDuration.plus(movingDuration); } public boolean isIdle() { @@ -265,7 +265,7 @@ public class SegmentStatisticUpdater { } private Speed getAverageMovingSpeed() { - return Speed.of(totalDistance, movingTime); + return Speed.of(totalDistance, movingDuration); } public Speed getMaxSpeed() { diff --git a/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsUpdater.java b/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsUpdater.java index 4492c0d7f..24d5855c9 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsUpdater.java +++ b/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsUpdater.java @@ -166,7 +166,7 @@ public class IntervalStatisticsUpdater { private void add(Statistics trackStatistics, @Nullable TrackPoint lastTrackPoint) { distance = distance.plus(trackStatistics.totalDistance()); - time = time.plus(trackStatistics.totalTime()); + time = time.plus(trackStatistics.totalDuration()); if (trackStatistics.altitudeGainLoss() != null) { gain_m = trackStatistics.altitudeGainLoss().gain_m(); loss_m = trackStatistics.altitudeGainLoss().loss_m(); @@ -184,7 +184,7 @@ public class IntervalStatisticsUpdater { private void set(Statistics trackStatistics) { distance = trackStatistics.totalDistance(); - time = trackStatistics.totalTime(); + time = trackStatistics.totalDuration(); if (trackStatistics.altitudeGainLoss() != null) { gain_m = trackStatistics.altitudeGainLoss().gain_m(); loss_m = trackStatistics.altitudeGainLoss().loss_m(); diff --git a/src/main/java/de/dennisguse/opentracks/viewmodels/GenericStatisticsViewHolder.java b/src/main/java/de/dennisguse/opentracks/viewmodels/GenericStatisticsViewHolder.java index ffea4bbf7..6b3d53fd0 100644 --- a/src/main/java/de/dennisguse/opentracks/viewmodels/GenericStatisticsViewHolder.java +++ b/src/main/java/de/dennisguse/opentracks/viewmodels/GenericStatisticsViewHolder.java @@ -46,7 +46,7 @@ public abstract class GenericStatisticsViewHolder extends StatisticViewHolder valueAndUnit = new Pair<>(StringUtils.formatElapsedTime(data.getStatisticsTrack().totalTime()), null); + Pair valueAndUnit = new Pair<>(StringUtils.formatElapsedTime(data.getStatisticsTrack().totalDuration()), null); getBinding().statsValue.setText(valueAndUnit.first); getBinding().statsUnit.setText(valueAndUnit.second); @@ -58,7 +58,7 @@ public abstract class GenericStatisticsViewHolder extends StatisticViewHolder