Changeset 6882 in josm for trunk/src

Timestamp:

2014-02-25T00:21:39+01:00 (11 years ago)

Author:

Don-vip

Message:

enable loading of .osm.zip files

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/ExtensionFileFilter.java (modified) (1 diff)
• actions/downloadtasks/DownloadOsmCompressedTask.java (modified) (3 diffs)
• io/Compression.java (modified) (5 diffs)
• io/FileImporter.java (modified) (2 diffs)
• io/OsmServerLocationReader.java (modified) (1 diff)
• io/OsmServerReader.java (modified) (1 diff)
• io/OsmZipImporter.java (added)

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

@@ -48 +48 @@
                 "org.openstreetmap.josm.io.OsmImporter",
                 "org.openstreetmap.josm.io.OsmGzipImporter",
+                "org.openstreetmap.josm.io.OsmZipImporter",
                 "org.openstreetmap.josm.io.OsmChangeImporter",
                 "org.openstreetmap.josm.io.GpxImporter",

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

@@ -19 +19 @@
 public class DownloadOsmCompressedTask extends DownloadOsmTask {
 
-    static final String PATTERN_GZ =  "https?://.*/.*\\.osm.(gz|bz2?)";
+    static final String PATTERN_COMPRESS =  "https?://.*/.*\\.osm.(gz|bz2?|zip)";
 
     @Override
     public String[] getPatterns() {
-        return new String[]{PATTERN_GZ};
+        return new String[]{PATTERN_COMPRESS};
     }
 
@@ -31 +31 @@
     }
     
-    /* (non-Javadoc)
-     * @see org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask#download(boolean, org.openstreetmap.josm.data.Bounds, org.openstreetmap.josm.gui.progress.ProgressMonitor)
-     */
     @Override
     public Future<?> download(boolean newLayer, Bounds downloadArea,
@@ -54 +51 @@
                 if (url.matches("https?://.*/.*\\.osm.bz2?")) {
                     return reader.parseOsmBzip2(subTaskMonitor);
+                } else if (url.matches("https?://.*/.*\\.osm.gz")) {
+                    return reader.parseOsmGzip(subTaskMonitor);
                 } else {
-                    return reader.parseOsmGzip(subTaskMonitor);
+                    return reader.parseOsmZip(subTaskMonitor);
                 }
             }
         };
         currentBounds = null;
-        // Extract .osm.gz/bz/bz2 filename from URL to set the new layer name
-        extractOsmFilename("https?://.*/(.*\\.osm.(gz|bz2?))", url);
+        // Extract .osm.gz/bz/bz2/zip filename from URL to set the new layer name
+        extractOsmFilename("https?://.*/(.*\\.osm.(gz|bz2?|zip))", url);
         return Main.worker.submit(downloadTask);
     }

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

@@ -13 +13 @@
 import java.net.URL;
 import java.util.zip.GZIPOutputStream;
+import java.util.zip.ZipOutputStream;
 
 /**
@@ -29 +30 @@
      * gzip compression
      */
-    GZIP;
+    GZIP,
+    /**
+     * zip compression
+     */
+    ZIP;
 
     /**
      * Determines the compression type depending on the suffix of {@code name}.
+     * @param name File name including extension
+     * @return the compression type
      */
     public static Compression byExtension(String name) {
@@ -39 +46 @@
                 : name != null && (name.endsWith(".bz2") || name.endsWith(".bz"))
                 ? BZIP2
+                : name != null && name.endsWith(".zip")
+                ? ZIP
                 : NONE;
     }
@@ -53 +62 @@
             case GZIP:
                 return FileImporter.getGZipInputStream(in);
+            case ZIP:
+                return FileImporter.getZipInputStream(in);
             case NONE:
             default:
@@ -90 +101 @@
             case GZIP:
                 return new GZIPOutputStream(out);
+            case ZIP:
+                return new ZipOutputStream(out);
             case NONE:
             default:

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

@@ -10 +10 @@
 import java.util.List;
 import java.util.zip.GZIPInputStream;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
 
 import javax.swing.JOptionPane;
@@ -156 +158 @@
     }
 
+    public static ZipInputStream getZipInputStream(InputStream in) throws IOException {
+        if (in == null) {
+            return null;
+        }
+        ZipInputStream zis = new ZipInputStream(in);
+        // Positions the stream at the beginning of first entry
+        ZipEntry ze = zis.getNextEntry();
+        if (ze != null && Main.isDebugEnabled()) {
+            Main.debug("Zip entry: "+ze.getName());
+        }
+        return zis;
+    }
+
     /**
      * Returns the enabled state of this {@code FileImporter}. When enabled, it is listed and usable in "File->Open" dialog.

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

@@ -77 +77 @@
 
     @Override
+    public DataSet parseOsmZip(final ProgressMonitor progressMonitor) throws OsmTransferException {
+        return doParse(new OsmParser(progressMonitor, Compression.ZIP), progressMonitor);
+    }
+
+    @Override
     public DataSet parseOsmChange(final ProgressMonitor progressMonitor) throws OsmTransferException {
         return doParse(new OsmChangeParser(progressMonitor, Compression.NONE), progressMonitor);

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

@@ -303 +303 @@
 
     /**
+     * Download Zip-compressed OSM files from somewhere
+     * @param progressMonitor The progress monitor
+     * @return The corresponding dataset
+     * @throws OsmTransferException if any error occurs
+     * @since 6882
+     */
+    public DataSet parseOsmZip(final ProgressMonitor progressMonitor) throws OsmTransferException {
+        return null;
+    }
+
+    /**
      * Returns true if this reader is adding authentication credentials to the read
      * request sent to the server.