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

Removed TrackWriterTrackPointFactory.

Browse Source 
Replaced with local variable for TrackPoint swapping.
This commit is contained in:
Dennis Guse
2020-03-29 12:52:03 +02:00
parent f340622977
commit 881bf1982a
1 changed files with 5 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/io/file/exporter/FileTrackExporter.java
+5 -32
View File
@@ -125,10 +125,10 @@ public class FileTrackExporter implements TrackExporter {
boolean wroteTrack = false; boolean wroteTrack = false;
boolean wroteSegment = false; boolean wroteSegment = false;
boolean isLastLocationValid = false; boolean isLastLocationValid = false;
TrackWriterTrackPointFactory trackPointFactory = new TrackWriterTrackPointFactory();
int locationNumber = 0; int locationNumber = 0;
TrackPoint lastTrackPoint = null;
try (TrackPointIterator trackPointIterator = contentProviderUtils.getTrackPointLocationIterator(track.getId(), -1L, false, trackPointFactory)) { try (TrackPointIterator trackPointIterator = contentProviderUtils.getTrackPointLocationIterator(track.getId(), -1L, false, TrackPointFactory.DEFAULT_LOCATION_FACTORY)) {
while (trackPointIterator.hasNext()) { while (trackPointIterator.hasNext()) {
if (Thread.interrupted()) { if (Thread.interrupted()) {
@@ -143,7 +143,7 @@ public class FileTrackExporter implements TrackExporter {
boolean isSegmentValid = isLocationValid && isLastLocationValid; boolean isSegmentValid = isLocationValid && isLastLocationValid;
if (!wroteTrack && isSegmentValid) { if (!wroteTrack && isSegmentValid) {
// Found the first two consecutive locations that are valid // Found the first two consecutive locations that are valid
trackWriter.writeBeginTrack(track, trackPointFactory.lastTrackPoint); trackWriter.writeBeginTrack(track, lastTrackPoint);
wroteTrack = true; wroteTrack = true;
} }
@@ -154,7 +154,7 @@ public class FileTrackExporter implements TrackExporter {
wroteSegment = true; wroteSegment = true;
// Write the previous trackPoint, which we had previously skipped // Write the previous trackPoint, which we had previously skipped
trackWriter.writeTrackPoint(trackPointFactory.lastTrackPoint); trackWriter.writeTrackPoint(lastTrackPoint);
} }
// Write the current trackPoint // Write the current trackPoint
@@ -168,7 +168,7 @@ public class FileTrackExporter implements TrackExporter {
wroteSegment = false; wroteSegment = false;
} }
} }
trackPointFactory.swapLocations(); lastTrackPoint = trackPoint;
isLastLocationValid = isLocationValid; isLastLocationValid = isLocationValid;
} }
@@ -200,31 +200,4 @@ public class FileTrackExporter implements TrackExporter {
trackPoint.setTime(trackPoint.getTime() - offset); trackPoint.setTime(trackPoint.getTime() - offset);
} }
} }
/**
* Keeping the last two locations.
*
* @author Jimmy Shih
*/
private static class TrackWriterTrackPointFactory extends TrackPointFactory {
TrackPoint currentTrackPoint;
TrackPoint lastTrackPoint;
@Override
public TrackPoint create() {
if (currentTrackPoint == null) {
currentTrackPoint = new TrackPoint();
}
return currentTrackPoint;
}
void swapLocations() {
TrackPoint tempTrackPoint = lastTrackPoint;
lastTrackPoint = currentTrackPoint;
currentTrackPoint = tempTrackPoint;
if (currentTrackPoint != null) {
currentTrackPoint.reset();
}
}
}
} }