Changeset 12596 in josm

Timestamp:

2017-08-13T00:24:03+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #15141 - Make HTTP POST requests to Overpass API - allows longer/more complex queries

Location:

trunk/src/org/openstreetmap/josm/io

Files:

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

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

@@ -119 +119 @@
 
     /**
-     * Open a connection to the given url and return a reader on the input stream
+     * Open a connection to the given url (if HTTP, trough a GET request) and return a reader on the input stream
      * from that connection. In case of user cancel, return <code>null</code>.
      * @param urlStr The exact url to connect to.
@@ -129 +129 @@
      * @throws OsmTransferException if data transfer errors occur
      */
+    protected InputStream getInputStreamRaw(String urlStr, ProgressMonitor progressMonitor, String reason,
+            boolean uncompressAccordingToContentDisposition) throws OsmTransferException {
+        return getInputStreamRaw(urlStr, progressMonitor, reason, uncompressAccordingToContentDisposition, "GET", null);
+    }
+
+    /**
+     * Open a connection to the given url (if HTTP, with the specified method) and return a reader on the input stream
+     * from that connection. In case of user cancel, return <code>null</code>.
+     * @param urlStr The exact url to connect to.
+     * @param progressMonitor progress monitoring and abort handler
+     * @param reason The reason to show on console. Can be {@code null} if no reason is given
+     * @param uncompressAccordingToContentDisposition Whether to inspect the HTTP header {@code Content-Disposition}
+     *                                                for {@code filename} and uncompress a gzip/bzip2 stream.
+     * @param httpMethod HTTP method ("GET", "POST" or "PUT")
+     * @param requestBody HTTP request body (for "POST" and "PUT" methods only). Must be null for "GET" method.
+     * @return An reader reading the input stream (servers answer) or <code>null</code>.
+     * @throws OsmTransferException if data transfer errors occur
+     * @since 12596
+     */
     @SuppressWarnings("resource")
     protected InputStream getInputStreamRaw(String urlStr, ProgressMonitor progressMonitor, String reason,
-            boolean uncompressAccordingToContentDisposition) throws OsmTransferException {
+            boolean uncompressAccordingToContentDisposition, String httpMethod, byte[] requestBody) throws OsmTransferException {
         try {
             OnlineResource.JOSM_WEBSITE.checkOfflineAccess(urlStr, Main.getJOSMWebsite());
@@ -151 +170 @@
             }
 
-            final HttpClient client = HttpClient.create(url);
+            final HttpClient client = HttpClient.create(url, httpMethod)
+                    .setFinishOnCloseOutput(false)
+                    .setReasonForRequest(reason)
+                    .setRequestBody(requestBody);
             activeConnection = client;
-            client.setReasonForRequest(reason);
             adaptRequest(client);
             if (doAuthenticate) {

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

@@ -6 +6 @@
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.EnumMap;
 import java.util.Map;
@@ -35 +36 @@
  */
 public class OverpassDownloadReader extends BoundingBoxDownloader {
+
+    private static final String DATA_PREFIX = "?data=";
 
     static final class OverpassOsmReader extends OsmReader {
@@ -144 +147 @@
             final String query = this.overpassQuery.replace("{{bbox}}", lat1 + "," + lon1 + "," + lat2 + "," + lon2);
             final String expandedOverpassQuery = expandExtendedQueries(query);
-            return "interpreter?data=" + Utils.encodeUrl(expandedOverpassQuery);
+            return "interpreter" + DATA_PREFIX + Utils.encodeUrl(expandedOverpassQuery);
         }
     }
@@ -195 +198 @@
                                             boolean uncompressAccordingToContentDisposition) throws OsmTransferException {
         try {
-            return super.getInputStreamRaw(urlStr, progressMonitor, reason, uncompressAccordingToContentDisposition);
+            int index = urlStr.indexOf(DATA_PREFIX);
+            // Make an HTTP POST request instead of a simple GET, allows more complex queries
+            return super.getInputStreamRaw(urlStr.substring(0, index),
+                    progressMonitor, reason, uncompressAccordingToContentDisposition,
+                    "POST", Utils.decodeUrl(urlStr.substring(index + DATA_PREFIX.length())).getBytes(StandardCharsets.UTF_8));
         } catch (OsmApiException ex) {
             final String errorIndicator = "Error</strong>: ";