Version 20.4, May 2021

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

diff --git a/src/tim/prune/save/GpxExporter.java b/src/tim/prune/save/GpxExporter.java
index 88ac7914c29a1b92a235ff426e782f07ca4fcae3..f7de8f73485ee87fba0789730a4c0e20b85243eb 100644 (file)
--- a/src/tim/prune/save/GpxExporter.java
+++ b/src/tim/prune/save/GpxExporter.java
@@ -347,6 +347,7 @@ public class GpxExporter extends GenericFunction implements Runnable
                                 + " " + _exportFile.getAbsolutePath());
                        // export successful so need to close dialog and return
                        _dialog.dispose();
+                       _app.informDataSaved();
                        return;
                }
                catch (IOException ioe)
@@ -583,6 +584,7 @@ public class GpxExporter extends GenericFunction implements Runnable
                        }
                        source = replaceGpxTags(source, "<desc>", "</desc>",
                                XmlUtils.fixCdata(inPoint.getFieldValue(Field.DESCRIPTION)));
+                       source = replaceGpxTags(source, "<cmt>", "</cmt>", inPoint.getFieldValue(Field.COMMENT));
                }
                // photo / audio links
                if (source != null && (inPoint.hasMedia() || source.indexOf("</link>") > 0)) {
@@ -733,13 +735,21 @@ public class GpxExporter extends GenericFunction implements Runnable
                inWriter.write(XmlUtils.fixCdata(inPoint.getWaypointName().trim()));
                inWriter.write("</name>\n");
                // description, if any
-               String desc = XmlUtils.fixCdata(inPoint.getFieldValue(Field.DESCRIPTION));
+               final String desc = XmlUtils.fixCdata(inPoint.getFieldValue(Field.DESCRIPTION));
                if (desc != null && !desc.equals(""))
                {
                        inWriter.write("\t\t<desc>");
                        inWriter.write(desc);
                        inWriter.write("</desc>\n");
                }
+               // comment, if any
+               final String comment = XmlUtils.fixCdata(inPoint.getFieldValue(Field.COMMENT));
+               if (comment != null && !comment.equals(""))
+               {
+                       inWriter.write("\t\t<cmt>");
+                       inWriter.write(comment);
+                       inWriter.write("</cmt>\n");
+               }
                // Media links, if any
                if (inSettings.getExportPhotoPoints() && inPoint.getPhoto() != null)
                {