Changeset 14266 in josm

Timestamp:

2018-09-21T21:53:17+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16762 - support multiple notes in .osc files created by OsmAnd

Location:

trunk

Files:

• src/org/openstreetmap/josm/io/OsmChangeReader.java (modified) (1 diff)
• src/org/openstreetmap/josm/io/OsmReader.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/io/OsmChangeReaderTest.java (modified) (2 diffs)

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

@@ -113 +113 @@
                 case "comment":
                     text = parser.getAttributeValue(null, "text");
+                    jumpToEnd();
                     break;
                 default:

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

@@ -366 +366 @@
      * @throws XMLStreamException if there is an error processing the underlying XML source
      */
-    private void jumpToEnd(boolean printWarning) throws XMLStreamException {
+    protected final void jumpToEnd(boolean printWarning) throws XMLStreamException {
         while (true) {
             int event = parser.next();
@@ -376 +376 @@
     }
 
-    private void jumpToEnd() throws XMLStreamException {
+    protected final void jumpToEnd() throws XMLStreamException {
         jumpToEnd(true);
     }

trunk/test/unit/org/openstreetmap/josm/io/OsmChangeReaderTest.java

@@ -8 +8 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Collection;
+import java.util.Iterator;
 
 import org.junit.Rule;
@@ -59 +60 @@
                 "      <comment text=\"something\" />\r\n" +
                 "    </note>\r\n" +
+                "    <note lat=\"50.5\" lon=\"13.5\" id=\"-3\">\r\n" +
+                "      <comment text=\"something else\" />\r\n" +
+                "    </note>\r\n" +
                 "  </create>\r\n" +
                 "  <modify />\r\n" +
                 "  <delete />").b;
-        Collection<Note> notes = nd.getNotes();
-        assertEquals(1, notes.size());
-        Note n = notes.iterator().next();
+        Collection<Note> notes = nd.getSortedNotes();
+        assertEquals(2, notes.size());
+        Iterator<Note> iterator = notes.iterator();
+        Note n = iterator.next();
         assertEquals(new LatLon(50.23887555404037, 13.358299552342795), n.getLatLon());
         assertEquals("something", n.getFirstComment().getText());
+        n = iterator.next();
+        assertEquals(new LatLon(50.5, 13.5), n.getLatLon());
+        assertEquals("something else", n.getFirstComment().getText());
     }
 }