Changeset 12596 in josm for trunk/src/org/openstreetmap/josm/io/OverpassDownloadReader.java

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

File:

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

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>: ";