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

Merging to head

Browse Source
This commit is contained in:
Rodrigo Damazio
2011-05-17 01:19:58 -03:00
parent cc253d4b33 8056b66714
commit 59a30238eb
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/content/TrackDataHub.java
+11 -11
View File
@@ -892,8 +892,8 @@ public class TrackDataHub {
long maxPointId = keepState ? -1 : lastSeenLocationId; long maxPointId = keepState ? -1 : lastSeenLocationId;
// TODO: Move (re)sampling to a separate class. // TODO: Move (re)sampling to a separate class.
if (numLoadedPoints >= Constants.MAX_DISPLAYED_TRACK_POINTS) { if (numLoadedPoints >= Constants.TARGET_DISPLAYED_TRACK_POINTS) {
// We're about to exceed the maximum allowed number of points, so reload // We're about to exceed the maximum desired number of points, so reload
// the whole track with fewer points (the sampling frequency will be // the whole track with fewer points (the sampling frequency will be
// lower). We do this for every listener even if we were loading just for // lower). We do this for every listener even if we were loading just for
// a few of them (why miss the oportunity?). // a few of them (why miss the oportunity?).
@@ -924,7 +924,7 @@ public class TrackDataHub {
if (previousNumPoints <= 0) { if (previousNumPoints <= 0) {
localNumLoadedPoints = keepState ? numLoadedPoints : 0; localNumLoadedPoints = keepState ? numLoadedPoints : 0;
} }
long localFirstSeenLocationId = keepState ? firstSeenLocationId : 0; long localFirstSeenLocationId = keepState ? firstSeenLocationId : -1;
long localLastSeenLocationId = minPointId; long localLastSeenLocationId = minPointId;
long lastStoredLocationId = providerUtils.getLastLocationId(currentSelectedTrackId); long lastStoredLocationId = providerUtils.getLastLocationId(currentSelectedTrackId);
int pointSamplingFrequency = -1; int pointSamplingFrequency = -1;
@@ -1017,21 +1017,21 @@ public class TrackDataHub {
// Include a point if it fits one of the following criteria: // Include a point if it fits one of the following criteria:
// - Has the mod for the sampling frequency (includes first point). // - Has the mod for the sampling frequency (includes first point).
// - Is the last point and we are not recording this track. // - Is the last point and we are not recording this track.
boolean recordingSelected = isRecordingSelected();
boolean includeInSample = boolean includeInSample =
(numLoadedPoints % pointSamplingFrequency == 0 || (numLoadedPoints % pointSamplingFrequency == 0 ||
(!isRecordingSelected() && locationId == lastStoredLocationId)); (!recordingSelected && locationId == lastStoredLocationId));
if (!includeInSample) { if (!includeInSample) {
for (TrackDataListener listener : sampledOutListeners) { for (TrackDataListener listener : sampledOutListeners) {
listener.onSampledOutTrackPoint(location); listener.onSampledOutTrackPoint(location);
} }
return; } else {
} // Point is valid and included in sample.
for (TrackDataListener listener : sampledListeners) {
// Point is valid and included in sample. // No need to allocate a new location (we can safely reuse the existing).
for (TrackDataListener listener : sampledListeners) { listener.onNewTrackPoint(location);
// No need to allocate a new location (we can safely reuse the existing). }
listener.onNewTrackPoint(location);
} }
} }