Changeset 17 in josm for src/org/openstreetmap/josm/actions/OpenGpxAction.java

Timestamp:

2005-10-09T04:14:40+02:00 (19 years ago)

Author:

imi

Message:

• added Layer support
• added support for raw GPS data
• fixed tooltips
• added options for loading gpx files

File:

• src/org/openstreetmap/josm/actions/OpenGpxAction.java (modified) (5 diffs)

src/org/openstreetmap/josm/actions/OpenGpxAction.java

@@ -1 +1 @@
 package org.openstreetmap.josm.actions;
 
+import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
@@ -8 +9 @@
 
 import javax.swing.AbstractAction;
-import javax.swing.ImageIcon;
+import javax.swing.Box;
+import javax.swing.JCheckBox;
 import javax.swing.JFileChooser;
+import javax.swing.JLabel;
 import javax.swing.JOptionPane;
+import javax.swing.JPanel;
 import javax.swing.filechooser.FileFilter;
 
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.gui.GBC;
+import org.openstreetmap.josm.gui.ImageProvider;
 import org.openstreetmap.josm.gui.Main;
 import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.LayerFactory;
 import org.openstreetmap.josm.io.GpxReader;
 import org.openstreetmap.josm.io.DataReader.ConnectionException;
@@ -32 +40 @@
          */
         public OpenGpxAction() {
-                super("Open GPX", new ImageIcon(Main.class.getResource("/images/opengpx.png")));
+                super("Open GPX", ImageProvider.get("opengpx"));
                 putValue(MNEMONIC_KEY, KeyEvent.VK_O);
+                putValue(SHORT_DESCRIPTION, "Open a file in GPX format.");
         }
 
@@ -48 +57 @@
                                 return "GPX or XML Files";
                         }});
-                fc.showOpenDialog(Main.main);
+                
+                // additional options
+                JCheckBox rawGps = new JCheckBox("Raw GPS data", true);
+                rawGps.setToolTipText("Check this, if the data are obtained from a gps device.");
+                JCheckBox newLayer = new JCheckBox("As Layer", true); 
+                newLayer.setToolTipText("Open as a new layer or replace all current layers.");
+                if (Main.main.getMapFrame() == null) {
+                        newLayer.setEnabled(false);
+                        newLayer.setSelected(false);
+                }
+                
+                JPanel p = new JPanel(new GridBagLayout());
+                p.add(new JLabel("Options"), GBC.eop());
+                p.add(rawGps, GBC.eol());
+                p.add(newLayer, GBC.eol());
+                p.add(Box.createVerticalGlue(), GBC.eol().fill());
+                fc.setAccessory(p);
+
+                if (fc.showOpenDialog(Main.main) != JFileChooser.APPROVE_OPTION)
+                        return;
+                
                 File gpxFile = fc.getSelectedFile();
                 if (gpxFile == null)
@@ -54 +83 @@
                 
                 try {
-                        DataSet dataSet = new GpxReader(new FileReader(gpxFile)).parse();
-                        MapFrame map = new MapFrame(dataSet);
-                        Main.main.setMapFrame(gpxFile.getName(), map);
+                        DataSet dataSet = new GpxReader(new FileReader(gpxFile), rawGps.isSelected()).parse();
+
+                        Layer layer = LayerFactory.create(dataSet, gpxFile.getName(), rawGps.isSelected());
+                        
+                        if (Main.main.getMapFrame() == null || !newLayer.isSelected())
+                                Main.main.setMapFrame(gpxFile.getName(), new MapFrame(layer));
+                        else
+                                Main.main.getMapFrame().mapView.addLayer(layer);
+                        
                 } catch (ParseException x) {
                         x.printStackTrace();