diff --git a/.idea/misc.xml b/.idea/misc.xml index 9b9791cb3..70f2c08ad 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,6 +4,7 @@ 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 bb66cce06..27df7b981 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/content/data/TestDataUtil.java +++ b/src/androidTest/java/de/dennisguse/opentracks/content/data/TestDataUtil.java @@ -182,7 +182,7 @@ public class TestDataUtil { for (int i = 0; i < numberOfPoints; i++) { TrackPoint tp = TestDataUtil.createTrackPoint(i); contentProviderUtils.insertTrackPoint(tp, dummyTrack.getId()); - trackStatisticsUpdater.addTrackPoint(tp, Distance.of(0)); + trackStatisticsUpdater.addTrackPoint(tp); } dummyTrack.setTrackStatistics(trackStatisticsUpdater.getTrackStatistics()); contentProviderUtils.updateTrack(dummyTrack); diff --git a/src/androidTest/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdaterTest.java b/src/androidTest/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdaterTest.java index 9f97530aa..d50b5603c 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdaterTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdaterTest.java @@ -53,7 +53,7 @@ public class TrackStatisticsUpdaterTest { // when TrackStatisticsUpdater subject = new TrackStatisticsUpdater(); - subject.addTrackPoint(tp, GPS_DISTANCE); + subject.addTrackPoint(tp); // then TrackStatistics statistics = subject.getTrackStatistics(); @@ -77,7 +77,7 @@ public class TrackStatisticsUpdaterTest { // when TrackStatisticsUpdater subject = new TrackStatisticsUpdater(); - data.trackPoints.forEach(it -> subject.addTrackPoint(it, GPS_DISTANCE)); + data.trackPoints.forEach(it -> subject.addTrackPoint(it)); // then TrackStatistics statistics = subject.getTrackStatistics(); @@ -105,9 +105,9 @@ public class TrackStatisticsUpdaterTest { TrackPoint tp3 = new TrackPoint(0.00001, 0, Altitude.WGS84.of(5.0), Instant.ofEpochMilli(3000)); // when - subject.addTrackPoint(tp1, GPS_DISTANCE); - subject.addTrackPoint(tp2, GPS_DISTANCE); - subject.addTrackPoint(tp3, GPS_DISTANCE); + subject.addTrackPoint(tp1); + subject.addTrackPoint(tp2); + subject.addTrackPoint(tp3); // then assertEquals(0, subject.getTrackStatistics().getTotalDistance().toM(), 0.01); @@ -124,9 +124,9 @@ public class TrackStatisticsUpdaterTest { tp3.setSpeed(Speed.of(5f)); // when - subject.addTrackPoint(tp1, GPS_DISTANCE); - subject.addTrackPoint(tp2, GPS_DISTANCE); - subject.addTrackPoint(tp3, GPS_DISTANCE); + subject.addTrackPoint(tp1); + subject.addTrackPoint(tp2); + subject.addTrackPoint(tp3); // then assertEquals(1.10, subject.getTrackStatistics().getTotalDistance().toM(), 0.01); @@ -149,16 +149,16 @@ public class TrackStatisticsUpdaterTest { tp5.setSensorDistance(Distance.of(10f)); // when - subject.addTrackPoint(tp1, GPS_DISTANCE); - subject.addTrackPoint(tp2, GPS_DISTANCE); - subject.addTrackPoint(tp3, GPS_DISTANCE); + subject.addTrackPoint(tp1); + subject.addTrackPoint(tp2); + subject.addTrackPoint(tp3); // then assertEquals(110.57, subject.getTrackStatistics().getTotalDistance().toM(), 0.01); // when - subject.addTrackPoint(tp4, GPS_DISTANCE); - subject.addTrackPoint(tp5, GPS_DISTANCE); + subject.addTrackPoint(tp4); + subject.addTrackPoint(tp5); // then assertEquals(125.57, subject.getTrackStatistics().getTotalDistance().toM(), 0.01); @@ -178,16 +178,16 @@ public class TrackStatisticsUpdaterTest { tp5.setSensorDistance(Distance.of(10f)); // when - subject.addTrackPoint(tp1, GPS_DISTANCE); - subject.addTrackPoint(tp2, GPS_DISTANCE); - subject.addTrackPoint(tp3, GPS_DISTANCE); + subject.addTrackPoint(tp1); + subject.addTrackPoint(tp2); + subject.addTrackPoint(tp3); // then assertEquals(0, subject.getTrackStatistics().getTotalDistance().toM(), 0.01); // when - subject.addTrackPoint(tp4, GPS_DISTANCE); - subject.addTrackPoint(tp5, GPS_DISTANCE); + subject.addTrackPoint(tp4); + subject.addTrackPoint(tp5); // then assertEquals(15, subject.getTrackStatistics().getTotalDistance().toM(), 0.01); @@ -209,16 +209,16 @@ public class TrackStatisticsUpdaterTest { TrackPoint tp5 = new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.ofEpochMilli(5000)); // when - subject.addTrackPoint(tp1, GPS_DISTANCE); - subject.addTrackPoint(tp2, GPS_DISTANCE); - subject.addTrackPoint(tp3, GPS_DISTANCE); + subject.addTrackPoint(tp1); + subject.addTrackPoint(tp2); + subject.addTrackPoint(tp3); // then assertEquals(5, subject.getTrackStatistics().getTotalDistance().toM(), 0.01); // when - subject.addTrackPoint(tp4, GPS_DISTANCE); - subject.addTrackPoint(tp5, GPS_DISTANCE); + subject.addTrackPoint(tp4); + subject.addTrackPoint(tp5); // then assertEquals(59.18, subject.getTrackStatistics().getTotalDistance().toM(), 0.01); @@ -258,15 +258,15 @@ public class TrackStatisticsUpdaterTest { tp4.setSpeed(Speed.of(5f)); TrackPoint tp5 = new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.ofEpochMilli(5000)); - subject.addTrackPoint(tp1, GPS_DISTANCE); - subject.addTrackPoint(tp2, GPS_DISTANCE); - subject.addTrackPoint(tp3, GPS_DISTANCE); - subject.addTrackPoint(tp4, GPS_DISTANCE); + subject.addTrackPoint(tp1); + subject.addTrackPoint(tp2); + subject.addTrackPoint(tp3); + subject.addTrackPoint(tp4); // when TrackStatisticsUpdater copy = new TrackStatisticsUpdater(subject); - subject.addTrackPoint(tp5, GPS_DISTANCE); - copy.addTrackPoint(tp5, GPS_DISTANCE); + subject.addTrackPoint(tp5); + copy.addTrackPoint(tp5); // then 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 c1e9e9bc6..0648b7292 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsTest.java @@ -41,7 +41,7 @@ public class IntervalStatisticsTest { private TrackStatistics buildTrackStatistics(List trackPoints) { TrackStatisticsUpdater trackStatisticsUpdater = new TrackStatisticsUpdater(); for (TrackPoint tp : trackPoints) { - trackStatisticsUpdater.addTrackPoint(tp, Distance.of(0)); + trackStatisticsUpdater.addTrackPoint(tp); } return trackStatisticsUpdater.getTrackStatistics(); } @@ -132,7 +132,7 @@ public class IntervalStatisticsTest { TrackPoint tp = TestDataUtil.createTrackPoint(i); tp.setAltitudeLoss(null); contentProviderUtils.insertTrackPoint(tp, dummyTrack.getId()); - trackStatisticsUpdater.addTrackPoint(tp, Distance.of(0)); + trackStatisticsUpdater.addTrackPoint(tp); } dummyTrack.setTrackStatistics(trackStatisticsUpdater.getTrackStatistics()); contentProviderUtils.updateTrack(dummyTrack); diff --git a/src/main/java/de/dennisguse/opentracks/data/TrackDataHub.java b/src/main/java/de/dennisguse/opentracks/data/TrackDataHub.java index 4841de598..cf1ceacab 100644 --- a/src/main/java/de/dennisguse/opentracks/data/TrackDataHub.java +++ b/src/main/java/de/dennisguse/opentracks/data/TrackDataHub.java @@ -364,7 +364,7 @@ public class TrackDataHub { samplingFrequency = 1 + (int) (numTotalPoints / targetNumPoints); } - currentUpdater.addTrackPoint(trackPoint, recordingDistanceInterval); + currentUpdater.addTrackPoint(trackPoint); // Also include the last point if the selected track is not recording. if ((localNumLoadedTrackPoints % samplingFrequency == 0) || (trackPointId == lastTrackPointId && !isSelectedTrackRecording())) { diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/TrackImporter.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/TrackImporter.java index 0916bbf3c..77ebf13eb 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/importer/TrackImporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/TrackImporter.java @@ -149,7 +149,7 @@ public class TrackImporter { adjustTrackPoints(); TrackStatisticsUpdater updater = new TrackStatisticsUpdater(); - updater.addTrackPoints(trackPoints, recordingDistanceInterval); + updater.addTrackPoints(trackPoints); track.setTrackStatistics(updater.getTrackStatistics()); Track.Id trackId = contentProviderUtils.insertTrack(track); @@ -233,7 +233,7 @@ public class TrackImporter { } TrackStatisticsUpdater updater = new TrackStatisticsUpdater(); - updater.addTrackPoint(trackPoint, recordingDistanceInterval); + updater.addTrackPoint(trackPoint); List matchedMarkers = todoMarkers.stream() .filter(it -> trackPoint.getLatitude() == it.getLatitude() diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java index 435e6e95d..3729b8a0d 100644 --- a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java +++ b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java @@ -112,7 +112,7 @@ class TrackRecordingManager { TrackStatisticsUpdater tmpTrackStatisticsUpdater = new TrackStatisticsUpdater(trackStatisticsUpdater); Pair current = trackPointCreator.createCurrentTrackPoint(lastTrackPoint); - tmpTrackStatisticsUpdater.addTrackPoint(current.first, recordingDistanceInterval); + tmpTrackStatisticsUpdater.addTrackPoint(current.first); Track track = contentProviderUtils.getTrack(trackId); //Get copy if (track == null) { @@ -226,7 +226,7 @@ class TrackRecordingManager { private void insertTrackPointHelper(@NonNull TrackPoint trackPoint) { try { contentProviderUtils.insertTrackPoint(trackPoint, trackId); - trackStatisticsUpdater.addTrackPoint(trackPoint, recordingDistanceInterval); + trackStatisticsUpdater.addTrackPoint(trackPoint); contentProviderUtils.updateTrackStatistics(trackId, trackStatisticsUpdater.getTrackStatistics()); lastStoredTrackPoint = trackPoint; diff --git a/src/main/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdater.java b/src/main/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdater.java index 8cf1b9dcb..0556c73df 100644 --- a/src/main/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdater.java +++ b/src/main/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdater.java @@ -104,16 +104,14 @@ public class TrackStatisticsUpdater { return stats; } - public void addTrackPoints(List trackPoints, Distance minGPSDistance) { - for (TrackPoint tp : trackPoints) { - addTrackPoint(tp, minGPSDistance); - } + public void addTrackPoints(List trackPoints) { + trackPoints.stream().forEachOrdered(this::addTrackPoint); } /** - * @param minGPSDistance the min recording distance + * */ - public void addTrackPoint(TrackPoint trackPoint, Distance minGPSDistance) { + public void addTrackPoint(TrackPoint trackPoint) { if (trackPoint.isSegmentStart()) { reset(trackPoint); } diff --git a/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatistics.java b/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatistics.java index 1aeee34f6..1b8fcfb00 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatistics.java +++ b/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatistics.java @@ -45,7 +45,7 @@ public class IntervalStatistics { while (trackPointIterator.hasNext()) { trackPoint = trackPointIterator.next(); - trackStatisticsUpdater.addTrackPoint(trackPoint, minGPSDistance); + trackStatisticsUpdater.addTrackPoint(trackPoint); if (trackStatisticsUpdater.getTrackStatistics().getTotalDistance().plus(interval.distance).greaterOrEqualThan(distanceInterval)) { interval.add(trackStatisticsUpdater.getTrackStatistics(), trackPoint); @@ -58,7 +58,7 @@ public class IntervalStatistics { interval = new Interval(interval.distance.minus(adjustedInterval.distance), interval.time.minus(adjustedInterval.time)); trackStatisticsUpdater = new TrackStatisticsUpdater(); - trackStatisticsUpdater.addTrackPoint(trackPoint, minGPSDistance); + trackStatisticsUpdater.addTrackPoint(trackPoint); lastInterval = new Interval(interval); intervalList.add(lastInterval);