From f86cadb80276f890186d3f9d677cb6693bed9d9a Mon Sep 17 00:00:00 2001
From: Jared Casper <jaredcasper@gmail.com>
Date: Wed, 9 Feb 2011 10:42:34 -0800
Subject: [PATCH] Reorder waypoint and track writing on export.

The GPX schema requires waypoints to come before the track.

Waypoints are not currently used in TCX export, so there are no
changes there.

In KML files, both tracks and waypoints are "Placemark"s, so it
doesn't matter what order they come in there.

This does change the order they appear in CSV files, which could
potentially invalidate some assumptions made in downstream tools.
---
 .../android/apps/mytracks/io/GpxTrackWriter.java      |  1 -
 .../google/android/apps/mytracks/io/TrackWriter.java  |  3 +--
 .../android/apps/mytracks/io/TrackWriterTest.java     | 11 ++++++-----
 3 files changed, 7 insertions(+), 8 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 f1ee1c256..da342f730 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/GpxTrackWriter.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/GpxTrackWriter.java
@@ -143,7 +143,6 @@ public class GpxTrackWriter implements TrackFormatWriter {
   @Override
   public void writeWaypoint(Waypoint waypoint) {
     if (pw != null) {
-      // TODO: The gpx spec says waypoints should come *before* tracks
       Location l = waypoint.getLocation();
       if (l != null) {
         pw.println("<wpt lat=\""
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/TrackWriter.java b/MyTracks/src/com/google/android/apps/mytracks/io/TrackWriter.java
index 2f9555023..26fb19f87 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/TrackWriter.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/TrackWriter.java
@@ -255,9 +255,8 @@ public class TrackWriter {
   void writeDocument() {
     Log.d(MyTracksConstants.TAG, "Started writing track.");
     writer.writeHeader();
-    // TODO: Fix ordering (in GPX waypoints should come first)
-    writeLocations();
     writeWaypoints(track.getId());
+    writeLocations();
     writer.writeFooter();
     writer.close();
     success = true;
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/TrackWriterTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/TrackWriterTest.java
index 73721214e..c80013a68 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/io/TrackWriterTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/TrackWriterTest.java
@@ -267,8 +267,13 @@ public class TrackWriterTest extends AndroidTestCase {
       wpt.setId(i + 1);
     }
 
-    // Begin the track
     formatWriter.writeHeader();
+
+    // Expect reading/writing of the waypoints (except the first)
+    formatWriter.writeWaypoint(wptEq(wps[1]));
+    formatWriter.writeWaypoint(wptEq(wps[2]));
+
+    // Begin the track
     formatWriter.writeBeginTrack(locEq(locs[0]));
 
     // Write locations 1-2
@@ -289,10 +294,6 @@ public class TrackWriterTest extends AndroidTestCase {
     // End the track
     formatWriter.writeEndTrack(locEq(locs[5]));
 
-    // Expect reading/writing of the waypoints (except the first)
-    formatWriter.writeWaypoint(wptEq(wps[1]));
-    formatWriter.writeWaypoint(wptEq(wps[2]));
-
     formatWriter.writeFooter();
     formatWriter.close();