diff --git a/src/androidTest/java/de/dennisguse/opentracks/chart/ChartPointTest.java b/src/androidTest/java/de/dennisguse/opentracks/chart/ChartPointTest.java index 46dead9d5..f5539f0f3 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/chart/ChartPointTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/chart/ChartPointTest.java @@ -15,7 +15,7 @@ import de.dennisguse.opentracks.data.models.Distance; import de.dennisguse.opentracks.data.models.Speed; import de.dennisguse.opentracks.data.models.TrackPoint; import de.dennisguse.opentracks.settings.UnitSystem; -import de.dennisguse.opentracks.stats.TrackStatistics; +import de.dennisguse.opentracks.stats.SegmentStatisticUpdater; @RunWith(AndroidJUnit4.class) public class ChartPointTest { @@ -23,7 +23,7 @@ public class ChartPointTest { @Test public void create_by_time() { // given - TrackStatistics statistics = new TrackStatistics(); + SegmentStatisticUpdater statistics = new SegmentStatisticUpdater(); statistics.setTotalTime(Duration.ofSeconds(1000)); // when @@ -36,7 +36,7 @@ public class ChartPointTest { @Test public void create_by_distance() { // given - TrackStatistics statistics = new TrackStatistics(); + SegmentStatisticUpdater statistics = new SegmentStatisticUpdater(); statistics.setTotalDistance(Distance.of(1000)); // when @@ -49,7 +49,7 @@ public class ChartPointTest { @Test public void create_get_altitude_speed_and_pace() { // given - TrackStatistics statistics = new TrackStatistics(); + SegmentStatisticUpdater statistics = new SegmentStatisticUpdater(); TrackPoint trackPoint = TrackStubUtils.createDefaultTrackPoint() .setAltitude(Altitude.EGM2008.of(50)); @@ -65,7 +65,7 @@ public class ChartPointTest { @Test public void create_sensorNotAvailable() { // given - TrackStatistics statistics = new TrackStatistics(); + SegmentStatisticUpdater statistics = new SegmentStatisticUpdater(); TrackPoint trackPoint = TrackStubUtils.createDefaultTrackPoint() .setAltitude(Altitude.EGM2008.of(50)); // when @@ -86,7 +86,7 @@ public class ChartPointTest { .setCadence(101f) .setPower(102f); - TrackStatistics statistics = new TrackStatistics(); + SegmentStatisticUpdater statistics = new SegmentStatisticUpdater(); // when ChartPoint point = ChartPoint.create(statistics, trackPoint, Speed.of(10), false, UnitSystem.METRIC); diff --git a/src/androidTest/java/de/dennisguse/opentracks/content/data/TestDataUtil.java b/src/androidTest/java/de/dennisguse/opentracks/content/data/TestDataUtil.java index e6c9e8343..bd9a28a62 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/content/data/TestDataUtil.java +++ b/src/androidTest/java/de/dennisguse/opentracks/content/data/TestDataUtil.java @@ -20,7 +20,7 @@ import de.dennisguse.opentracks.data.models.Position; import de.dennisguse.opentracks.data.models.Speed; import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.data.models.TrackPoint; -import de.dennisguse.opentracks.stats.TrackStatistics; +import de.dennisguse.opentracks.stats.SegmentStatisticUpdater; import de.dennisguse.opentracks.stats.TrackStatisticsUpdater; import de.dennisguse.opentracks.ui.markers.MarkerUtils; import de.dennisguse.opentracks.util.FileUtils; @@ -86,7 +86,7 @@ public class TestDataUtil { ); //TODO Use TrackStatisticsUpdater - TrackStatistics stats = new TrackStatistics(); + SegmentStatisticUpdater stats = new SegmentStatisticUpdater(); stats.setTotalDistance(Distance.of(0)); stats.setTotalTime(Duration.ofMillis(0)); List markers = List.of( @@ -154,7 +154,7 @@ public class TestDataUtil { Uri photoUri = FileUtils.getUriForFile(context, dstFile); //TODO Use TrackStatisticsUpdater - TrackStatistics stats = new TrackStatistics(); + SegmentStatisticUpdater stats = new SegmentStatisticUpdater(); stats.setTotalDistance(Distance.of(0)); stats.setTotalTime(Duration.ofMillis(0)); @@ -171,7 +171,7 @@ public class TestDataUtil { } } - public static Pair buildTrackWithTrackPoints(ContentProviderUtils contentProviderUtils, int numberOfPoints) { + public static Pair buildTrackWithTrackPoints(ContentProviderUtils contentProviderUtils, int numberOfPoints) { Track dummyTrack = new Track(); dummyTrack.setId(new Track.Id(System.currentTimeMillis())); dummyTrack.setName("Dummy Track"); diff --git a/src/androidTest/java/de/dennisguse/opentracks/data/CustomContentProviderUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/data/CustomContentProviderUtilsTest.java index 09d6a8112..3dad21cdf 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/data/CustomContentProviderUtilsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/data/CustomContentProviderUtilsTest.java @@ -62,7 +62,7 @@ import de.dennisguse.opentracks.data.tables.MarkerColumns; import de.dennisguse.opentracks.data.tables.TrackPointsColumns; import de.dennisguse.opentracks.data.tables.TracksColumns; import de.dennisguse.opentracks.stats.SensorStatistics; -import de.dennisguse.opentracks.stats.TrackStatistics; +import de.dennisguse.opentracks.stats.SegmentStatisticUpdater; import de.dennisguse.opentracks.util.FileUtils; /** @@ -406,7 +406,7 @@ public class CustomContentProviderUtilsTest { Pair> track = TestDataUtil.createTrack(trackId, 10); // AverageSpeed - TrackStatistics statistics = new TrackStatistics(); + SegmentStatisticUpdater statistics = new SegmentStatisticUpdater(); statistics.setStartTime(Instant.ofEpochMilli(1000)); statistics.setStopTime(Instant.ofEpochMilli(2500)); statistics.setTotalTime(Duration.ofMillis(1500)); 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 7d16c8ded..2bf4cb0d3 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 @@ -75,7 +75,7 @@ import de.dennisguse.opentracks.sensors.sensorData.Raw; import de.dennisguse.opentracks.sensors.sensorData.SensorDataSet; import de.dennisguse.opentracks.services.TrackRecordingService; import de.dennisguse.opentracks.services.handlers.TrackPointCreator; -import de.dennisguse.opentracks.stats.TrackStatistics; +import de.dennisguse.opentracks.stats.SegmentStatisticUpdater; /** * Export a track to {@link TrackFileFormat} and verify that the import is identical. @@ -203,7 +203,7 @@ public class ExportImportTest { setUp(); Track track = contentProviderUtils.getTrack(trackId); - TrackStatistics trackStatistics = track.getTrackStatistics(); + SegmentStatisticUpdater trackStatistics = track.getTrackStatistics(); assertEquals(ZoneOffset.of("+01:00"), track.getZoneOffset()); assertEquals(Instant.parse("2020-02-02T02:02:02Z"), trackStatistics.getStartTime()); @@ -334,7 +334,7 @@ public class ExportImportTest { a.assertEquals(trackPoints, actual); // 3. trackstatistics - TrackStatistics importedTrackStatistics = importedTrack.getTrackStatistics(); + SegmentStatisticUpdater importedTrackStatistics = importedTrack.getTrackStatistics(); // Time assertEquals(track.getZoneOffset(), importedTrack.getZoneOffset()); @@ -479,7 +479,7 @@ public class ExportImportTest { ), actual); // 3. trackstatistics - TrackStatistics importedTrackStatistics = importedTrack.getTrackStatistics(); + SegmentStatisticUpdater importedTrackStatistics = importedTrack.getTrackStatistics(); // Time assertEquals(track.getZoneOffset(), importedTrack.getZoneOffset()); 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 82488ecaf..df2b4db5b 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 @@ -34,7 +34,7 @@ import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.data.models.TrackPoint; import de.dennisguse.opentracks.io.file.TrackFileFormat; import de.dennisguse.opentracks.io.file.exporter.TrackExporter; -import de.dennisguse.opentracks.stats.TrackStatistics; +import de.dennisguse.opentracks.stats.SegmentStatisticUpdater; /** * Test that legacy KML/GPX formats can still be imported. @@ -149,7 +149,7 @@ public class GPXTrackImporterTest { assertEquals(ActivityType.UNKNOWN, importedTrack.getActivityType()); // 3. trackstatistics - TrackStatistics trackStatistics = importedTrack.getTrackStatistics(); + SegmentStatisticUpdater trackStatistics = importedTrack.getTrackStatistics(); assertEquals(0.75, trackStatistics.getMaxSpeed().toMPS(), 0.01); assertEquals(Duration.ofSeconds(101), trackStatistics.getMovingTime()); @@ -204,7 +204,7 @@ public class GPXTrackImporterTest { assertEquals(ActivityType.UNKNOWN, importedTrack.getActivityType()); // 3. trackstatistics - TrackStatistics trackStatistics = importedTrack.getTrackStatistics(); + SegmentStatisticUpdater trackStatistics = importedTrack.getTrackStatistics(); assertEquals(5.0, trackStatistics.getMaxSpeed().toMPS(), 0.01); assertEquals(Duration.ofSeconds(101), trackStatistics.getMovingTime()); diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceNotificationManagerTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceNotificationManagerTest.java index badd4028e..2eab35723 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceNotificationManagerTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceNotificationManagerTest.java @@ -21,7 +21,7 @@ import de.dennisguse.opentracks.data.models.Speed; import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.data.models.TrackPoint; import de.dennisguse.opentracks.settings.UnitSystem; -import de.dennisguse.opentracks.stats.TrackStatistics; +import de.dennisguse.opentracks.stats.SegmentStatisticUpdater; @RunWith(MockitoJUnitRunner.class) public class TrackRecordingServiceNotificationManagerTest { @@ -32,7 +32,7 @@ public class TrackRecordingServiceNotificationManagerTest { private TrackPoint trackPointMock; @Mock - private TrackStatistics trackStatisticsMock; + private SegmentStatisticUpdater trackStatisticsMock; @Mock private NotificationCompat.Builder notificationCompatBuilder; diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceRecordingTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceRecordingTest.java index e6402a3c8..5d51a98e5 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceRecordingTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceRecordingTest.java @@ -46,7 +46,7 @@ import de.dennisguse.opentracks.sensors.sensorData.AggregatorRunning; import de.dennisguse.opentracks.sensors.sensorData.Raw; import de.dennisguse.opentracks.services.handlers.TrackPointCreator; import de.dennisguse.opentracks.settings.PreferencesUtils; -import de.dennisguse.opentracks.stats.TrackStatistics; +import de.dennisguse.opentracks.stats.SegmentStatisticUpdater; /** * Tests insert location. @@ -106,7 +106,7 @@ public class TrackRecordingServiceRecordingTest { // then - assertEquals(new TrackStatistics(startTime, startTime, 0, 0, 0, 0, null, null) + assertEquals(new SegmentStatisticUpdater(startTime, startTime, 0, 0, 0, 0, null, null) , contentProviderUtils.getTrack(trackId).getTrackStatistics()); new TrackPointAssert().assertEquals(List.of( @@ -120,7 +120,7 @@ public class TrackRecordingServiceRecordingTest { service.endCurrentTrack(); // then - assertEquals(new TrackStatistics(startTime, stopTime, 0, 1, 1, 0, 0f, 0f) + assertEquals(new SegmentStatisticUpdater(startTime, stopTime, 0, 1, 1, 0, 0f, 0f) , contentProviderUtils.getTrack(trackId).getTrackStatistics()); new TrackPointAssert().assertEquals(List.of( @@ -192,7 +192,7 @@ public class TrackRecordingServiceRecordingTest { service.endCurrentTrack(); // then - assertEquals(new TrackStatistics(startTime, pauseTime, 0, 1, 1, 0, 0f, 0f) + assertEquals(new SegmentStatisticUpdater(startTime, pauseTime, 0, 1, 1, 0, 0f, 0f) , contentProviderUtils.getTrack(trackId).getTrackStatistics()); new TrackPointAssert().assertEquals(List.of( @@ -208,7 +208,7 @@ public class TrackRecordingServiceRecordingTest { service.resumeTrack(trackId); // then - assertEquals(new TrackStatistics(startTime, resumeTime, 0, 1, 1, 0, 0f, 0f) + assertEquals(new SegmentStatisticUpdater(startTime, resumeTime, 0, 1, 1, 0, 0f, 0f) , contentProviderUtils.getTrack(trackId).getTrackStatistics()); new TrackPointAssert().assertEquals(List.of( @@ -341,7 +341,7 @@ public class TrackRecordingServiceRecordingTest { TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps1, 45.0, 35.0, 1, 15); // then - assertEquals(new TrackStatistics(startTime, gps1, 0, 1, 1, 15, 0f, 0f) + assertEquals(new SegmentStatisticUpdater(startTime, gps1, 0, 1, 1, 15, 0f, 0f) , contentProviderUtils.getTrack(trackId).getTrackStatistics()); // when @@ -349,7 +349,7 @@ public class TrackRecordingServiceRecordingTest { TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps2, 45.0001, 35.0, 1, 15); // then - assertEquals(new TrackStatistics(startTime, gps2, 11.113178253173828f, 4, 4, 15, 0f, 0f) + assertEquals(new SegmentStatisticUpdater(startTime, gps2, 11.113178253173828f, 4, 4, 15, 0f, 0f) , contentProviderUtils.getTrack(trackId).getTrackStatistics()); // when @@ -357,7 +357,7 @@ public class TrackRecordingServiceRecordingTest { TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps3, 45.0002, 35.0, 1, 15); // then - assertEquals(new TrackStatistics(startTime, gps3, 22.226356506347656, 6, 6, 15, 0f, 0f) + assertEquals(new SegmentStatisticUpdater(startTime, gps3, 22.226356506347656, 6, 6, 15, 0f, 0f) , contentProviderUtils.getTrack(trackId).getTrackStatistics()); @@ -367,7 +367,7 @@ public class TrackRecordingServiceRecordingTest { service.endCurrentTrack(); // then - assertEquals(new TrackStatistics(startTime, stopTime, 22.226356506347656, 10, 10, 15, 0f, 0f) + assertEquals(new SegmentStatisticUpdater(startTime, stopTime, 22.226356506347656, 10, 10, 15, 0f, 0f) , contentProviderUtils.getTrack(trackId).getTrackStatistics()); new TrackPointAssert().assertEquals(List.of( @@ -420,7 +420,7 @@ public class TrackRecordingServiceRecordingTest { TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps1, 45.0, 35.0, 1, 15); // then - TrackStatistics gps1Statistics = new TrackStatistics(startTime, gps1, 0, 1, 1, 15, 0f, 0f); + SegmentStatisticUpdater gps1Statistics = new SegmentStatisticUpdater(startTime, gps1, 0, 1, 1, 15, 0f, 0f); assertEquals(gps1Statistics, contentProviderUtils.getTrack(trackId).getTrackStatistics()); // when @@ -443,7 +443,7 @@ public class TrackRecordingServiceRecordingTest { service.endCurrentTrack(); // then - assertEquals(new TrackStatistics(startTime, stopTime, 2.222635507583618, 10, 10, 15, 0f, 0f) + assertEquals(new SegmentStatisticUpdater(startTime, stopTime, 2.222635507583618, 10, 10, 15, 0f, 0f) , contentProviderUtils.getTrack(trackId).getTrackStatistics()); new TrackPointAssert().assertEquals(List.of( @@ -548,7 +548,7 @@ public class TrackRecordingServiceRecordingTest { TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps1, 45.0, 35.0, 100, 15); // then - TrackStatistics startStatistics = new TrackStatistics(startTime, startTime, 0, 0, 0, 0, null, null); + SegmentStatisticUpdater startStatistics = new SegmentStatisticUpdater(startTime, startTime, 0, 0, 0, 0, null, null); assertEquals(startStatistics, contentProviderUtils.getTrack(trackId).getTrackStatistics()); @@ -566,7 +566,7 @@ public class TrackRecordingServiceRecordingTest { service.endCurrentTrack(); // then - assertEquals(new TrackStatistics(startTime, stopTime, 0, 10, 10, 0, 0f, 0f) + assertEquals(new SegmentStatisticUpdater(startTime, stopTime, 0, 10, 10, 0, 0f, 0f) , contentProviderUtils.getTrack(trackId).getTrackStatistics()); @@ -594,14 +594,14 @@ public class TrackRecordingServiceRecordingTest { TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps1, 45.0, 35.0, 1, 15); // then - assertEquals(new TrackStatistics(startTime, gps1, 0, 1, 1, 15, 0f, 0f), contentProviderUtils.getTrack(trackId).getTrackStatistics()); + assertEquals(new SegmentStatisticUpdater(startTime, gps1, 0, 1, 1, 15, 0f, 0f), contentProviderUtils.getTrack(trackId).getTrackStatistics()); // when String gps2 = "2020-02-02T02:02:06Z"; TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps2, 45.1, 35.0, 1, 15); // then - assertEquals(new TrackStatistics(startTime, gps2, 11113.275390625, 4, 4, 2778.31884765625f, 0f, 0f).toString(), contentProviderUtils.getTrack(trackId).getTrackStatistics().toString()); + assertEquals(new SegmentStatisticUpdater(startTime, gps2, 11113.275390625, 4, 4, 2778.31884765625f, 0f, 0f).toString(), contentProviderUtils.getTrack(trackId).getTrackStatistics().toString()); // when @@ -610,7 +610,7 @@ public class TrackRecordingServiceRecordingTest { service.endCurrentTrack(); // then - assertEquals(new TrackStatistics(startTime, stopTime, 11113.275390625, 10, 10, 1111.3275390625f, 0f, 0f).toString(), contentProviderUtils.getTrack(trackId).getTrackStatistics().toString()); + assertEquals(new SegmentStatisticUpdater(startTime, stopTime, 11113.275390625, 10, 10, 1111.3275390625f, 0f, 0f).toString(), contentProviderUtils.getTrack(trackId).getTrackStatistics().toString()); // then diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementManagerTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementManagerTest.java index 9e8db772b..178ed06af 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementManagerTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementManagerTest.java @@ -22,7 +22,7 @@ import java.util.concurrent.TimeoutException; import de.dennisguse.opentracks.data.models.Distance; import de.dennisguse.opentracks.services.TrackRecordingService; -import de.dennisguse.opentracks.stats.TrackStatistics; +import de.dennisguse.opentracks.stats.SegmentStatisticUpdater; @RunWith(AndroidJUnit4.class) public class VoiceAnnouncementManagerTest { @@ -54,7 +54,7 @@ public class VoiceAnnouncementManagerTest { voiceAnnouncementManager.setFrequency(Distance.ofKilometer(5)); // when - TrackStatistics statistics = new TrackStatistics(); + SegmentStatisticUpdater statistics = new SegmentStatisticUpdater(); statistics.setTotalDistance(Distance.ofKilometer(13)); voiceAnnouncementManager.start(statistics); assertEquals(Distance.of(15000), voiceAnnouncementManager.getNextTotalDistance()); @@ -74,7 +74,7 @@ public class VoiceAnnouncementManagerTest { voiceAnnouncementManager.setFrequency(Duration.ofSeconds(5)); // when - TrackStatistics statistics = new TrackStatistics(); + SegmentStatisticUpdater statistics = new SegmentStatisticUpdater(); statistics.setTotalTime(Duration.ofSeconds(91)); voiceAnnouncementManager.start(statistics); assertEquals(Duration.ofSeconds(95), voiceAnnouncementManager.getNextTotalTime()); diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtilsTest.java index 303132b77..7eead65b6 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtilsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtilsTest.java @@ -34,7 +34,7 @@ import de.dennisguse.opentracks.sensors.sensorData.SensorDataSet; import de.dennisguse.opentracks.settings.PreferencesUtils; import de.dennisguse.opentracks.settings.UnitSystem; import de.dennisguse.opentracks.stats.SensorStatistics; -import de.dennisguse.opentracks.stats.TrackStatistics; +import de.dennisguse.opentracks.stats.SegmentStatisticUpdater; import de.dennisguse.opentracks.ui.intervals.IntervalStatistics; @RunWith(AndroidJUnit4.class) @@ -66,7 +66,7 @@ public class VoiceAnnouncementUtilsTest { @Test public void getAnnouncement_metric_speed() { - TrackStatistics stats = new TrackStatistics(); + SegmentStatisticUpdater stats = new SegmentStatisticUpdater(); stats.setStartTime(Instant.EPOCH); stats.setTotalDistance(Distance.of(20000)); stats.setTotalTime(Duration.ofHours(2).plusMinutes(5).plusSeconds(10)); @@ -89,7 +89,7 @@ public class VoiceAnnouncementUtilsTest { @Test public void getAnnouncement_metric_speed_rounding_check() { - TrackStatistics stats = new TrackStatistics(); + SegmentStatisticUpdater stats = new SegmentStatisticUpdater(); stats.setStartTime(Instant.EPOCH); stats.setTotalDistance(Distance.of(20000)); stats.setTotalTime(Duration.ofHours(1).plusMinutes(5).plusSeconds(10)); @@ -112,7 +112,7 @@ public class VoiceAnnouncementUtilsTest { @Test public void getAnnouncement_metric_distance_rounding_check() { - TrackStatistics stats = new TrackStatistics(); + SegmentStatisticUpdater stats = new SegmentStatisticUpdater(); stats.setStartTime(Instant.EPOCH); stats.setTotalDistance(Distance.of(19999)); stats.setTotalTime(Duration.ofHours(1).plusMinutes(5).plusSeconds(10)); @@ -135,7 +135,7 @@ public class VoiceAnnouncementUtilsTest { @Test public void getAnnouncement_metric_distance_rounding_check_two() { - TrackStatistics stats = new TrackStatistics(); + SegmentStatisticUpdater stats = new SegmentStatisticUpdater(); stats.setStartTime(Instant.EPOCH); stats.setTotalDistance(Distance.of(19900)); stats.setTotalTime(Duration.ofHours(1).plusMinutes(5).plusSeconds(10)); @@ -160,9 +160,9 @@ public class VoiceAnnouncementUtilsTest { public void getAnnouncement_withInterval_metric_speed() { // given int numberOfPoints = 1000; - Pair trackWithStats = TestDataUtil.buildTrackWithTrackPoints(contentProviderUtils, numberOfPoints); + Pair trackWithStats = TestDataUtil.buildTrackWithTrackPoints(contentProviderUtils, numberOfPoints); Track.Id trackId = trackWithStats.first; - TrackStatistics stats = trackWithStats.second; + SegmentStatisticUpdater stats = trackWithStats.second; IntervalStatistics.Interval lastInterval; try (TrackPointIterator trackPointIterator = contentProviderUtils.getTrackPointLocationIterator(trackId, null)) { assertEquals(numberOfPoints, trackPointIterator.getCount()); @@ -186,7 +186,7 @@ public class VoiceAnnouncementUtilsTest { @Test public void getAnnouncement_metric_pace() { - TrackStatistics stats = new TrackStatistics(); + SegmentStatisticUpdater stats = new SegmentStatisticUpdater(); stats.setStartTime(Instant.EPOCH); stats.setTotalDistance(Distance.of(20000)); stats.setTotalTime(Duration.ofHours(2).plusMinutes(5).plusSeconds(10)); @@ -211,9 +211,9 @@ public class VoiceAnnouncementUtilsTest { public void getAnnouncement_withInterval_metric_pace() { // given int numberOfPoints = 1000; - Pair trackWithStats = TestDataUtil.buildTrackWithTrackPoints(contentProviderUtils, numberOfPoints); + Pair trackWithStats = TestDataUtil.buildTrackWithTrackPoints(contentProviderUtils, numberOfPoints); Track.Id trackId = trackWithStats.first; - TrackStatistics stats = trackWithStats.second; + SegmentStatisticUpdater stats = trackWithStats.second; IntervalStatistics.Interval lastInterval; try (TrackPointIterator trackPointIterator = contentProviderUtils.getTrackPointLocationIterator(trackId, null)) { assertEquals(numberOfPoints, trackPointIterator.getCount()); @@ -237,7 +237,7 @@ public class VoiceAnnouncementUtilsTest { @Test public void getAnnouncement_imperial_speed() { - TrackStatistics stats = new TrackStatistics(); + SegmentStatisticUpdater stats = new SegmentStatisticUpdater(); stats.setStartTime(Instant.EPOCH); stats.setTotalDistance(Distance.of(20000)); stats.setTotalTime(Duration.ofHours(2).plusMinutes(5).plusSeconds(10)); @@ -260,7 +260,7 @@ public class VoiceAnnouncementUtilsTest { @Test public void getAnnouncement_imperial_speed_1() { - TrackStatistics stats = new TrackStatistics(); + SegmentStatisticUpdater stats = new SegmentStatisticUpdater(); stats.setStartTime(Instant.EPOCH); stats.setTotalDistance(Distance.ofMile(1.1)); stats.setTotalTime(Duration.ofHours(2).plusMinutes(5).plusSeconds(10)); @@ -281,7 +281,7 @@ public class VoiceAnnouncementUtilsTest { @Test public void getAnnouncement_imperial_meter_speed_1() { - TrackStatistics stats = new TrackStatistics(); + SegmentStatisticUpdater stats = new SegmentStatisticUpdater(); stats.setStartTime(Instant.EPOCH); stats.setTotalDistance(Distance.ofMile(1.1)); stats.setTotalTime(Duration.ofHours(2).plusMinutes(5).plusSeconds(10)); @@ -302,7 +302,7 @@ public class VoiceAnnouncementUtilsTest { @Test public void getAnnouncement_metric_speed_1() { - TrackStatistics stats = new TrackStatistics(); + SegmentStatisticUpdater stats = new SegmentStatisticUpdater(); stats.setStartTime(Instant.EPOCH); stats.setTotalDistance(Distance.ofKilometer(1.1)); stats.setTotalTime(Duration.ofHours(2).plusMinutes(5).plusSeconds(10)); @@ -325,9 +325,9 @@ public class VoiceAnnouncementUtilsTest { public void getAnnouncement_withInterval_imperial_speed() { // given int numberOfPoints = 1000; - Pair trackWithStats = TestDataUtil.buildTrackWithTrackPoints(contentProviderUtils, numberOfPoints); + Pair trackWithStats = TestDataUtil.buildTrackWithTrackPoints(contentProviderUtils, numberOfPoints); Track.Id trackId = trackWithStats.first; - TrackStatistics stats = trackWithStats.second; + SegmentStatisticUpdater stats = trackWithStats.second; IntervalStatistics.Interval lastInterval; try (TrackPointIterator trackPointIterator = contentProviderUtils.getTrackPointLocationIterator(trackId, null)) { assertEquals(numberOfPoints, trackPointIterator.getCount()); @@ -351,7 +351,7 @@ public class VoiceAnnouncementUtilsTest { @Test public void getAnnouncement_imperial_pace() { - TrackStatistics stats = new TrackStatistics(); + SegmentStatisticUpdater stats = new SegmentStatisticUpdater(); stats.setStartTime(Instant.EPOCH); stats.setTotalDistance(Distance.of(20000)); stats.setTotalTime(Duration.ofHours(2).plusMinutes(5).plusSeconds(10)); @@ -376,9 +376,9 @@ public class VoiceAnnouncementUtilsTest { public void getAnnouncement_withInterval_imperial_pace() { // given int numberOfPoints = 1000; - Pair trackWithStats = TestDataUtil.buildTrackWithTrackPoints(contentProviderUtils, numberOfPoints); + Pair trackWithStats = TestDataUtil.buildTrackWithTrackPoints(contentProviderUtils, numberOfPoints); Track.Id trackId = trackWithStats.first; - TrackStatistics stats = trackWithStats.second; + SegmentStatisticUpdater stats = trackWithStats.second; IntervalStatistics.Interval lastInterval; try (TrackPointIterator trackPointIterator = contentProviderUtils.getTrackPointLocationIterator(trackId, null)) { assertEquals(numberOfPoints, trackPointIterator.getCount()); @@ -406,9 +406,9 @@ public class VoiceAnnouncementUtilsTest { PreferencesUtils.setVoiceAnnounceLapHeartRate(true); int numberOfPoints = 1000; - Pair trackWithStats = TestDataUtil.buildTrackWithTrackPoints(contentProviderUtils, numberOfPoints); + Pair trackWithStats = TestDataUtil.buildTrackWithTrackPoints(contentProviderUtils, numberOfPoints); Track.Id trackId = trackWithStats.first; - TrackStatistics stats = trackWithStats.second; + SegmentStatisticUpdater stats = trackWithStats.second; IntervalStatistics.Interval lastInterval; try (TrackPointIterator trackPointIterator = contentProviderUtils.getTrackPointLocationIterator(trackId, null)) { assertEquals(numberOfPoints, trackPointIterator.getCount()); @@ -444,9 +444,9 @@ public class VoiceAnnouncementUtilsTest { PreferencesUtils.setVoiceAnnounceLapSpeedPace(false); int numberOfPoints = 1000; - Pair trackWithStats = TestDataUtil.buildTrackWithTrackPoints(contentProviderUtils, numberOfPoints); + Pair trackWithStats = TestDataUtil.buildTrackWithTrackPoints(contentProviderUtils, numberOfPoints); Track.Id trackId = trackWithStats.first; - TrackStatistics stats = trackWithStats.second; + SegmentStatisticUpdater stats = trackWithStats.second; IntervalStatistics.Interval lastInterval; try (TrackPointIterator trackPointIterator = contentProviderUtils.getTrackPointLocationIterator(trackId, null)) { assertEquals(numberOfPoints, trackPointIterator.getCount()); diff --git a/src/androidTest/java/de/dennisguse/opentracks/share/TrackShareSummaryGeneratorTest.java b/src/androidTest/java/de/dennisguse/opentracks/share/TrackShareSummaryGeneratorTest.java index 319a82e54..df92ea7ad 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/share/TrackShareSummaryGeneratorTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/share/TrackShareSummaryGeneratorTest.java @@ -39,7 +39,7 @@ import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.data.models.Distance; import de.dennisguse.opentracks.data.models.Speed; import de.dennisguse.opentracks.data.models.Track; -import de.dennisguse.opentracks.stats.TrackStatistics; +import de.dennisguse.opentracks.stats.SegmentStatisticUpdater; import de.dennisguse.opentracks.util.StringUtils; /** @@ -66,7 +66,7 @@ public class TrackShareSummaryGeneratorTest { @Test public void testGenerateTrackDescription() { Track track = new Track(); - TrackStatistics stats = new TrackStatistics(); + SegmentStatisticUpdater stats = new SegmentStatisticUpdater(); stats.setTotalDistance(Distance.of(20000)); stats.setTotalTime(Duration.ofMillis(600000)); stats.setMovingTime(Duration.ofMillis(300000)); diff --git a/src/androidTest/java/de/dennisguse/opentracks/stats/TrackStatisticsTest.java b/src/androidTest/java/de/dennisguse/opentracks/stats/TrackStatisticsTest.java index ba7df79e7..fc7708caa 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/stats/TrackStatisticsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/stats/TrackStatisticsTest.java @@ -32,7 +32,7 @@ import de.dennisguse.opentracks.data.models.HeartRate; import de.dennisguse.opentracks.data.models.Speed; /** - * Tests for {@link TrackStatistics}. + * Tests for {@link SegmentStatisticUpdater}. * This only tests non-trivial pieces of that class. * * @author Rodrigo Damazio @@ -40,17 +40,17 @@ import de.dennisguse.opentracks.data.models.Speed; @RunWith(AndroidJUnit4.class) public class TrackStatisticsTest { - private TrackStatistics statistics; + private SegmentStatisticUpdater statistics; @Before public void setUp() { - statistics = new TrackStatistics(); + statistics = new SegmentStatisticUpdater(); } @Test public void testMerge_no_data() { // given - TrackStatistics statistics2 = new TrackStatistics(); + SegmentStatisticUpdater statistics2 = new SegmentStatisticUpdater(); // when statistics.merge(statistics2); @@ -74,7 +74,7 @@ public class TrackStatisticsTest { @Test public void testMerge() { // given - TrackStatistics statistics2 = new TrackStatistics(); + SegmentStatisticUpdater statistics2 = new SegmentStatisticUpdater(); statistics.setStartTime(Instant.ofEpochMilli(1000)); // Resulting start time statistics.setStopTime(Instant.ofEpochMilli(2500)); statistics2.setStartTime(Instant.ofEpochMilli(3000)); diff --git a/src/androidTest/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdaterTest.java b/src/androidTest/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdaterTest.java index 02b3885da..a28b48337 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdaterTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdaterTest.java @@ -31,7 +31,7 @@ public class TrackStatisticsUpdaterTest { TrackStatisticsUpdater subject = new TrackStatisticsUpdater(); // then - TrackStatistics statistics = subject.getTrackStatistics(); + SegmentStatisticUpdater statistics = subject.getTrackStatistics(); assertNull(statistics.getStartTime()); assertNull(statistics.getStopTime()); assertEquals(Duration.ZERO, statistics.getTotalTime()); @@ -58,7 +58,7 @@ public class TrackStatisticsUpdaterTest { subject.addTrackPoint(tp); // then - TrackStatistics statistics = subject.getTrackStatistics(); + SegmentStatisticUpdater statistics = subject.getTrackStatistics(); assertEquals(startTime, statistics.getStartTime()); assertEquals(startTime, statistics.getStopTime()); assertEquals(Duration.ZERO, statistics.getTotalTime()); @@ -83,7 +83,7 @@ public class TrackStatisticsUpdaterTest { data.trackPoints().forEach(subject::addTrackPoint); // then - TrackStatistics statistics = subject.getTrackStatistics(); + SegmentStatisticUpdater statistics = subject.getTrackStatistics(); assertEquals(142.26, statistics.getTotalDistance().toM(), 0.01); assertEquals(Duration.ofSeconds(12), statistics.getTotalTime()); assertEquals(Duration.ofSeconds(12), statistics.getMovingTime()); diff --git a/src/androidTest/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsTest.java b/src/androidTest/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsTest.java index f6bbdee6c..463d7cc3c 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsTest.java @@ -20,7 +20,7 @@ import de.dennisguse.opentracks.data.models.ActivityType; import de.dennisguse.opentracks.data.models.Distance; import de.dennisguse.opentracks.data.models.Speed; import de.dennisguse.opentracks.data.models.Track; -import de.dennisguse.opentracks.stats.TrackStatistics; +import de.dennisguse.opentracks.stats.SegmentStatisticUpdater; @RunWith(JUnit4.class) public class AggregatedStatisticsTest { @@ -28,7 +28,7 @@ public class AggregatedStatisticsTest { private final Context context = ApplicationProvider.getApplicationContext(); private static Track createTrack(Context context, Distance totalDistance, Duration totalTime, String activityTypeLocalized) { - TrackStatistics statistics = new TrackStatistics(); + SegmentStatisticUpdater statistics = new SegmentStatisticUpdater(); statistics.setStartTime(Instant.ofEpochMilli(1000L)); // Resulting start time statistics.setStopTime(statistics.getStartTime().plus(totalTime)); statistics.setTotalTime(totalTime); @@ -63,7 +63,7 @@ public class AggregatedStatisticsTest { assertNotNull(aggregatedStatistics.get(biking)); assertEquals(1, aggregatedStatistics.get(biking).getCountTracks()); - TrackStatistics statistics2 = aggregatedStatistics.get(biking).getTrackStatistics(); + SegmentStatisticUpdater statistics2 = aggregatedStatistics.get(biking).getTrackStatistics(); assertEquals(totalDistance, statistics2.getTotalDistance()); assertEquals(totalTime, statistics2.getMovingTime()); } @@ -117,7 +117,7 @@ public class AggregatedStatisticsTest { assertNotNull(aggregatedStatistics.get(biking)); assertEquals(2, aggregatedStatistics.get(biking).getCountTracks()); - TrackStatistics statistics2 = aggregatedStatistics.get(biking).getTrackStatistics(); + SegmentStatisticUpdater statistics2 = aggregatedStatistics.get(biking).getTrackStatistics(); assertEquals(totalDistance.multipliedBy(2), statistics2.getTotalDistance()); assertEquals(totalTime.multipliedBy(2), statistics2.getMovingTime()); } @@ -151,19 +151,19 @@ public class AggregatedStatisticsTest { assertEquals(1, aggregatedStatistics.get(walking).getCountTracks()); { - TrackStatistics statistics2 = aggregatedStatistics.get(biking).getTrackStatistics(); + SegmentStatisticUpdater statistics2 = aggregatedStatistics.get(biking).getTrackStatistics(); assertEquals(totalDistance, statistics2.getTotalDistance()); assertEquals(totalTime, statistics2.getMovingTime()); } { - TrackStatistics statistics2 = aggregatedStatistics.get(running).getTrackStatistics(); + SegmentStatisticUpdater statistics2 = aggregatedStatistics.get(running).getTrackStatistics(); assertEquals(totalDistance, statistics2.getTotalDistance()); assertEquals(totalTime, statistics2.getMovingTime()); } { - TrackStatistics statistics2 = aggregatedStatistics.get(walking).getTrackStatistics(); + SegmentStatisticUpdater statistics2 = aggregatedStatistics.get(walking).getTrackStatistics(); assertEquals(totalDistance, statistics2.getTotalDistance()); assertEquals(totalTime, statistics2.getMovingTime()); } @@ -214,28 +214,28 @@ public class AggregatedStatisticsTest { // Biking. { - TrackStatistics statistics2 = aggregatedStatistics.get(biking).getTrackStatistics(); + SegmentStatisticUpdater statistics2 = aggregatedStatistics.get(biking).getTrackStatistics(); assertEquals(totalDistance.multipliedBy(5), statistics2.getTotalDistance()); assertEquals(totalTime.multipliedBy(5), statistics2.getMovingTime()); } // Running. { - TrackStatistics statistics2 = aggregatedStatistics.get(running).getTrackStatistics(); + SegmentStatisticUpdater statistics2 = aggregatedStatistics.get(running).getTrackStatistics(); assertEquals(totalDistance.multipliedBy(2), statistics2.getTotalDistance()); assertEquals(totalTime.multipliedBy(2), statistics2.getMovingTime()); } // Walking. { - TrackStatistics statistics2 = aggregatedStatistics.get(walking).getTrackStatistics(); + SegmentStatisticUpdater statistics2 = aggregatedStatistics.get(walking).getTrackStatistics(); assertEquals(totalDistance.multipliedBy(2), statistics2.getTotalDistance()); assertEquals(totalTime.multipliedBy(2), statistics2.getMovingTime()); } // Driving. { - TrackStatistics statistics2 = aggregatedStatistics.get(driving).getTrackStatistics(); + SegmentStatisticUpdater statistics2 = aggregatedStatistics.get(driving).getTrackStatistics(); assertEquals(totalDistance, statistics2.getTotalDistance()); assertEquals(totalTime, statistics2.getMovingTime()); } diff --git a/src/androidTest/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsTest.java b/src/androidTest/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsTest.java index 58b29f422..5a263c61c 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsTest.java @@ -21,7 +21,7 @@ import de.dennisguse.opentracks.data.TrackPointIterator; import de.dennisguse.opentracks.data.models.Distance; import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.data.models.TrackPoint; -import de.dennisguse.opentracks.stats.TrackStatistics; +import de.dennisguse.opentracks.stats.SegmentStatisticUpdater; import de.dennisguse.opentracks.stats.TrackStatisticsUpdater; @RunWith(JUnit4.class) @@ -37,7 +37,7 @@ public class IntervalStatisticsTest { contentProviderUtils = new ContentProviderUtils(context); } - private TrackStatistics buildTrackStatistics(List trackPoints) { + private SegmentStatisticUpdater buildTrackStatistics(List trackPoints) { TrackStatisticsUpdater trackStatisticsUpdater = new TrackStatisticsUpdater(); for (TrackPoint tp : trackPoints) { trackStatisticsUpdater.addTrackPoint(tp); @@ -135,22 +135,22 @@ public class IntervalStatisticsTest { } dummyTrack.setTrackStatistics(trackStatisticsUpdater.getTrackStatistics()); contentProviderUtils.updateTrack(dummyTrack); - Pair trackWithStats = new Pair<>(dummyTrack.getId(), trackStatisticsUpdater.getTrackStatistics()); + Pair trackWithStats = new Pair<>(dummyTrack.getId(), trackStatisticsUpdater.getTrackStatistics()); // when and then whenAndThen(trackWithStats, numberOfPoints, distanceInterval); } private void whenAndThen(int numberOfPoints, float distanceInterval) { - Pair trackWithStats = TestDataUtil.buildTrackWithTrackPoints(contentProviderUtils, numberOfPoints); + Pair trackWithStats = TestDataUtil.buildTrackWithTrackPoints(contentProviderUtils, numberOfPoints); whenAndThen(trackWithStats, numberOfPoints, distanceInterval); } - private void whenAndThen(Pair trackWithStats, int numberOfPoints, float distanceInterval) { + private void whenAndThen(Pair trackWithStats, int numberOfPoints, float distanceInterval) { IntervalStatistics intervalStatistics = new IntervalStatistics(Distance.of(distanceInterval)); Track.Id trackId = trackWithStats.first; - TrackStatistics trackStatistics = trackWithStats.second; + SegmentStatisticUpdater trackStatistics = trackWithStats.second; try (TrackPointIterator trackPointIterator = contentProviderUtils.getTrackPointLocationIterator(trackId, null)) { assertEquals(trackPointIterator.getCount(), numberOfPoints); intervalStatistics.addTrackPoints(trackPointIterator); diff --git a/src/main/java/de/dennisguse/opentracks/chart/ChartFragment.java b/src/main/java/de/dennisguse/opentracks/chart/ChartFragment.java index 11a735734..c1b9714a3 100644 --- a/src/main/java/de/dennisguse/opentracks/chart/ChartFragment.java +++ b/src/main/java/de/dennisguse/opentracks/chart/ChartFragment.java @@ -38,12 +38,12 @@ import de.dennisguse.opentracks.data.models.TrackPoint; import de.dennisguse.opentracks.databinding.ChartBinding; import de.dennisguse.opentracks.settings.PreferencesUtils; import de.dennisguse.opentracks.settings.UnitSystem; -import de.dennisguse.opentracks.stats.TrackStatistics; +import de.dennisguse.opentracks.stats.SegmentStatisticUpdater; import de.dennisguse.opentracks.stats.TrackStatisticsUpdater; /** * A fragment to display track chart to the user. - * ChartFragment uses a {@link TrackStatisticsUpdater} internally and recomputes the {@link TrackStatistics} from the beginning. + * ChartFragment uses a {@link TrackStatisticsUpdater} internally and recomputes the {@link SegmentStatisticUpdater} from the beginning. * * @author Sandor Dornbush * @author Rodrigo Damazio @@ -202,7 +202,7 @@ public class ChartFragment extends Fragment implements TrackDataHub.Listener { } } - public void onSampledInTrackPoint(@NonNull TrackPoint trackPoint, @NonNull TrackStatistics trackStatistics) { + public void onSampledInTrackPoint(@NonNull TrackPoint trackPoint, @NonNull SegmentStatisticUpdater trackStatistics) { if (isResumed()) { ChartPoint point = ChartPoint.create(trackStatistics, trackPoint, trackPoint.getSpeed(), chartByDistance, viewBinding.chartView.getUnitSystem()); pendingPoints.add(point); diff --git a/src/main/java/de/dennisguse/opentracks/chart/ChartPoint.java b/src/main/java/de/dennisguse/opentracks/chart/ChartPoint.java index 9ceb9003e..c90cb628c 100644 --- a/src/main/java/de/dennisguse/opentracks/chart/ChartPoint.java +++ b/src/main/java/de/dennisguse/opentracks/chart/ChartPoint.java @@ -6,7 +6,7 @@ import de.dennisguse.opentracks.data.models.Distance; import de.dennisguse.opentracks.data.models.Speed; import de.dennisguse.opentracks.data.models.TrackPoint; import de.dennisguse.opentracks.settings.UnitSystem; -import de.dennisguse.opentracks.stats.TrackStatistics; +import de.dennisguse.opentracks.stats.SegmentStatisticUpdater; public record ChartPoint( //X-axis @@ -22,7 +22,7 @@ public record ChartPoint( ) { - public static ChartPoint create(@NonNull TrackStatistics trackStatistics, @NonNull TrackPoint trackPoint, Speed smoothedSpeed, boolean chartByDistance, UnitSystem unitSystem) { + public static ChartPoint create(@NonNull SegmentStatisticUpdater trackStatistics, @NonNull TrackPoint trackPoint, Speed smoothedSpeed, boolean chartByDistance, UnitSystem unitSystem) { return new ChartPoint( chartByDistance ? trackStatistics.getTotalDistance().toKM_Miles(unitSystem) diff --git a/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java b/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java index bb1f1bc6f..7f99680ec 100644 --- a/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java +++ b/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java @@ -54,7 +54,7 @@ import de.dennisguse.opentracks.data.tables.MarkerColumns; import de.dennisguse.opentracks.data.tables.TrackPointsColumns; import de.dennisguse.opentracks.data.tables.TracksColumns; import de.dennisguse.opentracks.stats.SensorStatistics; -import de.dennisguse.opentracks.stats.TrackStatistics; +import de.dennisguse.opentracks.stats.SegmentStatisticUpdater; import de.dennisguse.opentracks.ui.markers.MarkerUtils; import de.dennisguse.opentracks.util.FileUtils; @@ -116,7 +116,7 @@ public class ContentProviderUtils { int altitudeLossIndex = cursor.getColumnIndexOrThrow(TracksColumns.ALTITUDE_LOSS); Track track = new Track(ZoneOffset.ofTotalSeconds(cursor.getInt(startTimeOffsetIndex))); - TrackStatistics trackStatistics = track.getTrackStatistics(); + SegmentStatisticUpdater trackStatistics = track.getTrackStatistics(); if (!cursor.isNull(idIndex)) { track.setId(new Track.Id(cursor.getLong(idIndex))); } @@ -314,7 +314,7 @@ public class ContentProviderUtils { private ContentValues createContentValues(Track track) { ContentValues values = new ContentValues(); - TrackStatistics trackStatistics = track.getTrackStatistics(); + SegmentStatisticUpdater trackStatistics = track.getTrackStatistics(); if (track.getId() != null) { values.put(TracksColumns._ID, track.getId().id()); @@ -345,11 +345,11 @@ public class ContentProviderUtils { return values; } - public void updateTrackStatistics(@NonNull Track.Id trackId, @NonNull TrackStatistics trackStatistics) { + public void updateTrackStatistics(@NonNull Track.Id trackId, @NonNull SegmentStatisticUpdater trackStatistics) { contentResolver.update(TracksColumns.CONTENT_URI, createContentValues(trackStatistics), TracksColumns._ID + "=?", new String[]{Long.toString(trackId.id())}); } - private ContentValues createContentValues(TrackStatistics trackStatistics) { + private ContentValues createContentValues(SegmentStatisticUpdater trackStatistics) { ContentValues values = new ContentValues(); if (trackStatistics.getStartTime() != null) { values.put(TracksColumns.STARTTIME, trackStatistics.getStartTime().toEpochMilli()); diff --git a/src/main/java/de/dennisguse/opentracks/data/TrackDataHub.java b/src/main/java/de/dennisguse/opentracks/data/TrackDataHub.java index 3216e8512..0cf59b9be 100644 --- a/src/main/java/de/dennisguse/opentracks/data/TrackDataHub.java +++ b/src/main/java/de/dennisguse/opentracks/data/TrackDataHub.java @@ -40,7 +40,7 @@ import de.dennisguse.opentracks.data.tables.TracksColumns; import de.dennisguse.opentracks.services.RecordingStatus; import de.dennisguse.opentracks.services.TrackRecordingService; import de.dennisguse.opentracks.services.handlers.AltitudeCorrectionManager; -import de.dennisguse.opentracks.stats.TrackStatistics; +import de.dennisguse.opentracks.stats.SegmentStatisticUpdater; import de.dennisguse.opentracks.stats.TrackStatisticsUpdater; /** @@ -428,7 +428,7 @@ public class TrackDataHub { * * @param trackPoint the trackPoint */ - default void onSampledInTrackPoint(@NonNull TrackPoint trackPoint, @NonNull TrackStatistics trackStatistics) { + default void onSampledInTrackPoint(@NonNull TrackPoint trackPoint, @NonNull SegmentStatisticUpdater trackStatistics) { } /** @@ -436,7 +436,7 @@ public class TrackDataHub { * * @param trackPoint the trackPoint */ - default void onSampledOutTrackPoint(@NonNull TrackPoint trackPoint, @NonNull TrackStatistics trackStatistics) { + default void onSampledOutTrackPoint(@NonNull TrackPoint trackPoint, @NonNull SegmentStatisticUpdater trackStatistics) { } /** diff --git a/src/main/java/de/dennisguse/opentracks/data/models/Track.java b/src/main/java/de/dennisguse/opentracks/data/models/Track.java index e0a2347c6..5b9138659 100644 --- a/src/main/java/de/dennisguse/opentracks/data/models/Track.java +++ b/src/main/java/de/dennisguse/opentracks/data/models/Track.java @@ -29,7 +29,7 @@ import java.time.ZoneOffset; import java.util.Objects; import java.util.UUID; -import de.dennisguse.opentracks.stats.TrackStatistics; +import de.dennisguse.opentracks.stats.SegmentStatisticUpdater; /** * A track. @@ -51,7 +51,7 @@ public class Track { private ZoneOffset zoneOffset; - private TrackStatistics trackStatistics = new TrackStatistics(); + private SegmentStatisticUpdater trackStatistics = new SegmentStatisticUpdater(); @VisibleForTesting public Track() { @@ -138,11 +138,11 @@ public class Track { } @NonNull - public TrackStatistics getTrackStatistics() { + public SegmentStatisticUpdater getTrackStatistics() { return trackStatistics; } - public void setTrackStatistics(@NonNull TrackStatistics trackStatistics) { + public void setTrackStatistics(@NonNull SegmentStatisticUpdater trackStatistics) { this.trackStatistics = trackStatistics; } diff --git a/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordedFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordedFragment.java index bff91e239..96fe90427 100644 --- a/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordedFragment.java +++ b/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordedFragment.java @@ -39,7 +39,7 @@ import de.dennisguse.opentracks.databinding.StatisticsRecordedBinding; import de.dennisguse.opentracks.settings.PreferencesUtils; import de.dennisguse.opentracks.settings.UnitSystem; import de.dennisguse.opentracks.stats.SensorStatistics; -import de.dennisguse.opentracks.stats.TrackStatistics; +import de.dennisguse.opentracks.stats.SegmentStatisticUpdater; import de.dennisguse.opentracks.util.StringUtils; /** @@ -171,7 +171,7 @@ public class StatisticsRecordedFragment extends Fragment { } private void updateUI() { - TrackStatistics trackStatistics = track.getTrackStatistics(); + SegmentStatisticUpdater trackStatistics = track.getTrackStatistics(); // Set total distance { Pair parts = DistanceFormatter.Builder() 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 aa7de9a02..e95c4dbdc 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 @@ -39,7 +39,7 @@ import de.dennisguse.opentracks.data.models.Marker; import de.dennisguse.opentracks.data.models.Position; import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.data.models.TrackPoint; -import de.dennisguse.opentracks.stats.TrackStatistics; +import de.dennisguse.opentracks.stats.SegmentStatisticUpdater; import de.dennisguse.opentracks.util.StringUtils; /** @@ -279,7 +279,7 @@ public class GPXTrackExporter implements TrackExporter { printWriter.println("" + StringUtils.formatCData(track.getActivityTypeLocalized()) + ""); } - TrackStatistics trackStatistics = track.getTrackStatistics(); + SegmentStatisticUpdater trackStatistics = track.getTrackStatistics(); printWriter.println(""); printWriter.println("" + trackStatistics.getTotalDistance().toM() + ""); printWriter.println("" + trackStatistics.getTotalTime().getSeconds() + ""); diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/GPXTrackImporter.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/GPXTrackImporter.java index 452231dfe..e7e258667 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/importer/GPXTrackImporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/GPXTrackImporter.java @@ -38,6 +38,7 @@ import de.dennisguse.opentracks.data.models.Position; import de.dennisguse.opentracks.data.models.Speed; import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.data.models.TrackPoint; +import de.dennisguse.opentracks.stats.SegmentStatisticUpdater; import de.dennisguse.opentracks.util.StringUtils; /** @@ -48,7 +49,7 @@ import de.dennisguse.opentracks.util.StringUtils; *

* {@link de.dennisguse.opentracks.io.file.exporter.GPXTrackExporter} does not export information if a segment was started automatic or manually. * Therefore, all segments starts are marked as SEGMENT_START_AUTOMATIC. - * Thus, the {@link de.dennisguse.opentracks.stats.TrackStatistics} cannot be restored correctly. + * Thus, the {@link SegmentStatisticUpdater} cannot be restored correctly. * * @author Jimmy Shih */ diff --git a/src/main/java/de/dennisguse/opentracks/services/RecordingData.java b/src/main/java/de/dennisguse/opentracks/services/RecordingData.java index 92d9734a3..04fd36150 100644 --- a/src/main/java/de/dennisguse/opentracks/services/RecordingData.java +++ b/src/main/java/de/dennisguse/opentracks/services/RecordingData.java @@ -5,12 +5,12 @@ import androidx.annotation.NonNull; import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.data.models.TrackPoint; import de.dennisguse.opentracks.sensors.sensorData.SensorDataSet; -import de.dennisguse.opentracks.stats.TrackStatistics; +import de.dennisguse.opentracks.stats.SegmentStatisticUpdater; /** * {@link Track} and {@link TrackPoint} must be immutable (i.e., their content does not change). */ -public record RecordingData(Track track, TrackPoint latestTrackPoint, SensorDataSet sensorDataSet, TrackStatistics currentSegment) { +public record RecordingData(Track track, TrackPoint latestTrackPoint, SensorDataSet sensorDataSet, SegmentStatisticUpdater currentSegment) { public String getTrackCategory() { if (track == null) { return ""; @@ -19,18 +19,18 @@ public record RecordingData(Track track, TrackPoint latestTrackPoint, SensorData } @NonNull - public TrackStatistics getStatisticsTrack() { + public SegmentStatisticUpdater getStatisticsTrack() { if (track == null) { - return new TrackStatistics(); + return new SegmentStatisticUpdater(); } return track.getTrackStatistics(); } @NonNull - public TrackStatistics getStatisticsCurrentSegment() { + public SegmentStatisticUpdater getStatisticsCurrentSegment() { if (currentSegment == null) { - return new TrackStatistics(); + return new SegmentStatisticUpdater(); } return currentSegment; diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java index a30bb330a..663a16596 100644 --- a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java +++ b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java @@ -23,7 +23,7 @@ import de.dennisguse.opentracks.sensors.sensorData.SensorDataSet; import de.dennisguse.opentracks.services.handlers.AltitudeCorrectionManager; import de.dennisguse.opentracks.services.handlers.TrackPointCreator; import de.dennisguse.opentracks.settings.PreferencesUtils; -import de.dennisguse.opentracks.stats.TrackStatistics; +import de.dennisguse.opentracks.stats.SegmentStatisticUpdater; import de.dennisguse.opentracks.stats.TrackStatisticsUpdater; import de.dennisguse.opentracks.util.TrackNameUtils; @@ -131,7 +131,7 @@ public class TrackRecordingManager implements SharedPreferences.OnSharedPreferen } track.setTrackStatistics(tmpTrackStatisticsUpdater.getTrackStatistics()); - TrackStatistics currentSegment = tmpTrackStatisticsUpdater.getCurrentSegment(); + SegmentStatisticUpdater currentSegment = tmpTrackStatisticsUpdater.getCurrentSegment(); return new RecordingData(track, current.first, current.second, currentSegment); } @@ -225,7 +225,7 @@ public class TrackRecordingManager implements SharedPreferences.OnSharedPreferen handler.postDelayed(ON_IDLE, idleDuration.toMillis()); } - TrackStatistics getTrackStatistics() { + SegmentStatisticUpdater getTrackStatistics() { return trackStatisticsUpdater == null ? null : trackStatisticsUpdater.getTrackStatistics(); } 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 322a1c611..6a6e363b0 100644 --- a/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementManager.java +++ b/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementManager.java @@ -37,7 +37,7 @@ import de.dennisguse.opentracks.data.models.TrackPoint; import de.dennisguse.opentracks.sensors.sensorData.SensorDataSet; import de.dennisguse.opentracks.settings.PreferencesUtils; import de.dennisguse.opentracks.stats.SensorStatistics; -import de.dennisguse.opentracks.stats.TrackStatistics; +import de.dennisguse.opentracks.stats.SegmentStatisticUpdater; import de.dennisguse.opentracks.ui.intervals.IntervalStatistics; /** @@ -53,7 +53,7 @@ public class VoiceAnnouncementManager implements SharedPreferences.OnSharedPrefe private TTSManager voiceAnnouncement; - private TrackStatistics trackStatistics; + private SegmentStatisticUpdater trackStatistics; private static final Distance DISTANCE_OFF = Distance.of(Double.MAX_VALUE); private Distance distanceFrequency = DISTANCE_OFF; @@ -79,13 +79,13 @@ public class VoiceAnnouncementManager implements SharedPreferences.OnSharedPrefe intervalStatistics = new IntervalStatistics(intervalDistance); } - public void start(@Nullable TrackStatistics trackStatistics) { + public void start(@Nullable SegmentStatisticUpdater trackStatistics) { voiceAnnouncement = new TTSManager(context); voiceAnnouncement.start(); update(trackStatistics); } - void update(@Nullable TrackStatistics trackStatistics) { + void update(@Nullable SegmentStatisticUpdater trackStatistics) { this.trackStatistics = trackStatistics; updateNextDuration(); updateNextTaskDistance(); 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 ab3be8785..03ab3fb5c 100644 --- a/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtils.java +++ b/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtils.java @@ -37,7 +37,7 @@ import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.sensors.sensorData.SensorDataSet; import de.dennisguse.opentracks.settings.UnitSystem; import de.dennisguse.opentracks.stats.SensorStatistics; -import de.dennisguse.opentracks.stats.TrackStatistics; +import de.dennisguse.opentracks.stats.SegmentStatisticUpdater; import de.dennisguse.opentracks.ui.intervals.IntervalStatistics; import de.dennisguse.opentracks.util.StringUtils; @@ -52,7 +52,7 @@ class VoiceAnnouncementUtils { } static Spannable createStatistics(Context context, Track track, SensorDataSet sensorDataSet, UnitSystem unitSystem, boolean isReportSpeed, @Nullable IntervalStatistics.Interval currentInterval, @Nullable SensorStatistics sensorStatistics) { - TrackStatistics trackStatistics = track.getTrackStatistics(); + SegmentStatisticUpdater trackStatistics = track.getTrackStatistics(); SpannableStringBuilder builder = new SpannableStringBuilder(); diff --git a/src/main/java/de/dennisguse/opentracks/share/TrackShareSummaryGenerator.java b/src/main/java/de/dennisguse/opentracks/share/TrackShareSummaryGenerator.java index 1a1039162..071f23fff 100644 --- a/src/main/java/de/dennisguse/opentracks/share/TrackShareSummaryGenerator.java +++ b/src/main/java/de/dennisguse/opentracks/share/TrackShareSummaryGenerator.java @@ -31,7 +31,7 @@ import de.dennisguse.opentracks.data.models.Speed; import de.dennisguse.opentracks.data.models.SpeedFormatter; import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.settings.UnitSystem; -import de.dennisguse.opentracks.stats.TrackStatistics; +import de.dennisguse.opentracks.stats.SegmentStatisticUpdater; import de.dennisguse.opentracks.util.StringUtils; /** @@ -78,7 +78,7 @@ public class TrackShareSummaryGenerator { builder.append(TrackShareSummaryGenerator.TEXT_LINE_BREAK); } - private String generateTrackStatisticsDescription(TrackStatistics stats) { + private String generateTrackStatisticsDescription(SegmentStatisticUpdater stats) { StringBuilder builder = new StringBuilder(); // Total distance diff --git a/src/main/java/de/dennisguse/opentracks/stats/TrackStatistics.java b/src/main/java/de/dennisguse/opentracks/stats/SegmentStatisticUpdater.java similarity index 96% rename from src/main/java/de/dennisguse/opentracks/stats/TrackStatistics.java rename to src/main/java/de/dennisguse/opentracks/stats/SegmentStatisticUpdater.java index 203219d39..5b1d7fc1a 100644 --- a/src/main/java/de/dennisguse/opentracks/stats/TrackStatistics.java +++ b/src/main/java/de/dennisguse/opentracks/stats/SegmentStatisticUpdater.java @@ -39,7 +39,7 @@ import de.dennisguse.opentracks.data.models.TrackPoint; */ //TODO Check that data ranges are valid (not less than zero etc.) //TODO Should be a Java record -public class TrackStatistics { +public class SegmentStatisticUpdater { // The min and max altitude (meters) seen on this track. private final ExtremityMonitor altitudeExtremities = new ExtremityMonitor(); @@ -64,7 +64,7 @@ public class TrackStatistics { private boolean isIdle; - public TrackStatistics() { + public SegmentStatisticUpdater() { reset(); } @@ -73,7 +73,7 @@ public class TrackStatistics { * * @param other another statistics data object to copy from */ - public TrackStatistics(TrackStatistics other) { + public SegmentStatisticUpdater(SegmentStatisticUpdater other) { startTime = other.startTime; stopTime = other.stopTime; totalDistance = other.totalDistance; @@ -89,7 +89,7 @@ public class TrackStatistics { } @VisibleForTesting - public TrackStatistics(String startTime, String stopTime, double totalDistance_m, int totalTime_s, int movingTime_s, float maxSpeed_mps, Float totalAltitudeGain_m, Float totalAltitudeLoss_m) { + public SegmentStatisticUpdater(String startTime, String stopTime, double totalDistance_m, int totalTime_s, int movingTime_s, float maxSpeed_mps, Float totalAltitudeGain_m, Float totalAltitudeLoss_m) { this.startTime = Instant.parse(startTime); this.stopTime = Instant.parse(stopTime); this.totalDistance = Distance.of(totalDistance_m); @@ -107,7 +107,7 @@ public class TrackStatistics { * @param other another statistics data object */ //TODO Should be refactored to append only [mainly due to isIdle] (NOTE: This requires to use a custom value object for AggregatedStatistics; this is anyhow recommended). - public void merge(TrackStatistics other) { + public void merge(SegmentStatisticUpdater other) { if (startTime == null) { startTime = other.startTime; } else { @@ -407,7 +407,7 @@ public class TrackStatistics { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof TrackStatistics)) return false; + if (!(o instanceof SegmentStatisticUpdater)) return false; return toString().equals(o.toString()); } diff --git a/src/main/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdater.java b/src/main/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdater.java index 9e84fbfca..f0558e06d 100644 --- a/src/main/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdater.java +++ b/src/main/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdater.java @@ -29,8 +29,8 @@ import de.dennisguse.opentracks.data.models.TrackPoint; import de.dennisguse.opentracks.settings.PreferencesUtils; /** - * Updater for {@link TrackStatistics}. - * For updating track {@link TrackStatistics} as new {@link TrackPoint}s are added. + * Updater for {@link SegmentStatisticUpdater}. + * For updating track {@link SegmentStatisticUpdater} as new {@link TrackPoint}s are added. * NOTE: Some of the locations represent pause/resume separator. * NOTE: Has still support for segments (at the moment unused). * @@ -41,7 +41,7 @@ public class TrackStatisticsUpdater { private static final String TAG = TrackStatisticsUpdater.class.getSimpleName(); - private final TrackStatistics trackStatistics; + private final SegmentStatisticUpdater segmentStatisticUpdater; private float averageHeartRateBPM; private Duration totalHeartRateDuration = Duration.ZERO; @@ -49,38 +49,38 @@ public class TrackStatisticsUpdater { private Duration totalPowerDuration = Duration.ZERO; // The current segment's statistics - private final TrackStatistics currentSegment; + private final SegmentStatisticUpdater currentSegment; // Current segment's last trackPoint private TrackPoint lastTrackPoint; public TrackStatisticsUpdater() { - this(new TrackStatistics()); + this(new SegmentStatisticUpdater()); } - public TrackStatisticsUpdater(TrackStatistics trackStatistics) { - this.trackStatistics = trackStatistics; - this.currentSegment = new TrackStatistics(); + public TrackStatisticsUpdater(SegmentStatisticUpdater segmentStatisticUpdater) { + this.segmentStatisticUpdater = segmentStatisticUpdater; + this.currentSegment = new SegmentStatisticUpdater(); resetAverageHeartRate(); } public TrackStatisticsUpdater(TrackStatisticsUpdater toCopy) { - this.currentSegment = new TrackStatistics(toCopy.currentSegment); - this.trackStatistics = new TrackStatistics(toCopy.trackStatistics); + this.currentSegment = new SegmentStatisticUpdater(toCopy.currentSegment); + this.segmentStatisticUpdater = new SegmentStatisticUpdater(toCopy.segmentStatisticUpdater); this.lastTrackPoint = toCopy.lastTrackPoint; resetAverageHeartRate(); } - public TrackStatistics getTrackStatistics() { + public SegmentStatisticUpdater getTrackStatistics() { // Take a snapshot - we don't want anyone messing with our trackStatistics - TrackStatistics stats = new TrackStatistics(trackStatistics); + SegmentStatisticUpdater stats = new SegmentStatisticUpdater(segmentStatisticUpdater); stats.merge(currentSegment); return stats; } - public TrackStatistics getCurrentSegment() { + public SegmentStatisticUpdater getCurrentSegment() { // Take a snapshot - we don't want anyone messing with our currentSegment - return new TrackStatistics(currentSegment); + return new SegmentStatisticUpdater(currentSegment); } public void addTrackPoints(List trackPoints) { @@ -182,7 +182,7 @@ public class TrackStatisticsUpdater { private void reset(TrackPoint trackPoint) { if (currentSegment.isInitialized()) { - trackStatistics.merge(currentSegment); + segmentStatisticUpdater.merge(currentSegment); } currentSegment.reset(trackPoint.getTime()); @@ -209,7 +209,7 @@ public class TrackStatisticsUpdater { @Override public String toString() { return "TrackStatisticsUpdater{" + - "trackStatistics=" + trackStatistics + + "trackStatistics=" + segmentStatisticUpdater + '}'; } } diff --git a/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatistics.java b/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatistics.java index 8de17659d..40e8bffcb 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatistics.java +++ b/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatistics.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Map; import de.dennisguse.opentracks.data.models.Track; -import de.dennisguse.opentracks.stats.TrackStatistics; +import de.dennisguse.opentracks.stats.SegmentStatisticUpdater; public class AggregatedStatistics { @@ -55,10 +55,10 @@ public class AggregatedStatistics { public static class AggregatedStatistic { private final String activityTypeLocalized; - private final TrackStatistics trackStatistics; + private final SegmentStatisticUpdater trackStatistics; private int countTracks = 1; - public AggregatedStatistic(String activityTypeLocalized, TrackStatistics trackStatistics) { + public AggregatedStatistic(String activityTypeLocalized, SegmentStatisticUpdater trackStatistics) { this.activityTypeLocalized = activityTypeLocalized; this.trackStatistics = trackStatistics; } @@ -67,7 +67,7 @@ public class AggregatedStatistics { return activityTypeLocalized; } - public TrackStatistics getTrackStatistics() { + public SegmentStatisticUpdater getTrackStatistics() { return trackStatistics; } @@ -75,7 +75,7 @@ public class AggregatedStatistics { return countTracks; } - void add(TrackStatistics statistics) { + void add(SegmentStatisticUpdater statistics) { trackStatistics.merge(statistics); countTracks++; } diff --git a/src/main/java/de/dennisguse/opentracks/ui/customRecordingLayout/SettingsCustomLayoutEditAdapter.java b/src/main/java/de/dennisguse/opentracks/ui/customRecordingLayout/SettingsCustomLayoutEditAdapter.java index 45d19a368..0c8a12fe3 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/customRecordingLayout/SettingsCustomLayoutEditAdapter.java +++ b/src/main/java/de/dennisguse/opentracks/ui/customRecordingLayout/SettingsCustomLayoutEditAdapter.java @@ -27,7 +27,7 @@ import de.dennisguse.opentracks.data.models.TrackPoint; import de.dennisguse.opentracks.databinding.CustomStatsItemBinding; import de.dennisguse.opentracks.services.RecordingData; import de.dennisguse.opentracks.settings.UnitSystem; -import de.dennisguse.opentracks.stats.TrackStatistics; +import de.dennisguse.opentracks.stats.SegmentStatisticUpdater; import de.dennisguse.opentracks.viewmodels.Mapping; import de.dennisguse.opentracks.viewmodels.StatisticViewHolder; @@ -38,7 +38,7 @@ public class SettingsCustomLayoutEditAdapter extends RecyclerView.Adapter