Changeset 11984 in josm for trunk/src

Timestamp:

2017-04-23T14:45:06+02:00 (7 years ago)

Author:

stoecker

Message:

improve overpass API rate limit message, fix wrong timeout error message

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/ExceptionDialogUtil.java (modified) (2 diffs)
• io/OverpassDownloadReader.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java

@@ -362 +362 @@
         HelpAwareOptionPane.showOptionDialog(
                 Main.parent,
-                ExceptionUtil.explainClientTimeout(e),
+                ExceptionUtil.explainGeneric(e),
                 tr("Communication with OSM server failed"),
                 JOptionPane.ERROR_MESSAGE,
@@ -477 +477 @@
                 explainClientTimeout(oae);
                 return;
-            case 509:
+            case 509: case 429:
                 explainBandwidthLimitExceeded(oae);
                 return;

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

@@ -201 +201 @@
                 final String errorPlusRest = ex.getMessage().split(errorIndicator)[1];
                 if (errorPlusRest != null) {
-                    final String error = errorPlusRest.split("</")[0];
+                    final String error = errorPlusRest.split("</")[0].replaceAll(".*::request_read_and_idx::","");
                     ex.setErrorHeader(error);
                 }