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

Timestamp:

2018-09-02T21:53:46+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #16695 - display remark from Overpass API when a download returns no data

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• OsmJsonReader.java (modified) (1 diff)
• OsmReader.java (modified) (3 diffs)

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

@@ -67 +67 @@
         parseLocked(object.getString("locked", null));
         parseElements(object.getJsonArray("elements"));
+        parseRemark(object.getString("remark", null));
+    }
+
+    private void parseRemark(String remark) {
+        ds.setRemark(remark);
     }
 

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

@@ -103 +103 @@
             uploadChangesetId = getLong("upload-changeset");
         }
-        while (true) {
+        while (parser.hasNext()) {
             int event = parser.next();
 
@@ -127 +127 @@
                 case "changeset":
                     parseChangeset(uploadChangesetId);
+                    break;
+                case "remark": // Used by Overpass API
+                    parseRemark();
                     break;
                 default:
@@ -143 +146 @@
         } else {
             throwException(e);
+        }
+    }
+
+    private void parseRemark() throws XMLStreamException {
+        while (parser.hasNext()) {
+            int event = parser.next();
+            if (event == XMLStreamConstants.CHARACTERS) {
+                ds.setRemark(parser.getText());
+            } else if (event == XMLStreamConstants.END_ELEMENT) {
+                return;
+            }
         }
     }