Changeset 1653 in josm

Timestamp:

Jun 7, 2009 4:18:31 PM (4 years ago)

Author:

stoecker

Message:

add support for compressed OSM files (bzip2, gzip)

Location:

trunk/src/org

Files:

• apache (added)
• apache/tools (added)
• openstreetmap/josm/actions/ExtensionFileFilter.java (modified) (2 diffs)
• openstreetmap/josm/actions/SaveActionBase.java (modified) (4 diffs)
• openstreetmap/josm/gui/conflict/ListMerger.java (modified) (10 diffs)
• openstreetmap/josm/io/OsmBzip2Importer.java (added)
• openstreetmap/josm/io/OsmGzipImporter.java (added)
• openstreetmap/josm/io/OsmImporter.java (modified) (3 diffs)

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

@@ -11 +11 @@
 import org.openstreetmap.josm.io.GpxImporter;
 import org.openstreetmap.josm.io.NMEAImporter;
+import org.openstreetmap.josm.io.OsmBzip2Importer;
+import org.openstreetmap.josm.io.OsmGzipImporter;
 import org.openstreetmap.josm.io.OsmImporter;
 
@@ -25 +27 @@
 
     public static ArrayList<FileImporter> importers = new ArrayList<FileImporter>(Arrays.asList(new OsmImporter(),
-            new GpxImporter(), new NMEAImporter()));
+            new OsmGzipImporter(), new OsmBzip2Importer(), new GpxImporter(), new NMEAImporter()));
 
     /**

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

@@ -10 +10 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-
-import javax.swing.JFileChooser;
+import java.io.Writer;
+import java.util.zip.GZIPOutputStream;
+
 import javax.swing.JOptionPane;
 
+import org.apache.tools.bzip2.CBZip2OutputStream;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -23 +27 @@
 import org.openstreetmap.josm.io.GpxImporter;
 import org.openstreetmap.josm.io.GpxWriter;
+import org.openstreetmap.josm.io.OsmBzip2Importer;
+import org.openstreetmap.josm.io.OsmGzipImporter;
 import org.openstreetmap.josm.io.OsmImporter;
 import org.openstreetmap.josm.io.OsmWriter;
@@ -140 +146 @@
             GpxImporter gpxImExporter = new GpxImporter();
             OsmImporter osmImExporter = new OsmImporter();
+            OsmGzipImporter osmGzipImporter = new OsmGzipImporter();
+            OsmBzip2Importer osmBzip2Importer = new OsmBzip2Importer();
             if (gpxImExporter.acceptFile(file))
                 GpxExportAction.exportGpx(file, layer);
-            else if (osmImExporter.acceptFile(file)) {
+            else if (osmImExporter.acceptFile(file) 
+                    || osmGzipImporter.acceptFile(file)
+                    || osmBzip2Importer.acceptFile(file)) 
+            {
                 // use a tmp file because if something errors out in the
                 // process of writing the file, we might just end up with
@@ -150 +161 @@
                     copy(file, tmpFile);
                 }
-                OsmWriter w = new OsmWriter(new PrintWriter(file, "UTF-8"), false, layer.data.version);
+
+                // create outputstream and wrap it with gzip or bzip, if necessary
+                OutputStream out = new FileOutputStream(file);
+                if(osmGzipImporter.acceptFile(file)) {
+                    out = new GZIPOutputStream(out);
+                } else if(osmBzip2Importer.acceptFile(file)) {
+                    out.write('B');
+                    out.write('Z');
+                    out = new CBZip2OutputStream(out);
+                }
+                Writer writer = new OutputStreamWriter(out, "UTF-8"); 
+
+                OsmWriter w = new OsmWriter(new PrintWriter(writer), false, layer.data.version);
                 w.header();
                 w.writeDataSources(layer.data);

trunk/src/org/openstreetmap/josm/gui/conflict/ListMerger.java

@@ -40 +40 @@
 /**
  * A UI component for resolving conflicts in two lists of entries of type T.
- * 
+ *
  * @param T  the type of the entries
  * @see ListMergeModel
@@ -687 +687 @@
      * Action for removing the selected entries in the list of merged entries
      * from the list of merged entries.
-     * 
+     *
      */
     class RemoveMergedAction extends AbstractAction implements ListSelectionListener {
@@ -740 +740 @@
          * such that the action gets notified about item state changes and the button gets
          * notified about selection state changes of the action.
-         * 
+         *
          * @param btn a toggle button
          */
@@ -811 +811 @@
     public void update(Observable o, Object arg) {
         lblMyVersion.setText(
-                tr("My version ")
-                + trn("({0} entry)", "({0} entries)", model.getMyEntriesSize(), model.getMyEntriesSize())
+                trn("My version ({0} entry)", "My version ({0} entries)", model.getMyEntriesSize(), model.getMyEntriesSize())
         );
         lblMergedVersion.setText(
-                tr("Merged version ")
-                + trn("({0} entry)", "({0} entries)", model.getMergedEntriesSize(), model.getMergedEntriesSize())
+                trn("Merged version ({0} entry)", "Merged version ({0} entries)", model.getMergedEntriesSize(), model.getMergedEntriesSize())
         );
         lblTheirVersion.setText(
-                tr("Their version ")
-                + trn("({0} entry)", "({0} entries)", model.getTheirEntriesSize(), model.getTheirEntriesSize())
+                trn("Their version ({0} entry)", "Their version ({0} entries)", model.getTheirEntriesSize(), model.getTheirEntriesSize())
         );
     }
-
-
 
     /**
@@ -831 +826 @@
      * the registerd Adjustables is updated the adjustment of
      * the other registered Adjustables is adjusted too.
-     * 
+     *
      */
     class AdjustmentSynchronizer implements AdjustmentListener {
@@ -850 +845 @@
          * registers an {@see Adjustable} for participation in synchronized
          * scrolling.
-         * 
+         *
          * @param adjustable the adjustable
          */
@@ -865 +860 @@
         /**
          * event handler for {@see AdjustmentEvent}s
-         * 
+         *
          */
         public void adjustmentValueChanged(AdjustmentEvent e) {
@@ -880 +875 @@
          * sets whether adjustable participates in adjustment synchronization
          * or not
-         * 
+         *
          * @param adjustable the adjustable
          */
@@ -896 +891 @@
         /**
          * returns true if an adjustable is participating in synchronized scrolling
-         * 
+         *
          * @param adjustable the adjustable
          * @return true, if the adjustable is participating in synchronized scrolling, false otherwise
@@ -916 +911 @@
          *      {@see JCheckBox}</ol>
          * </li>
-         * 
-         * 
+         *
+         *
          * @param view  the checkbox to control whether an adjustable participates in synchronized
          *      adjustment

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

@@ -9 +9 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.InputStream;
 
 import javax.swing.JOptionPane;
@@ -24 +25 @@
     }
 
+    public OsmImporter(ExtensionFileFilter filter) {
+        super(filter);
+    }
+
     @Override public void importData(File file) throws IOException {
         try {
-            OsmReader osm = OsmReader.parseDataSetOsm(new FileInputStream(file), null, Main.pleaseWaitDlg);
-            DataSet dataSet = osm.getDs();
-            OsmDataLayer layer = new OsmDataLayer(dataSet, file.getName(), file);
-            Main.main.addLayer(layer);
-            layer.fireDataChange();
-            if (osm.getParseNotes().length() != 0) {
-                /* display at most five lines */
-                String notes = osm.getParseNotes();
-                int j = 0;
-                for (int i = 0; i < 5; i++)
-                    j = notes.indexOf('\n', j + 1);
-                j = j >= 0 ? j : notes.length();
-                JOptionPane.showMessageDialog(Main.parent, notes.substring(0, j));
-            }
+            FileInputStream in = new FileInputStream(file);
+            importData(in, file);
         } catch (HeadlessException e) {
             e.printStackTrace();
@@ -51 +44 @@
         }
     }
+
+    protected void importData(InputStream in, File associatedFile) throws SAXException, IOException {
+        OsmReader osm = OsmReader.parseDataSetOsm(in, null, Main.pleaseWaitDlg);
+        DataSet dataSet = osm.getDs();
+        OsmDataLayer layer = new OsmDataLayer(dataSet, associatedFile.getName(), associatedFile);
+        Main.main.addLayer(layer);
+        layer.fireDataChange();
+        if (osm.getParseNotes().length() != 0) {
+            /* display at most five lines */
+            String notes = osm.getParseNotes();
+            int j = 0;
+            for (int i = 0; i < 5; i++)
+                j = notes.indexOf('\n', j + 1);
+            j = j >= 0 ? j : notes.length();
+            JOptionPane.showMessageDialog(Main.parent, notes.substring(0, j));
+        }
+    }
 }