Changeset 6882 in josm for trunk/src/org/openstreetmap/josm/actions/downloadtasks

Timestamp:

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

Author:

Don-vip

Message:

enable loading of .osm.zip files

File:

• trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmCompressedTask.java (modified) (3 diffs)

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);
     }