Changeset 6803 in josm for trunk/src

Timestamp:

2014-02-02T23:23:27+01:00 (11 years ago)

Author:

simon04

Message:

fix #9660 - Allow to download compressed GPX tracks from osm.org/trace/ using "Download location"

This works by inspecting the filename in the Content-Disposition HTTP header.

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/OpenLocationAction.java (modified) (1 diff)
• actions/downloadtasks/DownloadGpsTask.java (modified) (4 diffs)
• io/OsmServerLocationReader.java (modified) (1 diff)
• io/OsmServerReader.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java

@@ -184 +184 @@
             // TODO: handle multiple suitable tasks ?
             try {
-                future = tasks.iterator().next().loadUrl(new_layer, url, monitor);
+                task = tasks.iterator().next();
+                future = task.loadUrl(new_layer, url, monitor);
             } catch (IllegalArgumentException e) {
                 Main.error(e);

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java

@@ -59 +59 @@
     public Future<?> download(boolean newLayer, Bounds downloadArea, ProgressMonitor progressMonitor) {
         downloadTask = new DownloadTask(newLayer,
-                new BoundingBoxDownloader(downloadArea), progressMonitor, false);
+                new BoundingBoxDownloader(downloadArea), progressMonitor);
         // We need submit instead of execute so we can wait for it to finish and get the error
         // message if necessary. If no one calls getErrorMessage() it just behaves like execute.
@@ -70 +70 @@
         if (url.matches(PATTERN_TRACE_ID) || url.matches(PATTERN_EXTERNAL_GPX_SCRIPT) || url.matches(PATTERN_EXTERNAL_GPX_FILE)) {
             downloadTask = new DownloadTask(newLayer,
-                    new OsmServerLocationReader(url), progressMonitor, url.matches(PATTERN_TRACE_ID));
+                    new OsmServerLocationReader(url), progressMonitor);
             // Extract .gpx filename from URL to set the new layer name
             Matcher matcher = Pattern.compile(PATTERN_EXTERNAL_GPX_FILE).matcher(url);
@@ -99 +99 @@
         private GpxData rawData;
         private final boolean newLayer;
-        private final boolean compressed;
-
-        public DownloadTask(boolean newLayer, OsmServerReader reader, ProgressMonitor progressMonitor, boolean compressed) {
+
+        public DownloadTask(boolean newLayer, OsmServerReader reader, ProgressMonitor progressMonitor) {
             super(tr("Downloading GPS data"));
             this.reader = reader;
             this.newLayer = newLayer;
-            this.compressed = compressed;
         }
 
@@ -113 +111 @@
                     return;
                 ProgressMonitor subMonitor = progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false);
-                if (compressed) {
-                    rawData = reader.parseRawGpsBzip2(subMonitor);
-                } else {
-                    rawData = reader.parseRawGps(subMonitor);
-                }
+                rawData = reader.parseRawGps(subMonitor);
             } catch(Exception e) {
                 if (isCanceled())

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

@@ -138 +138 @@
         @Override
         public GpxData parse() throws OsmTransferException, IllegalDataException, IOException, SAXException {
-            in = getInputStreamRaw(url, progressMonitor.createSubTaskMonitor(1, true));
+            in = getInputStreamRaw(url, progressMonitor.createSubTaskMonitor(1, true), null, true);
             if (in == null)
                 return null;

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

@@ -11 +11 @@
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.List;
+import java.util.Map;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.Inflater;
@@ -98 +100 @@
      */
     protected InputStream getInputStreamRaw(String urlStr, ProgressMonitor progressMonitor, String reason) throws OsmTransferException {
+        return getInputStreamRaw(urlStr, progressMonitor, reason, false);
+    }
+
+    /**
+     * Open a connection to the given url 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.
+     * @return An reader reading the input stream (servers answer) or <code>null</code>.
+     * @throws OsmTransferException thrown if data transfer errors occur
+     */
+    protected InputStream getInputStreamRaw(String urlStr, ProgressMonitor progressMonitor, String reason, boolean uncompressAccordingToContentDisposition) throws OsmTransferException {
         try {
             URL url = null;
@@ -141 +158 @@
             }
             try {
+                Main.debug(activeConnection.getHeaderFields().toString());
                 if (activeConnection.getResponseCode() == HttpURLConnection.HTTP_UNAUTHORIZED)
                     throw new OsmApiException(HttpURLConnection.HTTP_UNAUTHORIZED,null,null);
@@ -169 +187 @@
                 }
 
-                return fixEncoding(new ProgressInputStream(activeConnection, progressMonitor), encoding);
+                InputStream in = new ProgressInputStream(activeConnection, progressMonitor);
+                if (uncompressAccordingToContentDisposition) {
+                    in = uncompressAccordingToContentDisposition(in, activeConnection.getHeaderFields());
+                }
+                return fixEncoding(in, encoding);
             } catch (OsmTransferException e) {
                 throw e;
@@ -189 +211 @@
     }
 
+    private InputStream uncompressAccordingToContentDisposition(InputStream stream, Map<String, List<String>> headerFields) throws IOException {
+        if (headerFields.get("Content-Disposition").toString().contains(".gz\"")) {
+            return Compression.GZIP.getUncompressedInputStream(stream);
+        } else if (headerFields.get("Content-Disposition").toString().contains(".bz2\"")) {
+            return Compression.BZIP2.getUncompressedInputStream(stream);
+        } else {
+            return stream;
+        }
+    }
+
     /**
      * Download OSM files from somewhere