Changeset 8782 in josm for trunk/src/org/openstreetmap

Timestamp:

2015-09-22T19:45:32+02:00 (9 years ago)

Author:

simon04

Message:

see #11428 - Extract Overpass request errors

Those error messages are nicely displayed in the error dialog.

This is a workaround for ​https://github.com/drolbr/Overpass-API/issues/94

File:

• trunk/src/org/openstreetmap/josm/io/OverpassDownloadReader.java (modified) (2 diffs)

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.io;
+
+import java.io.InputStream;
 
 import org.openstreetmap.josm.data.Bounds;
@@ -80 +82 @@
 
     @Override
+    protected InputStream getInputStreamRaw(String urlStr, ProgressMonitor progressMonitor, String reason,
+                                            boolean uncompressAccordingToContentDisposition) throws OsmTransferException {
+        try {
+            return super.getInputStreamRaw(urlStr, progressMonitor, reason, uncompressAccordingToContentDisposition);
+        } catch (OsmApiException ex) {
+            final String errorIndicator = "Error</strong>: ";
+            if (ex.getMessage() != null && ex.getMessage().contains(errorIndicator)) {
+                final String errorPlusRest = ex.getMessage().split(errorIndicator)[1];
+                if (errorPlusRest != null) {
+                    final String error = errorPlusRest.split("</")[0];
+                    ex.setErrorHeader(error);
+                }
+            }
+            throw ex;
+        }
+    }
+
+    @Override
     public DataSet parseOsm(ProgressMonitor progressMonitor) throws OsmTransferException {