Changeset 8788 in josm for trunk/src/org

Timestamp:

2015-09-22T23:13:53+02:00 (9 years ago)

Author:

simon04

Message:

fix #10947 - "No data found in this area." message when Overpass query times out

Detect "runtime error" in the <remark> element of the returned XML.

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• BoundingBoxDownloader.java (modified) (4 diffs)
• OverpassDownloadReader.java (modified) (2 diffs)

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

@@ -126 +126 @@
     }
 
+    /**
+     * Parse the given input source and return the dataset.
+     *
+     * @see OsmReader#parseDataSet(InputStream, ProgressMonitor)
+     */
+    protected DataSet parseDataSet(InputStream source, ProgressMonitor progressMonitor) throws IllegalDataException {
+        return OsmReader.parseDataSet(source, progressMonitor);
+    }
+
     @Override
     public DataSet parseOsm(ProgressMonitor progressMonitor) throws OsmTransferException {
@@ -140 +149 @@
                     if (in == null)
                         return null;
-                    ds = OsmReader.parseDataSet(in, progressMonitor.createSubTaskMonitor(1, false));
+                    ds = parseDataSet(in, progressMonitor.createSubTaskMonitor(1, false));
                 }
 
@@ -147 +156 @@
                     if (in == null)
                         return null;
-                    ds2 = OsmReader.parseDataSet(in, progressMonitor.createSubTaskMonitor(1, false));
+                    ds2 = parseDataSet(in, progressMonitor.createSubTaskMonitor(1, false));
                 }
                 if (ds2 == null)
@@ -159 +168 @@
                     if (in == null)
                         return null;
-                    ds = OsmReader.parseDataSet(in, progressMonitor.createSubTaskMonitor(1, false));
+                    ds = parseDataSet(in, progressMonitor.createSubTaskMonitor(1, false));
                 }
             }

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

@@ -5 +5 @@
 
 import java.io.InputStream;
+
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
 
 import org.openstreetmap.josm.data.Bounds;
@@ -107 +110 @@
 
     @Override
+    protected DataSet parseDataSet(InputStream source, ProgressMonitor progressMonitor) throws IllegalDataException {
+        return new OsmReader() {
+            @Override
+            protected void parseUnknown(boolean printWarning) throws XMLStreamException {
+                if ("remark".equals(parser.getLocalName())) {
+                    if (parser.getEventType() == XMLStreamConstants.START_ELEMENT) {
+                        final String text = parser.getElementText();
+                        if (text.contains("runtime error")) {
+                            throw new XMLStreamException(text);
+                        }
+                    }
+                }
+                super.parseUnknown(printWarning);
+            }
+        }.doParseDataSet(source, progressMonitor);
+    }
+
+    @Override
     public DataSet parseOsm(ProgressMonitor progressMonitor) throws OsmTransferException {