X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fsave%2FGpxExporter.java;h=936361680495e30a75f528d62e465d32a72260c8;hb=6f96fb8a39cd8dadff3602eec8a26ed2a7d1fca8;hp=1b2263bc8260d6dc49115f969de5e9c40be1ffcb;hpb=88f2c3647ed9e055090484f01a959d4581f85e7d;p=GpsPrune.git

diff --git a/tim/prune/save/GpxExporter.java b/tim/prune/save/GpxExporter.java
index 1b2263b..9363616 100644
--- a/tim/prune/save/GpxExporter.java
+++ b/tim/prune/save/GpxExporter.java
@@ -347,11 +347,11 @@ public class GpxExporter extends GenericFunction implements Runnable
 		final String gpxHeader = getGpxHeaderString(inGpxCachers);
 		final boolean isVersion1_1 = (gpxHeader.toUpperCase().indexOf("GPX/1/1") > 0);
 		inWriter.write(gpxHeader);
-		// Name field
-		String trackName = (inName != null && !inName.equals("")) ? inName : "GpsPruneTrack";
-		writeNameAndDescription(inWriter, inName, inDesc, isVersion1_1);
+		// name and description
+		String trackName = (inName != null && !inName.equals("")) ? XmlUtils.fixCdata(inName) : "GpsPruneTrack";
+		String desc      = (inDesc != null && !inDesc.equals("")) ? XmlUtils.fixCdata(inDesc) : "Export from GpsPrune";
+		writeNameAndDescription(inWriter, trackName, desc, isVersion1_1);
 
-		int i = 0;
 		DataPoint point = null;
 		final boolean exportTrackpoints = inSaveFlags[0];
 		final boolean exportWaypoints = inSaveFlags[1];
@@ -368,7 +368,7 @@ public class GpxExporter extends GenericFunction implements Runnable
 		// Loop over waypoints
 		final int numPoints = inInfo.getTrack().getNumPoints();
 		int numSaved = 0;
-		for (i=0; i<numPoints; i++)
+		for (int i=0; i<numPoints; i++)
 		{
 			point = inInfo.getTrack().getPoint(i);
 			if (!exportSelection || (i>=selStart && i<=selEnd))
@@ -423,7 +423,6 @@ public class GpxExporter extends GenericFunction implements Runnable
 	private static void writeNameAndDescription(OutputStreamWriter inWriter,
 		String inName, String inDesc, boolean inIsVersion1_1) throws IOException
 	{
-		String desc = (inDesc != null && !inDesc.equals("")) ? inDesc : "Export from GpsPrune";
 		// Position of name and description fields needs to be different for GPX1.0 and GPX1.1
 		if (inIsVersion1_1)
 		{
@@ -439,7 +438,7 @@ public class GpxExporter extends GenericFunction implements Runnable
 		}
 		if (inIsVersion1_1) {inWriter.write('\t');}
 		inWriter.write("\t<desc>");
-		inWriter.write(desc);
+		inWriter.write(inDesc);
 		inWriter.write("</desc>\n");
 		if (inIsVersion1_1)
 		{
@@ -535,11 +534,15 @@ public class GpxExporter extends GenericFunction implements Runnable
 		source = replaceGpxTags(source, "lat=\"", "\"", inPoint.getLatitude().output(Coordinate.FORMAT_DECIMAL_FORCE_POINT));
 		source = replaceGpxTags(source, "lon=\"", "\"", inPoint.getLongitude().output(Coordinate.FORMAT_DECIMAL_FORCE_POINT));
 		source = replaceGpxTags(source, "<ele>", "</ele>", inPoint.getAltitude().getStringValue(UnitSetLibrary.UNITS_METRES));
-		source = replaceGpxTags(source, "<time>", "</time>", inPoint.getTimestamp().getText(Timestamp.FORMAT_ISO_8601));
+		source = replaceGpxTags(source, "<time>", "</time>", inPoint.getTimestamp().getText(Timestamp.Format.ISO8601));
 		if (inPoint.isWaypoint())
 		{
-			source = replaceGpxTags(source, "<name>", "</name>", inPoint.getWaypointName());
-			source = replaceGpxTags(source, "<description>", "</description>",
+			source = replaceGpxTags(source, "<name>", "</name>", XmlUtils.fixCdata(inPoint.getWaypointName()));
+			if (source != null)
+			{
+				source = source.replaceAll("<description>", "<desc>").replaceAll("</description>", "</desc>");
+			}
+			source = replaceGpxTags(source, "<desc>", "</desc>",
 				XmlUtils.fixCdata(inPoint.getFieldValue(Field.DESCRIPTION)));
 		}
 		// photo / audio links
@@ -685,20 +688,20 @@ public class GpxExporter extends GenericFunction implements Runnable
 		if (inPoint.hasTimestamp() && inTimestamps)
 		{
 			inWriter.write("\t\t<time>");
-			inWriter.write(inPoint.getTimestamp().getText(Timestamp.FORMAT_ISO_8601));
+			inWriter.write(inPoint.getTimestamp().getText(Timestamp.Format.ISO8601));
 			inWriter.write("</time>\n");
 		}
 		// write waypoint name after elevation and time
 		inWriter.write("\t\t<name>");
-		inWriter.write(inPoint.getWaypointName().trim());
+		inWriter.write(XmlUtils.fixCdata(inPoint.getWaypointName().trim()));
 		inWriter.write("</name>\n");
 		// description, if any
 		String desc = XmlUtils.fixCdata(inPoint.getFieldValue(Field.DESCRIPTION));
 		if (desc != null && !desc.equals(""))
 		{
-			inWriter.write("\t\t<description>");
+			inWriter.write("\t\t<desc>");
 			inWriter.write(desc);
-			inWriter.write("</description>\n");
+			inWriter.write("</desc>\n");
 		}
 		// Media links, if any
 		if (inPhoto && inPoint.getPhoto() != null)
@@ -757,7 +760,7 @@ public class GpxExporter extends GenericFunction implements Runnable
 		if (inPoint.hasTimestamp() && inTimestamps)
 		{
 			inWriter.write("\t\t\t\t<time>");
-			inWriter.write(inPoint.getTimestamp().getText(Timestamp.FORMAT_ISO_8601));
+			inWriter.write(inPoint.getTimestamp().getText(Timestamp.Format.ISO8601));
 			inWriter.write("</time>\n");
 		}
 		// photo, audio