Changeset 9308 in josm for trunk/src

Timestamp:

2016-01-04T20:09:51+01:00 (9 years ago)

Author:

simon04

Message:

fix #11693 - Overpass download: parse and use timeout from [timeout:X] parameter

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• OsmServerReader.java (modified) (2 diffs)
• OverpassDownloadReader.java (modified) (3 diffs)

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

@@ -124 +124 @@
             final HttpClient client = HttpClient.create(url);
             client.setReasonForRequest(reason);
+            adaptRequest(client);
             if (doAuthenticate) {
                 addAuth(client);
@@ -170 +171 @@
 
     /**
+     * Allows subclasses to modify the request.
+     * @param request the prepared request
+     * @since 9308
+     */
+    protected void adaptRequest(HttpClient request) {
+    }
+
+    /**
      * Download OSM files from somewhere
      * @param progressMonitor The progress monitor

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

@@ -5 +5 @@
 
 import java.io.InputStream;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import javax.xml.stream.XMLStreamConstants;
@@ -13 +15 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.tools.HttpClient;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -105 +108 @@
 
     @Override
+    protected void adaptRequest(HttpClient request) {
+        // see https://wiki.openstreetmap.org/wiki/Overpass_API/Overpass_QL#timeout
+        final Matcher timeoutMatcher = Pattern.compile("\\[timeout:(\\d+)\\]").matcher(overpassQuery);
+        if (timeoutMatcher.find()) {
+            final int timeout = 1000 * Integer.parseInt(timeoutMatcher.group(1));
+            request.setConnectTimeout(timeout);
+            request.setReadTimeout(timeout);
+        }
+    }
+
+    @Override
     protected String getTaskName() {
         return tr("Contacting Server...");