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

Merge.

Browse Source
This commit is contained in:
Sandor Dornbush
2011-02-17 22:09:47 -08:00
parent 58530d6f72 6826e3567d
commit 14fce8edfe
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/io/CsvTrackWriter.java
+9 -4
View File
@@ -23,6 +23,7 @@ import android.location.Location;
import java.io.OutputStream; import java.io.OutputStream;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.text.NumberFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import java.util.TimeZone; import java.util.TimeZone;
@@ -44,9 +45,13 @@ import java.util.TimeZone;
* @author Rodrigo Damazio * @author Rodrigo Damazio
*/ */
public class CsvTrackWriter implements TrackFormatWriter { public class CsvTrackWriter implements TrackFormatWriter {
static final NumberFormat SHORT_FORMAT = NumberFormat.getInstance();
static final SimpleDateFormat TIMESTAMP_FORMAT = static final SimpleDateFormat TIMESTAMP_FORMAT =
new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'"); new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
static { static {
SHORT_FORMAT.setMaximumFractionDigits(4);
TIMESTAMP_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC")); TIMESTAMP_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC"));
} }
@@ -94,8 +99,8 @@ public class CsvTrackWriter implements TrackFormatWriter {
Double.toString(location.getLongitude()), Double.toString(location.getLongitude()),
Double.toString(location.getAltitude()), Double.toString(location.getAltitude()),
Double.toString(location.getBearing()), Double.toString(location.getBearing()),
Double.toString(location.getAccuracy()), SHORT_FORMAT.format(location.getAccuracy()),
Double.toString(location.getSpeed()), SHORT_FORMAT.format(location.getSpeed()),
null, null, null, null,
Integer.toString(segmentIdx)); Integer.toString(segmentIdx));
} }
@@ -110,8 +115,8 @@ public class CsvTrackWriter implements TrackFormatWriter {
Double.toString(location.getLongitude()), Double.toString(location.getLongitude()),
Double.toString(location.getAltitude()), Double.toString(location.getAltitude()),
Double.toString(location.getBearing()), Double.toString(location.getBearing()),
Double.toString(location.getAccuracy()), SHORT_FORMAT.format(location.getAccuracy()),
Double.toString(location.getSpeed()), SHORT_FORMAT.format(location.getSpeed()),
waypoint.getName(), waypoint.getName(),
waypoint.getDescription(), waypoint.getDescription(),
null); null);
MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
+8 -2
View File
@@ -420,6 +420,7 @@ public class TrackRecordingService extends Service implements LocationListener {
TripStatistics stats = track.getStatistics(); TripStatistics stats = track.getStatistics();
statsBuilder = new TripStatisticsBuilder(stats.getStartTime()); statsBuilder = new TripStatisticsBuilder(stats.getStartTime());
statsBuilder.setMinRecordingDistance(minRecordingDistance);
setUpAnnouncer(); setUpAnnouncer();
splitManager.restore(); splitManager.restore();
@@ -436,6 +437,7 @@ public class TrackRecordingService extends Service implements LocationListener {
waypointStatsBuilder = new TripStatisticsBuilder(stats.getStartTime()); waypointStatsBuilder = new TripStatisticsBuilder(stats.getStartTime());
currentWaypointId = -1; currentWaypointId = -1;
} }
waypointStatsBuilder.setMinRecordingDistance(minRecordingDistance);
Cursor cursor = null; Cursor cursor = null;
try { try {
@@ -1077,7 +1079,9 @@ public class TrackRecordingService extends Service implements LocationListener {
providerUtils.updateTrack(track); providerUtils.updateTrack(track);
statsBuilder = new TripStatisticsBuilder(startTime); statsBuilder = new TripStatisticsBuilder(startTime);
statsBuilder.setMinRecordingDistance(minRecordingDistance);
waypointStatsBuilder = new TripStatisticsBuilder(startTime); waypointStatsBuilder = new TripStatisticsBuilder(startTime);
waypointStatsBuilder.setMinRecordingDistance(minRecordingDistance);
currentWaypointId = insertWaypoint(WaypointCreationRequest.DEFAULT_STATISTICS); currentWaypointId = insertWaypoint(WaypointCreationRequest.DEFAULT_STATISTICS);
setUpAnnouncer(); setUpAnnouncer();
length = 0; length = 0;
@@ -1195,8 +1199,10 @@ public class TrackRecordingService extends Service implements LocationListener {
public void setMinRecordingDistance(int minRecordingDistance) { public void setMinRecordingDistance(int minRecordingDistance) {
this.minRecordingDistance = minRecordingDistance; this.minRecordingDistance = minRecordingDistance;
this.statsBuilder.setMinRecordingDistance(minRecordingDistance); if (statsBuilder != null && waypointStatsBuilder != null) {
this.waypointStatsBuilder.setMinRecordingDistance(minRecordingDistance); statsBuilder.setMinRecordingDistance(minRecordingDistance);
waypointStatsBuilder.setMinRecordingDistance(minRecordingDistance);
}
} }
public int getMinRequiredAccuracy() { public int getMinRequiredAccuracy() {