Changeset 14101 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2018-08-07T00:24:36+02:00 (6 years ago)

Author:

Don-vip

Message:

see #8765, fix #11086 - Support notes in osmChange (.osc) files created by OsmAnd

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• NoteReader.java (modified) (4 diffs)
• OsmChangeReader.java (modified) (5 diffs)

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

@@ -11 +11 @@
 import java.util.Locale;
 import java.util.Optional;
+import java.util.function.Function;
 
 import javax.xml.parsers.ParserConfigurationException;
@@ -85 +86 @@
             if (parseMode == NoteParseMode.API) {
                 if ("note".equals(qName)) {
-                    double lat = Double.parseDouble(attrs.getValue("lat"));
-                    double lon = Double.parseDouble(attrs.getValue("lon"));
-                    LatLon noteLatLon = new LatLon(lat, lon);
-                    thisNote = new Note(noteLatLon);
+                    thisNote = parseNoteBasic(attrs);
                 }
                 return;
@@ -96 +94 @@
             switch(qName) {
             case "note":
-                double lat = Double.parseDouble(attrs.getValue("lat"));
-                double lon = Double.parseDouble(attrs.getValue("lon"));
-                LatLon noteLatLon = new LatLon(lat, lon);
-                thisNote = new Note(noteLatLon);
-                thisNote.setId(Long.parseLong(attrs.getValue("id")));
-                String closedTimeStr = attrs.getValue("closed_at");
-                if (closedTimeStr == null) { //no closed_at means the note is still open
-                    thisNote.setState(Note.State.OPEN);
-                } else {
-                    thisNote.setState(Note.State.CLOSED);
-                    thisNote.setClosedAt(DateUtils.fromString(closedTimeStr));
-                }
-                thisNote.setCreatedAt(DateUtils.fromString(attrs.getValue("created_at")));
+                thisNote = parseNoteFull(attrs);
                 break;
             case "comment":
@@ -188 +174 @@
             parsedNotes = notes;
         }
+    }
+
+    static LatLon parseLatLon(Function<String, String> attrs) {
+        double lat = Double.parseDouble(attrs.apply("lat"));
+        double lon = Double.parseDouble(attrs.apply("lon"));
+        return new LatLon(lat, lon);
+    }
+
+    static Note parseNoteBasic(Attributes attrs) {
+        return parseNoteBasic(attrs::getValue);
+    }
+
+    static Note parseNoteBasic(Function<String, String> attrs) {
+        return new Note(parseLatLon(attrs));
+    }
+
+    static Note parseNoteFull(Attributes attrs) {
+        return parseNoteFull(attrs::getValue);
+    }
+
+    static Note parseNoteFull(Function<String, String> attrs) {
+        Note note = parseNoteBasic(attrs);
+        String id = attrs.apply("id");
+        if (id != null) {
+            note.setId(Long.parseLong(id));
+        }
+        String closedTimeStr = attrs.apply("closed_at");
+        if (closedTimeStr == null) { //no closed_at means the note is still open
+            note.setState(Note.State.OPEN);
+        } else {
+            note.setState(Note.State.CLOSED);
+            note.setClosedAt(DateUtils.fromString(closedTimeStr));
+        }
+        String createdAt = attrs.apply("created_at");
+        if (createdAt != null) {
+            note.setCreatedAt(DateUtils.fromString(createdAt));
+        }
+        return note;
     }
 

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

@@ -10 +10 @@
 import javax.xml.stream.XMLStreamException;
 
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.NoteData;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.tools.Pair;
 
 /**
@@ -23 +26 @@
      */
     private static final String[] ACTIONS = {"create", "modify", "delete"};
+
+    protected final NoteData noteData = new NoteData();
 
     /**
@@ -80 +85 @@
                     p = parseRelation();
                     break;
+                case "note":
+                    parseNote();
+                    break;
                 default:
                     parseUnknown();
@@ -96 +104 @@
     }
 
+    private void parseNote() throws XMLStreamException {
+        LatLon location = NoteReader.parseLatLon(s -> parser.getAttributeValue(null, s));
+        String text = null;
+        while (parser.hasNext()) {
+            int event = parser.next();
+            if (event == XMLStreamConstants.START_ELEMENT) {
+                switch (parser.getLocalName()) {
+                case "comment":
+                    text = parser.getAttributeValue(null, "text");
+                    break;
+                default:
+                    parseUnknown();
+                }
+            } else if (event == XMLStreamConstants.END_ELEMENT) {
+                break;
+            }
+        }
+        if (location != null && text != null) {
+            noteData.createNote(location, text);
+        }
+    }
+
+    /**
+     * Replies the parsed notes data.
+     * @return the parsed notes data
+     * @since 14101
+     */
+    public final NoteData getNoteData() {
+        return noteData;
+    }
+
     /**
      * Parse the given input source and return the dataset.
@@ -110 +149 @@
         return new OsmChangeReader().doParseDataSet(source, progressMonitor);
     }
+
+    /**
+     * Parse the given input source and return the dataset and notes, if any (OsmAnd extends the osmChange format by adding notes).
+     *
+     * @param source the source input stream. Must not be <code>null</code>.
+     * @param progressMonitor  the progress monitor. If <code>null</code>,
+     * {@link org.openstreetmap.josm.gui.progress.NullProgressMonitor#INSTANCE} is assumed
+     *
+     * @return the dataset with the parsed data
+     * @throws IllegalDataException if the an error was found while parsing the data from the source
+     * @throws IllegalArgumentException if source is <code>null</code>
+     * @since 14101
+     */
+    public static Pair<DataSet, NoteData> parseDataSetAndNotes(InputStream source, ProgressMonitor progressMonitor)
+            throws IllegalDataException {
+        OsmChangeReader osmChangeReader = new OsmChangeReader();
+        osmChangeReader.doParseDataSet(source, progressMonitor);
+        return new Pair<>(osmChangeReader.getDataSet(), osmChangeReader.getNoteData());
+    }
 }