Changeset 13903 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2018-06-09T00:36:19+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16368 - export lat/lon and timestamps in .osn files as we do in .osm files: locale-independent

File:

• trunk/src/org/openstreetmap/josm/io/NoteWriter.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/io/NoteWriter.java

@@ -7 +7 @@
 import java.io.PrintWriter;
 import java.nio.charset.StandardCharsets;
-import java.text.DateFormat;
 
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.notes.Note;
 import org.openstreetmap.josm.data.notes.NoteComment;
@@ -20 +20 @@
  * attribute in the comment element to indicate if the comment is a new local
  * comment that has not been uploaded to the OSM server yet.
+ * @since 7732
  */
 public class NoteWriter extends XmlWriter {
-
-    private final DateFormat iso8601Format = DateUtils.newIsoDateTimeFormat();
 
     /**
@@ -49 +48 @@
         out.println("<osm-notes>");
         for (Note note : data.getNotes()) {
+            LatLon ll = note.getLatLon();
             out.print("  <note ");
             out.print("id=\"" + note.getId() + "\" ");
-            out.print("lat=\"" + note.getLatLon().lat() + "\" ");
-            out.print("lon=\"" + note.getLatLon().lon() + "\" ");
-            out.print("created_at=\"" + iso8601Format.format(note.getCreatedAt()) + "\" ");
+            out.print("lat=\"" + LatLon.cDdHighPecisionFormatter.format(ll.lat()) + "\" ");
+            out.print("lon=\"" + LatLon.cDdHighPecisionFormatter.format(ll.lon()) + "\" ");
+            out.print("created_at=\"" + DateUtils.fromDate(note.getCreatedAt()) + "\" ");
             if (note.getClosedAt() != null) {
-                out.print("closed_at=\"" + iso8601Format.format(note.getClosedAt()) + "\" ");
+                out.print("closed_at=\"" + DateUtils.fromDate(note.getClosedAt()) + "\" ");
             }
 
@@ -72 +72 @@
         out.print("    <comment");
         out.print(" action=\"" + comment.getNoteAction() + "\" ");
-        out.print("timestamp=\"" + iso8601Format.format(comment.getCommentTimestamp()) + "\" ");
+        out.print("timestamp=\"" + DateUtils.fromDate(comment.getCommentTimestamp()) + "\" ");
         if (comment.getUser() != null && !comment.getUser().equals(User.getAnonymous())) {
             out.print("uid=\"" + comment.getUser().getId() + "\" ");