Changeset 14219 in josm for trunk/src/org

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

Files:

• actions/downloadtasks/DownloadOsmTask.java (modified) (1 diff)
• data/osm/DataSet.java (modified) (2 diffs)
• io/OsmJsonReader.java (modified) (1 diff)
• io/OsmReader.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

@@ -471 +471 @@
                     rememberErrorMessage(tr("No data found in this area."));
                 }
+                String remark = dataSet.getRemark();
+                if (remark != null && !remark.isEmpty()) {
+                    rememberErrorMessage(remark);
+                }
                 // need to synthesize a download bounds lest the visual indication of downloaded area doesn't work
                 dataSet.addDataSource(new DataSource(currentBounds != null ? currentBounds :

trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -169 +169 @@
 
     private short mappaintCacheIdx = 1;
+    private String remark;
 
     /**
@@ -1231 +1232 @@
         }
     }
+
+    /**
+     * Returns an optional remark about this data set (used by Overpass API).
+     * @return a remark about this data set, or {@code null}
+     * @since 14219
+     */
+    public String getRemark() {
+        return remark;
+    }
+
+    /**
+     * Sets an optional remark about this data set (used by Overpass API).
+     * @param remark a remark about this data set, or {@code null}
+     * @since 14219
+     */
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 }

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;
+            }
         }
     }