X-Git-Url: https://gitweb.fperrin.net/?p=GpsPrune.git;a=blobdiff_plain;f=tim%2Fprune%2Fsave%2FGpxExporter.java;h=0e028d18ddd9abff7bf41125ff8018f997c1afa4;hp=98619d1a81dddf0fdef65060a1969f6c582f0c25;hb=ca9bdb3916f9c39adbbf95d06ac95c21dafbb4e6;hpb=63f178fd6c6b30b99a01f2a2d700963ea2dfef8b

diff --git a/tim/prune/save/GpxExporter.java b/tim/prune/save/GpxExporter.java
index 98619d1..0e028d1 100644
--- a/tim/prune/save/GpxExporter.java
+++ b/tim/prune/save/GpxExporter.java
@@ -25,6 +25,7 @@ import javax.swing.filechooser.FileFilter;
 
 import tim.prune.GpsPruner;
 import tim.prune.I18nManager;
+import tim.prune.UpdateMessageBroker;
 import tim.prune.data.Altitude;
 import tim.prune.data.Coordinate;
 import tim.prune.data.DataPoint;
@@ -201,10 +202,10 @@ public class GpxExporter implements Runnable
 
 			// close file
 			writer.close();
-			JOptionPane.showMessageDialog(_parentFrame, I18nManager.getText("dialog.save.ok1")
-				 + " " + numPoints + " " + I18nManager.getText("dialog.save.ok2")
-				 + " " + _exportFile.getAbsolutePath(),
-				I18nManager.getText("dialog.save.oktitle"), JOptionPane.INFORMATION_MESSAGE);
+			// Show confirmation
+			UpdateMessageBroker.informSubscribers(I18nManager.getText("confirm.save.ok1")
+				 + " " + numPoints + " " + I18nManager.getText("confirm.save.ok2")
+				 + " " + _exportFile.getAbsolutePath());
 			// export successful so need to close dialog and return
 			_dialog.dispose();
 			return;
@@ -264,7 +265,7 @@ public class GpxExporter implements Runnable
 		for (i=0; i<numPoints; i++)
 		{
 			point = _track.getPoint(i);
-			// Make a blob for each waypoint
+			// Make a wpt element for each waypoint
 			if (point.isWaypoint())
 			{
 				exportWaypoint(point, inWriter);
@@ -274,18 +275,23 @@ public class GpxExporter implements Runnable
 				hasTrackpoints = true;
 			}
 		}
-		// Make a line for the track, if there is one
-		// TODO: Look at segments of track, and split into separate track segments in Gpx if necessary
+		// Output the track, if there is one
 		if (hasTrackpoints)
 		{
+			boolean firstPoint = true;
 			inWriter.write("\t<trk><trkseg>\n");
 			// Loop over track points
 			for (i=0; i<numPoints; i++)
 			{
 				point = _track.getPoint(i);
-				if (!point.isWaypoint())
-				{
+				if (point.getSegmentStart() && !firstPoint) {
+					inWriter.write("\t</trkseg>\n\t<trkseg>\n");
+				}
+				if (!point.isWaypoint()) {
+					// restart track segment if necessary
+					// export the track point
 					exportTrackpoint(point, inWriter);
+					firstPoint = false;
 				}
 			}
 			inWriter.write("\t</trkseg></trk>\n");