From 8135ad442455e85298431c3735bef2abb3e9bcaa Mon Sep 17 00:00:00 2001
From: Jared Casper <jaredcasper@gmail.com>
Date: Wed, 9 Feb 2011 15:13:54 -0800
Subject: [PATCH] Addressing review comments.

---
 .../apps/mytracks/io/GpxTrackWriter.java      | 27 ++++++++++---------
 .../apps/mytracks/io/GpxTrackWriterTest.java  |  4 +--
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/GpxTrackWriter.java b/MyTracks/src/com/google/android/apps/mytracks/io/GpxTrackWriter.java
index 03fb4a1f2..f1216d3cb 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/GpxTrackWriter.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/GpxTrackWriter.java
@@ -38,17 +38,22 @@ import java.util.TimeZone;
 public class GpxTrackWriter implements TrackFormatWriter {
 
   static final int LATLONG_FORMAT = Location.FORMAT_DEGREES;
-  static final DecimalFormat ELEVATION_FORMAT =
+  static final DecimalFormat ELEVATION_FORMATTER =
       new DecimalFormat("#.#");
-  static final SimpleDateFormat TIMESTAMP_FORMAT =
+  static final SimpleDateFormat TIMESTAMP_FORMATTER =
       new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
   static {
-    TIMESTAMP_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC"));
+    TIMESTAMP_FORMATTER.setTimeZone(TimeZone.getTimeZone("UTC"));
   }
 
   private PrintWriter pw = null;
   private Track track;
 
+  private String formatLocation(Location l) {
+    return "lat=\"" + Location.convert(l.getLatitude(), LATLONG_FORMAT)
+      + "\" lon=\"" + Location.convert(l.getLongitude(), LATLONG_FORMAT) + "\"";
+  }
+
   @Override
   public void prepare(Track track, OutputStream out) {
     this.track = track;
@@ -122,12 +127,10 @@ public class GpxTrackWriter implements TrackFormatWriter {
   @Override
   public void writeLocation(Location l) {
     if (pw != null) {
-      pw.println("<trkpt lat=\""
-          + Location.convert(l.getLatitude(), LATLONG_FORMAT) + "\" lon=\""
-          + Location.convert(l.getLongitude(), LATLONG_FORMAT) + "\">");
+      pw.println("<trkpt " + formatLocation(l) + ">");
       Date d = new Date(l.getTime());
-      pw.println("<ele>" + ELEVATION_FORMAT.format(l.getAltitude()) + "</ele>");
-      pw.println("<time>" + TIMESTAMP_FORMAT.format(d) + "</time>");
+      pw.println("<ele>" + ELEVATION_FORMATTER.format(l.getAltitude()) + "</ele>");
+      pw.println("<time>" + TIMESTAMP_FORMATTER.format(d) + "</time>");
       pw.println("</trkpt>");
     }
   }
@@ -145,11 +148,9 @@ public class GpxTrackWriter implements TrackFormatWriter {
     if (pw != null) {
       Location l = waypoint.getLocation();
       if (l != null) {
-        pw.println("<wpt lat=\""
-            + Location.convert(l.getLatitude(), LATLONG_FORMAT) + "\" lon=\""
-            + Location.convert(l.getLongitude(), LATLONG_FORMAT) + "\">");
-        pw.println("<ele>" + ELEVATION_FORMAT.format(l.getAltitude()) + "</ele>");
-        pw.println("<time>" + TIMESTAMP_FORMAT.format(l.getTime()) + "</time>");
+        pw.println("<wpt " + formatLocation(l) + ">");
+        pw.println("<ele>" + ELEVATION_FORMATTER.format(l.getAltitude()) + "</ele>");
+        pw.println("<time>" + TIMESTAMP_FORMATTER.format(l.getTime()) + "</time>");
         pw.println("<name>" + StringUtils.stringAsCData(waypoint.getName())
             + "</name>");
         pw.println("<desc>"
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/GpxTrackWriterTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/GpxTrackWriterTest.java
index 69ec90ef2..96c3f9cf2 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/io/GpxTrackWriterTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/GpxTrackWriterTest.java
@@ -82,10 +82,10 @@ public class GpxTrackWriterTest extends TrackFormatWriterTest {
         Location.convert(loc.getLongitude(), GpxTrackWriter.LATLONG_FORMAT),
         tag.getAttribute("lon"));
     assertEquals(
-        GpxTrackWriter.TIMESTAMP_FORMAT.format(new Date(loc.getTime())),
+        GpxTrackWriter.TIMESTAMP_FORMATTER.format(new Date(loc.getTime())),
         getChildTextValue(tag, "time"));
     assertEquals(
-        GpxTrackWriter.ELEVATION_FORMAT.format(loc.getAltitude()),
+        GpxTrackWriter.ELEVATION_FORMATTER.format(loc.getAltitude()),
         getChildTextValue(tag, "ele"));
   }
 }