Version 18, July 2015

[GpsPrune.git] / tim / prune / save / GpxExporter.java

diff --git a/tim/prune/save/GpxExporter.java b/tim/prune/save/GpxExporter.java
index 0f038b77ce60f473a50a64b068c68b698f5b2050..584d9ba5e7ab628129d3002077bc4648f4a059ac 100644 (file)
--- a/tim/prune/save/GpxExporter.java
+++ b/tim/prune/save/GpxExporter.java
@@ -539,7 +539,11 @@ public class GpxExporter extends GenericFunction implements Runnable
                if (inPoint.isWaypoint())
                {
                        source = replaceGpxTags(source, "<name>", "</name>", inPoint.getWaypointName());
                if (inPoint.isWaypoint())
                {
                        source = replaceGpxTags(source, "<name>", "</name>", inPoint.getWaypointName());

-                       source = replaceGpxTags(source, "<description>", "</description>",
+                       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
                                XmlUtils.fixCdata(inPoint.getFieldValue(Field.DESCRIPTION)));
                }
                // photo / audio links


@@ -696,9 +700,9 @@ public class GpxExporter extends GenericFunction implements Runnable
                String desc = XmlUtils.fixCdata(inPoint.getFieldValue(Field.DESCRIPTION));
                if (desc != null && !desc.equals(""))
                {
                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(desc);

-                       inWriter.write("</description>\n");
+                       inWriter.write("</desc>\n");

                }
                // Media links, if any
                if (inPhoto && inPoint.getPhoto() != null)
                }
                // Media links, if any
                if (inPhoto && inPoint.getPhoto() != null)