Changeset 6716 in josm for trunk/src/org/openstreetmap/josm/io/OsmServerLocationReader.java

Timestamp:

2014-01-17T21:23:07+01:00 (12 years ago)

Author:

simon04

Message:

Allow to read/write .gpx.bz2 files, refactor compression handling

File:

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

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

@@ -38 +38 @@
             this.progressMonitor = progressMonitor;
             this.compression = compression;
-        }
-        
-        protected final InputStream getUncompressedInputStream() throws IOException {
-            switch (compression) {
-                case BZIP2: return FileImporter.getBZip2InputStream(in);
-                case GZIP: return FileImporter.getGZipInputStream(in);
-                case NONE: 
-                default: return in;
-            }
         }
         
@@ -121 +112 @@
                 return null;
             progressMonitor.subTask(tr("Downloading OSM data..."));
-            return OsmReader.parseDataSet(getUncompressedInputStream(), progressMonitor.createSubTaskMonitor(1, false));
+            return OsmReader.parseDataSet(compression.getUncompressedInputStream(in), progressMonitor.createSubTaskMonitor(1, false));
         }
     }
@@ -136 +127 @@
                 return null;
             progressMonitor.subTask(tr("Downloading OSM data..."));
-            return OsmChangeReader.parseDataSet(getUncompressedInputStream(), progressMonitor.createSubTaskMonitor(1, false));
+            return OsmChangeReader.parseDataSet(compression.getUncompressedInputStream(in), progressMonitor.createSubTaskMonitor(1, false));
         }
     }
@@ -151 +142 @@
                 return null;
             progressMonitor.subTask(tr("Downloading OSM data..."));
-            GpxReader reader = new GpxReader(getUncompressedInputStream());
+            GpxReader reader = new GpxReader(compression.getUncompressedInputStream(in));
             gpxParsedProperly = reader.parse(false);
             GpxData result = reader.getGpxData();