Version 19, May 2018

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

diff --git a/tim/prune/save/KmlExporter.java b/tim/prune/save/KmlExporter.java
index 802183427fd0212300ac91314cc4c8afb1e60f20..9d1c0789b4f4d9a3e6820f5883b7f7235bac74ab 100644 (file)
--- a/tim/prune/save/KmlExporter.java
+++ b/tim/prune/save/KmlExporter.java
@@ -51,11 +51,11 @@ import tim.prune.data.Timestamp;
 import tim.prune.data.Track;
 import tim.prune.data.TrackInfo;
 import tim.prune.data.UnitSetLibrary;
-import tim.prune.gui.ColourChooser;
-import tim.prune.gui.ColourPatch;
 import tim.prune.gui.DialogCloser;
 import tim.prune.gui.ImageUtils;
 import tim.prune.gui.WholeNumberField;
+import tim.prune.gui.colour.ColourChooser;
+import tim.prune.gui.colour.ColourPatch;
 import tim.prune.load.GenericFileFilter;
 import tim.prune.save.xml.XmlUtils;
 
@@ -483,7 +483,7 @@ public class KmlExporter extends GenericFunction implements Runnable
                inWriter.write("<Folder>\n\t<name>");
                if (_descriptionField != null && _descriptionField.getText() != null && !_descriptionField.getText().equals(""))
                {
-                       inWriter.write(_descriptionField.getText());
+                       inWriter.write(XmlUtils.fixCdata(_descriptionField.getText()));
                }
                else {
                        inWriter.write("Export from GpsPrune");
@@ -562,7 +562,7 @@ public class KmlExporter extends GenericFunction implements Runnable
                                numSaved += writeStandardTrack(inWriter, absoluteAltitudes, selStart, selEnd);
                        }
                }
-               inWriter.write("</Folder>\n</kml>");
+               inWriter.write("</Folder>\n</kml>\n");
                return numSaved;
        }
 
@@ -684,7 +684,7 @@ public class KmlExporter extends GenericFunction implements Runnable
                                        // Add timestamp (if any) to the list
                                        whenList.append("<when>");
                                        if (point.hasTimestamp()) {
-                                               whenList.append(point.getTimestamp().getText(Timestamp.FORMAT_ISO_8601));
+                                               whenList.append(point.getTimestamp().getText(Timestamp.Format.ISO8601, null));
                                        }
                                        whenList.append("</when>\n");
                                        // Add coordinates to the list
@@ -799,7 +799,7 @@ public class KmlExporter extends GenericFunction implements Runnable
        throws IOException
        {
                inWriter.write("\t<Placemark>\n\t\t<name>");
-               inWriter.write(inName);
+               inWriter.write(XmlUtils.fixCdata(inName));
                inWriter.write("</name>\n");
                if (inDesc != null)
                {