karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Cleanup: removed unused parameter.

Browse Source
This commit is contained in:
Dennis Guse
2022-01-15 23:27:01 +01:00
parent 9a7183738f
commit 1df1fe699a
9 changed files with 44 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/misc.xml
Generated
+1
View File
@@ -4,6 +4,7 @@
<option name="filePathToZoomLevelMap"> <option name="filePathToZoomLevelMap">
<map> <map>
<entry key="src/main/res/menu/aggregated_statistics.xml" value="0.10208333333333333" /> <entry key="src/main/res/menu/aggregated_statistics.xml" value="0.10208333333333333" />
<entry key="src/main/res/xml/settings_gps.xml" value="0.22604166666666667" />
<entry key="src/main/res/xml/settings_sensors.xml" value="0.2101851851851852" /> <entry key="src/main/res/xml/settings_sensors.xml" value="0.2101851851851852" />
</map> </map>
</option> </option>
src/androidTest/java/de/dennisguse/opentracks/content/data/TestDataUtil.java
+1 -1
View File
@@ -182,7 +182,7 @@ public class TestDataUtil {
for (int i = 0; i < numberOfPoints; i++) { for (int i = 0; i < numberOfPoints; i++) {
TrackPoint tp = TestDataUtil.createTrackPoint(i); TrackPoint tp = TestDataUtil.createTrackPoint(i);
contentProviderUtils.insertTrackPoint(tp, dummyTrack.getId()); contentProviderUtils.insertTrackPoint(tp, dummyTrack.getId());
trackStatisticsUpdater.addTrackPoint(tp, Distance.of(0)); trackStatisticsUpdater.addTrackPoint(tp);
} }
dummyTrack.setTrackStatistics(trackStatisticsUpdater.getTrackStatistics()); dummyTrack.setTrackStatistics(trackStatisticsUpdater.getTrackStatistics());
contentProviderUtils.updateTrack(dummyTrack); contentProviderUtils.updateTrack(dummyTrack);
src/androidTest/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdaterTest.java
+29 -29
View File
@@ -53,7 +53,7 @@ public class TrackStatisticsUpdaterTest {
// when // when
TrackStatisticsUpdater subject = new TrackStatisticsUpdater(); TrackStatisticsUpdater subject = new TrackStatisticsUpdater();
subject.addTrackPoint(tp, GPS_DISTANCE); subject.addTrackPoint(tp);
// then // then
TrackStatistics statistics = subject.getTrackStatistics(); TrackStatistics statistics = subject.getTrackStatistics();
@@ -77,7 +77,7 @@ public class TrackStatisticsUpdaterTest {
// when // when
TrackStatisticsUpdater subject = new TrackStatisticsUpdater(); TrackStatisticsUpdater subject = new TrackStatisticsUpdater();
data.trackPoints.forEach(it -> subject.addTrackPoint(it, GPS_DISTANCE)); data.trackPoints.forEach(it -> subject.addTrackPoint(it));
// then // then
TrackStatistics statistics = subject.getTrackStatistics(); 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)); TrackPoint tp3 = new TrackPoint(0.00001, 0, Altitude.WGS84.of(5.0), Instant.ofEpochMilli(3000));
// when // when
subject.addTrackPoint(tp1, GPS_DISTANCE); subject.addTrackPoint(tp1);
subject.addTrackPoint(tp2, GPS_DISTANCE); subject.addTrackPoint(tp2);
subject.addTrackPoint(tp3, GPS_DISTANCE); subject.addTrackPoint(tp3);
// then // then
assertEquals(0, subject.getTrackStatistics().getTotalDistance().toM(), 0.01); assertEquals(0, subject.getTrackStatistics().getTotalDistance().toM(), 0.01);
@@ -124,9 +124,9 @@ public class TrackStatisticsUpdaterTest {
tp3.setSpeed(Speed.of(5f)); tp3.setSpeed(Speed.of(5f));
// when // when
subject.addTrackPoint(tp1, GPS_DISTANCE); subject.addTrackPoint(tp1);
subject.addTrackPoint(tp2, GPS_DISTANCE); subject.addTrackPoint(tp2);
subject.addTrackPoint(tp3, GPS_DISTANCE); subject.addTrackPoint(tp3);
// then // then
assertEquals(1.10, subject.getTrackStatistics().getTotalDistance().toM(), 0.01); assertEquals(1.10, subject.getTrackStatistics().getTotalDistance().toM(), 0.01);
@@ -149,16 +149,16 @@ public class TrackStatisticsUpdaterTest {
tp5.setSensorDistance(Distance.of(10f)); tp5.setSensorDistance(Distance.of(10f));
// when // when
subject.addTrackPoint(tp1, GPS_DISTANCE); subject.addTrackPoint(tp1);
subject.addTrackPoint(tp2, GPS_DISTANCE); subject.addTrackPoint(tp2);
subject.addTrackPoint(tp3, GPS_DISTANCE); subject.addTrackPoint(tp3);
// then // then
assertEquals(110.57, subject.getTrackStatistics().getTotalDistance().toM(), 0.01); assertEquals(110.57, subject.getTrackStatistics().getTotalDistance().toM(), 0.01);
// when // when
subject.addTrackPoint(tp4, GPS_DISTANCE); subject.addTrackPoint(tp4);
subject.addTrackPoint(tp5, GPS_DISTANCE); subject.addTrackPoint(tp5);
// then // then
assertEquals(125.57, subject.getTrackStatistics().getTotalDistance().toM(), 0.01); assertEquals(125.57, subject.getTrackStatistics().getTotalDistance().toM(), 0.01);
@@ -178,16 +178,16 @@ public class TrackStatisticsUpdaterTest {
tp5.setSensorDistance(Distance.of(10f)); tp5.setSensorDistance(Distance.of(10f));
// when // when
subject.addTrackPoint(tp1, GPS_DISTANCE); subject.addTrackPoint(tp1);
subject.addTrackPoint(tp2, GPS_DISTANCE); subject.addTrackPoint(tp2);
subject.addTrackPoint(tp3, GPS_DISTANCE); subject.addTrackPoint(tp3);
// then // then
assertEquals(0, subject.getTrackStatistics().getTotalDistance().toM(), 0.01); assertEquals(0, subject.getTrackStatistics().getTotalDistance().toM(), 0.01);
// when // when
subject.addTrackPoint(tp4, GPS_DISTANCE); subject.addTrackPoint(tp4);
subject.addTrackPoint(tp5, GPS_DISTANCE); subject.addTrackPoint(tp5);
// then // then
assertEquals(15, subject.getTrackStatistics().getTotalDistance().toM(), 0.01); 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)); TrackPoint tp5 = new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.ofEpochMilli(5000));
// when // when
subject.addTrackPoint(tp1, GPS_DISTANCE); subject.addTrackPoint(tp1);
subject.addTrackPoint(tp2, GPS_DISTANCE); subject.addTrackPoint(tp2);
subject.addTrackPoint(tp3, GPS_DISTANCE); subject.addTrackPoint(tp3);
// then // then
assertEquals(5, subject.getTrackStatistics().getTotalDistance().toM(), 0.01); assertEquals(5, subject.getTrackStatistics().getTotalDistance().toM(), 0.01);
// when // when
subject.addTrackPoint(tp4, GPS_DISTANCE); subject.addTrackPoint(tp4);
subject.addTrackPoint(tp5, GPS_DISTANCE); subject.addTrackPoint(tp5);
// then // then
assertEquals(59.18, subject.getTrackStatistics().getTotalDistance().toM(), 0.01); assertEquals(59.18, subject.getTrackStatistics().getTotalDistance().toM(), 0.01);
@@ -258,15 +258,15 @@ public class TrackStatisticsUpdaterTest {
tp4.setSpeed(Speed.of(5f)); tp4.setSpeed(Speed.of(5f));
TrackPoint tp5 = new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.ofEpochMilli(5000)); TrackPoint tp5 = new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.ofEpochMilli(5000));
subject.addTrackPoint(tp1, GPS_DISTANCE); subject.addTrackPoint(tp1);
subject.addTrackPoint(tp2, GPS_DISTANCE); subject.addTrackPoint(tp2);
subject.addTrackPoint(tp3, GPS_DISTANCE); subject.addTrackPoint(tp3);
subject.addTrackPoint(tp4, GPS_DISTANCE); subject.addTrackPoint(tp4);
// when // when
TrackStatisticsUpdater copy = new TrackStatisticsUpdater(subject); TrackStatisticsUpdater copy = new TrackStatisticsUpdater(subject);
subject.addTrackPoint(tp5, GPS_DISTANCE); subject.addTrackPoint(tp5);
copy.addTrackPoint(tp5, GPS_DISTANCE); copy.addTrackPoint(tp5);
// then // then
src/androidTest/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsTest.java
+2 -2
View File
@@ -41,7 +41,7 @@ public class IntervalStatisticsTest {
private TrackStatistics buildTrackStatistics(List<TrackPoint> trackPoints) { private TrackStatistics buildTrackStatistics(List<TrackPoint> trackPoints) {
TrackStatisticsUpdater trackStatisticsUpdater = new TrackStatisticsUpdater(); TrackStatisticsUpdater trackStatisticsUpdater = new TrackStatisticsUpdater();
for (TrackPoint tp : trackPoints) { for (TrackPoint tp : trackPoints) {
trackStatisticsUpdater.addTrackPoint(tp, Distance.of(0)); trackStatisticsUpdater.addTrackPoint(tp);
} }
return trackStatisticsUpdater.getTrackStatistics(); return trackStatisticsUpdater.getTrackStatistics();
} }
@@ -132,7 +132,7 @@ public class IntervalStatisticsTest {
TrackPoint tp = TestDataUtil.createTrackPoint(i); TrackPoint tp = TestDataUtil.createTrackPoint(i);
tp.setAltitudeLoss(null); tp.setAltitudeLoss(null);
contentProviderUtils.insertTrackPoint(tp, dummyTrack.getId()); contentProviderUtils.insertTrackPoint(tp, dummyTrack.getId());
trackStatisticsUpdater.addTrackPoint(tp, Distance.of(0)); trackStatisticsUpdater.addTrackPoint(tp);
} }
dummyTrack.setTrackStatistics(trackStatisticsUpdater.getTrackStatistics()); dummyTrack.setTrackStatistics(trackStatisticsUpdater.getTrackStatistics());
contentProviderUtils.updateTrack(dummyTrack); contentProviderUtils.updateTrack(dummyTrack);
src/main/java/de/dennisguse/opentracks/data/TrackDataHub.java
+1 -1
View File
@@ -364,7 +364,7 @@ public class TrackDataHub {
samplingFrequency = 1 + (int) (numTotalPoints / targetNumPoints); samplingFrequency = 1 + (int) (numTotalPoints / targetNumPoints);
} }
currentUpdater.addTrackPoint(trackPoint, recordingDistanceInterval); currentUpdater.addTrackPoint(trackPoint);
// Also include the last point if the selected track is not recording. // Also include the last point if the selected track is not recording.
if ((localNumLoadedTrackPoints % samplingFrequency == 0) || (trackPointId == lastTrackPointId && !isSelectedTrackRecording())) { if ((localNumLoadedTrackPoints % samplingFrequency == 0) || (trackPointId == lastTrackPointId && !isSelectedTrackRecording())) {
src/main/java/de/dennisguse/opentracks/io/file/importer/TrackImporter.java
+2 -2
View File
@@ -149,7 +149,7 @@ public class TrackImporter {
adjustTrackPoints(); adjustTrackPoints();
TrackStatisticsUpdater updater = new TrackStatisticsUpdater(); TrackStatisticsUpdater updater = new TrackStatisticsUpdater();
updater.addTrackPoints(trackPoints, recordingDistanceInterval); updater.addTrackPoints(trackPoints);
track.setTrackStatistics(updater.getTrackStatistics()); track.setTrackStatistics(updater.getTrackStatistics());
Track.Id trackId = contentProviderUtils.insertTrack(track); Track.Id trackId = contentProviderUtils.insertTrack(track);
@@ -233,7 +233,7 @@ public class TrackImporter {
} }
TrackStatisticsUpdater updater = new TrackStatisticsUpdater(); TrackStatisticsUpdater updater = new TrackStatisticsUpdater();
updater.addTrackPoint(trackPoint, recordingDistanceInterval); updater.addTrackPoint(trackPoint);
List<Marker> matchedMarkers = todoMarkers.stream() List<Marker> matchedMarkers = todoMarkers.stream()
.filter(it -> trackPoint.getLatitude() == it.getLatitude() .filter(it -> trackPoint.getLatitude() == it.getLatitude()
src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java
+2 -2
View File
@@ -112,7 +112,7 @@ class TrackRecordingManager {
TrackStatisticsUpdater tmpTrackStatisticsUpdater = new TrackStatisticsUpdater(trackStatisticsUpdater); TrackStatisticsUpdater tmpTrackStatisticsUpdater = new TrackStatisticsUpdater(trackStatisticsUpdater);
Pair<TrackPoint, SensorDataSet> current = trackPointCreator.createCurrentTrackPoint(lastTrackPoint); Pair<TrackPoint, SensorDataSet> current = trackPointCreator.createCurrentTrackPoint(lastTrackPoint);
tmpTrackStatisticsUpdater.addTrackPoint(current.first, recordingDistanceInterval); tmpTrackStatisticsUpdater.addTrackPoint(current.first);
Track track = contentProviderUtils.getTrack(trackId); //Get copy Track track = contentProviderUtils.getTrack(trackId); //Get copy
if (track == null) { if (track == null) {
@@ -226,7 +226,7 @@ class TrackRecordingManager {
private void insertTrackPointHelper(@NonNull TrackPoint trackPoint) { private void insertTrackPointHelper(@NonNull TrackPoint trackPoint) {
try { try {
contentProviderUtils.insertTrackPoint(trackPoint, trackId); contentProviderUtils.insertTrackPoint(trackPoint, trackId);
trackStatisticsUpdater.addTrackPoint(trackPoint, recordingDistanceInterval); trackStatisticsUpdater.addTrackPoint(trackPoint);
contentProviderUtils.updateTrackStatistics(trackId, trackStatisticsUpdater.getTrackStatistics()); contentProviderUtils.updateTrackStatistics(trackId, trackStatisticsUpdater.getTrackStatistics());
lastStoredTrackPoint = trackPoint; lastStoredTrackPoint = trackPoint;
src/main/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdater.java
+4 -6
View File
@@ -104,16 +104,14 @@ public class TrackStatisticsUpdater {
return stats; return stats;
} }
public void addTrackPoints(List<TrackPoint> trackPoints, Distance minGPSDistance) { public void addTrackPoints(List<TrackPoint> trackPoints) {
for (TrackPoint tp : trackPoints) { trackPoints.stream().forEachOrdered(this::addTrackPoint);
addTrackPoint(tp, minGPSDistance);
}
} }
/** /**
* @param minGPSDistance the min recording distance *
*/ */
public void addTrackPoint(TrackPoint trackPoint, Distance minGPSDistance) { public void addTrackPoint(TrackPoint trackPoint) {
if (trackPoint.isSegmentStart()) { if (trackPoint.isSegmentStart()) {
reset(trackPoint); reset(trackPoint);
} }
src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatistics.java
+2 -2
View File
@@ -45,7 +45,7 @@ public class IntervalStatistics {
while (trackPointIterator.hasNext()) { while (trackPointIterator.hasNext()) {
trackPoint = trackPointIterator.next(); trackPoint = trackPointIterator.next();
trackStatisticsUpdater.addTrackPoint(trackPoint, minGPSDistance); trackStatisticsUpdater.addTrackPoint(trackPoint);
if (trackStatisticsUpdater.getTrackStatistics().getTotalDistance().plus(interval.distance).greaterOrEqualThan(distanceInterval)) { if (trackStatisticsUpdater.getTrackStatistics().getTotalDistance().plus(interval.distance).greaterOrEqualThan(distanceInterval)) {
interval.add(trackStatisticsUpdater.getTrackStatistics(), trackPoint); 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)); interval = new Interval(interval.distance.minus(adjustedInterval.distance), interval.time.minus(adjustedInterval.time));
trackStatisticsUpdater = new TrackStatisticsUpdater(); trackStatisticsUpdater = new TrackStatisticsUpdater();
trackStatisticsUpdater.addTrackPoint(trackPoint, minGPSDistance); trackStatisticsUpdater.addTrackPoint(trackPoint);
lastInterval = new Interval(interval); lastInterval = new Interval(interval);
intervalList.add(lastInterval); intervalList.add(lastInterval);