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

Addressing review comments.

Browse Source
This commit is contained in:
Jared Casper
2011-02-09 15:13:54 -08:00
parent d50d4ae1c9
commit 2e24eab5ad
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/io/GpxTrackWriter.java
+14 -13
View File
@@ -38,17 +38,22 @@ import java.util.TimeZone;
public class GpxTrackWriter implements TrackFormatWriter { public class GpxTrackWriter implements TrackFormatWriter {
static final int LATLONG_FORMAT = Location.FORMAT_DEGREES; static final int LATLONG_FORMAT = Location.FORMAT_DEGREES;
static final DecimalFormat ELEVATION_FORMAT = static final DecimalFormat ELEVATION_FORMATTER =
new DecimalFormat("#.#"); new DecimalFormat("#.#");
static final SimpleDateFormat TIMESTAMP_FORMAT = static final SimpleDateFormat TIMESTAMP_FORMATTER =
new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'"); new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
static { static {
TIMESTAMP_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC")); TIMESTAMP_FORMATTER.setTimeZone(TimeZone.getTimeZone("UTC"));
} }
private PrintWriter pw = null; private PrintWriter pw = null;
private Track track; private Track track;
private String formatLocation(Location l) {
return "lat=\"" + Location.convert(l.getLatitude(), LATLONG_FORMAT)
+ "\" lon=\"" + Location.convert(l.getLongitude(), LATLONG_FORMAT) + "\"";
}
@Override @Override
public void prepare(Track track, OutputStream out) { public void prepare(Track track, OutputStream out) {
this.track = track; this.track = track;
@@ -122,12 +127,10 @@ public class GpxTrackWriter implements TrackFormatWriter {
@Override @Override
public void writeLocation(Location l) { public void writeLocation(Location l) {
if (pw != null) { if (pw != null) {
pw.println("<trkpt lat=\"" pw.println("<trkpt " + formatLocation(l) + ">");
+ Location.convert(l.getLatitude(), LATLONG_FORMAT) + "\" lon=\""
+ Location.convert(l.getLongitude(), LATLONG_FORMAT) + "\">");
Date d = new Date(l.getTime()); Date d = new Date(l.getTime());
pw.println("<ele>" + ELEVATION_FORMAT.format(l.getAltitude()) + "</ele>"); pw.println("<ele>" + ELEVATION_FORMATTER.format(l.getAltitude()) + "</ele>");
pw.println("<time>" + TIMESTAMP_FORMAT.format(d) + "</time>"); pw.println("<time>" + TIMESTAMP_FORMATTER.format(d) + "</time>");
pw.println("</trkpt>"); pw.println("</trkpt>");
} }
} }
@@ -145,11 +148,9 @@ public class GpxTrackWriter implements TrackFormatWriter {
if (pw != null) { if (pw != null) {
Location l = waypoint.getLocation(); Location l = waypoint.getLocation();
if (l != null) { if (l != null) {
pw.println("<wpt lat=\"" pw.println("<wpt " + formatLocation(l) + ">");
+ Location.convert(l.getLatitude(), LATLONG_FORMAT) + "\" lon=\"" pw.println("<ele>" + ELEVATION_FORMATTER.format(l.getAltitude()) + "</ele>");
+ Location.convert(l.getLongitude(), LATLONG_FORMAT) + "\">"); pw.println("<time>" + TIMESTAMP_FORMATTER.format(l.getTime()) + "</time>");
pw.println("<ele>" + ELEVATION_FORMAT.format(l.getAltitude()) + "</ele>");
pw.println("<time>" + TIMESTAMP_FORMAT.format(l.getTime()) + "</time>");
pw.println("<name>" + StringUtils.stringAsCData(waypoint.getName()) pw.println("<name>" + StringUtils.stringAsCData(waypoint.getName())
+ "</name>"); + "</name>");
pw.println("<desc>" pw.println("<desc>"
MyTracksTest/src/com/google/android/apps/mytracks/io/GpxTrackWriterTest.java
+2 -2
View File
@@ -82,10 +82,10 @@ public class GpxTrackWriterTest extends TrackFormatWriterTest {
Location.convert(loc.getLongitude(), GpxTrackWriter.LATLONG_FORMAT), Location.convert(loc.getLongitude(), GpxTrackWriter.LATLONG_FORMAT),
tag.getAttribute("lon")); tag.getAttribute("lon"));
assertEquals( assertEquals(
GpxTrackWriter.TIMESTAMP_FORMAT.format(new Date(loc.getTime())), GpxTrackWriter.TIMESTAMP_FORMATTER.format(new Date(loc.getTime())),
getChildTextValue(tag, "time")); getChildTextValue(tag, "time"));
assertEquals( assertEquals(
GpxTrackWriter.ELEVATION_FORMAT.format(loc.getAltitude()), GpxTrackWriter.ELEVATION_FORMATTER.format(loc.getAltitude()),
getChildTextValue(tag, "ele")); getChildTextValue(tag, "ele"));
} }
} }