Changeset 16 in josm for src/org/openstreetmap/josm/data

Timestamp:

2005-10-08T17:14:54+02:00 (19 years ago)

Author:

imi

Message:

• reverted to 14, but kept the global Projection.
• improved the preference settings for projections.

Location:

src/org/openstreetmap/josm/data

Files:

• Preferences.java (modified) (7 diffs)
• osm/DataSet.java (modified) (1 diff)
• projection/LatitudeLongitude.java (modified) (2 diffs)
• projection/Projection.java (modified) (1 diff)
• projection/UTM.java (modified) (5 diffs)

src/org/openstreetmap/josm/data/Preferences.java

@@ -1 +1 @@
 package org.openstreetmap.josm.data;
 
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
 import java.io.File;
 import java.io.FileReader;
 import java.io.FileWriter;
+import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
@@ -28 +27 @@
 public class Preferences {
 
-        
         /**
          * The look and feel. Classname of the look and feel class to use.
          */
-        private LookAndFeelInfo laf = UIManager.getInstalledLookAndFeels()[0];
+        public LookAndFeelInfo laf = UIManager.getInstalledLookAndFeels()[0];
+
         /**
          * The convertor used to translate lat/lon points to screen points.
          */
         private Projection projection = new UTM();
+
+
         /**
          * Whether nodes on the same place should be considered identical.
          */
-        private boolean mergeNodes = true;
+        public boolean mergeNodes = true;
+        
+        
 
+        /**
+         * List of all available Projections.
+         */
+        public static final Projection[] allProjections = new Projection[]{
+                new UTM(),
+                new LatitudeLongitude()
+        };
 
-
+        /**
+         * Return the location of the preferences file
+         */
+        public static String getPreferencesFile() {
+                return System.getProperty("user.home")+"/.josm-preferences";
+        }
+        
         /**
          * Exception thrown in case of any loading/saving error (including parse errors).
@@ -53 +69 @@
                 }
         }
-
-        /**
-         * List of all available Projections.
-         */
-        public static final Projection[] allProjections = new Projection[]{
-                new UTM(),
-                new LatitudeLongitude()
-        };
-
-
-
-
-        // listener stuff
-        
-        /**
-         * The event listener list
-         */
-        private List<PropertyChangeListener> listener = new LinkedList<PropertyChangeListener>();
-        /**
-         * If <code>listener != null</code>, add it to the listener list.
-         */
-        public void addPropertyChangeListener(PropertyChangeListener listener) {
-                if (listener != null)
-                        this.listener.add(listener);
-        }
-        /**
-         * If <code>listener != null</code>, remove it from the listener list.
-         */
-        public void removePropertyChangeListener(PropertyChangeListener listener) {
-                if (listener != null)
-                        this.listener.remove(listener);
-        }
-        /**
-         * Fires an event that the property has changed.
-         */
-        private void firePropertyChanged(String propName, Object oldValue, Object newValue) {
-                PropertyChangeEvent event = null;
-                for (PropertyChangeListener l : listener) {
-                        if (event == null)
-                                event = new PropertyChangeEvent(this, propName, oldValue, newValue);
-                        l.propertyChange(event);
-                }
-        }
-
-        
-        
-        /**
-         * Return the location of the preferences file
-         */
-        public static String getPreferencesFile() {
-                return System.getProperty("user.home")+"/.josm-preferences";
-        }
-        
         /**
          * Load from disk.
@@ -120 +83 @@
                         for (LookAndFeelInfo lafInfo : UIManager.getInstalledLookAndFeels())
                                 if (lafInfo.getClassName().equals(lafClassName)) {
-                                        setLaf(lafInfo);
+                                        laf = lafInfo;
                                         break;
                                 }
-                        if (getLaf() == null)
+                        if (laf == null)
                                 throw new PreferencesException("Look and Feel not found.", null);
-
-                        // set projection
+                        
+                        // projection
                         Class<?> projectionClass = Class.forName(root.getChildText("projection"));
                         projection = allProjections[0]; // defaults to UTM
@@ -136 +99 @@
                         }
 
-                        setMergeNodes(root.getChild("mergeNodes") != null);
+                        mergeNodes = root.getChild("mergeNodes") != null;
                 } catch (Exception e) {
                         if (e instanceof PreferencesException)
@@ -153 +116 @@
                 
                 List children = root.getChildren();
-                children.add(new Element("laf").setText(getLaf().getClassName()));
+                children.add(new Element("laf").setText(laf.getClassName()));
                 children.add(new Element("projection").setText(getProjection().getClass().getName()));
-                if (isMergeNodes())
+                if (mergeNodes)
                         children.add(new Element("mergeNodes"));
 
@@ -167 +130 @@
         }
 
-        // getter / setter
-
+        
+        // projection change listener stuff
+        
+        /**
+         * This interface notifies any interested about changes in the projection
+         * @author imi
+         */
+        public interface ProjectionChangeListener {
+                void projectionChanged(Projection oldProjection, Projection newProjection);
+        }
+        /**
+         * The list of all listeners to projection changes.
+         */
+        private Collection<ProjectionChangeListener> listener = new LinkedList<ProjectionChangeListener>();
+        /**
+         * Add a listener of projection changes to the list of listeners.
+         * @param listener The listerner to add.
+         */
+        public void addProjectionChangeListener(ProjectionChangeListener listener) {
+                if (listener != null)
+                        this.listener.add(listener);
+        }
+        /**
+         * Remove the listener from the list.
+         */
+        public void removeProjectionChangeListener(ProjectionChangeListener listener) {
+                this.listener.remove(listener);
+        }
+        /**
+         * Set the projection and fire an event to all ProjectionChangeListener
+         * @param projection The new Projection.
+         */
         public void setProjection(Projection projection) {
                 Projection old = this.projection;
                 this.projection = projection;
-                firePropertyChanged("projection", old, projection);
+                if (old != projection)
+                        for (ProjectionChangeListener l : listener)
+                                l.projectionChanged(old, projection);
         }
+        /**
+         * Get the current projection.
+         * @return The current projection set.
+         */
         public Projection getProjection() {
                 return projection;
         }
-        public void setMergeNodes(boolean mergeNodes) {
-                boolean old = this.mergeNodes;
-                this.mergeNodes = mergeNodes;
-                firePropertyChanged("mergeNodes", old, mergeNodes);
-        }
-        public boolean isMergeNodes() {
-                return mergeNodes;
-        }
-        public void setLaf(LookAndFeelInfo laf) {
-                LookAndFeelInfo old = this.laf;
-                this.laf = laf;
-                firePropertyChanged("laf", old, laf);
-        }
-        public LookAndFeelInfo getLaf() {
-                return laf;
-        }
 }

src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -113 +113 @@
                 Node first = nodes.iterator().next();
                 Bounds b = new Bounds(first.coor.clone(), first.coor.clone());
-                for (Node n : nodes)
+                for (Node w : nodes)
                 {
-                        if (Double.isNaN(n.coor.x) || Double.isNaN(n.coor.y))
+                        if (Double.isNaN(w.coor.x) || Double.isNaN(w.coor.y))
                                 return null;
-                        if (n.coor.x < b.min.x)
-                                b.min.x = n.coor.x;
-                        if (n.coor.y < b.min.y)
-                                b.min.y = n.coor.y;
-                        if (n.coor.x > b.max.x)
-                                b.max.x = n.coor.x;
-                        if (n.coor.y > b.max.y)
-                                b.max.y = n.coor.y;
+                        if (w.coor.x < b.min.x)
+                                b.min.x = w.coor.x;
+                        if (w.coor.y < b.min.y)
+                                b.min.y = w.coor.y;
+                        if (w.coor.x > b.max.x)
+                                b.max.x = w.coor.x;
+                        if (w.coor.y > b.max.y)
+                                b.max.y = w.coor.y;
                 }
                 return b;

src/org/openstreetmap/josm/data/projection/LatitudeLongitude.java

@@ -1 +1 @@
 package org.openstreetmap.josm.data.projection;
 
-import javax.swing.JPanel;
+import javax.swing.JComponent;
 
 import org.openstreetmap.josm.data.GeoPoint;
@@ -30 +30 @@
 
         @Override
-        public String description() {
-                return "Use lat/lon values directly.";
+        public JComponent getConfigurationPanel() {
+                return null;
         }
 
         @Override
-        public JPanel getConfigurationPanel() {
-                return null;
+        public void commitConfigurationPanel() {
         }
 }

src/org/openstreetmap/josm/data/projection/Projection.java

@@ -47 +47 @@
         abstract public String toString();
         
-        /**
-         * Describe the projection converter. Give examples, where it is best to use
-         * and maybe a reference link to more information about the converter. 
-         */
-        abstract public String description();
-
-        
-
         // miscellous functions
         
         /**
          * If the projection supports any configuration, this function return
-         * the configuration panel. If no configuration needed, return null.
+         * the configuration panel. If no configuration needed, 
+         * return <code>null</code>.
          * 
-         * The items on the configuration panel should update the configuration
-         * directly, so the changes are instantly visible on screen.
+         * The items on the configuration panel should not update the configuration
+         * directly, but remember changed settings so a call to commitConfigurationPanel
+         * can set them.
+         * 
+         * This function also rolls back all changes to the configuration panel interna
+         * components.
          */
         abstract public JComponent getConfigurationPanel();
+        /**
+         * Commits any changes from components created by addToConfigurationPanel.
+         * The projection should now obtain the new settings. If any setting has
+         * changed, the implementation have to call to fireStateChanged to inform
+         * the listeners.
+         */
+        abstract public void commitConfigurationPanel();
 
         /**

src/org/openstreetmap/josm/data/projection/UTM.java

@@ -1 +1 @@
 package org.openstreetmap.josm.data.projection;
 
+import java.awt.Font;
+import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
-import javax.swing.BorderFactory;
-import javax.swing.Box;
+import javax.swing.JButton;
 import javax.swing.JComboBox;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
 import javax.swing.JSpinner;
 import javax.swing.SpinnerNumberModel;
-import javax.swing.border.Border;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
 
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.GeoPoint;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.gui.GBC;
+import org.openstreetmap.josm.gui.Main;
 
 /**
@@ -93 +95 @@
         protected Ellipsoid ellipsoid = allEllipsoids[allEllipsoids.length-1];
 
+        /**
+         * Combobox with all ellipsoids for the configuration panel
+         */
+        private JComboBox ellipsoidCombo = new JComboBox(allEllipsoids);
+        /**
+         * Spinner with all possible zones for the configuration panel
+         */
+        private JSpinner zoneSpinner = new JSpinner(new SpinnerNumberModel(1,1,60,1));
+        /**
+         * Hemisphere combo for the configuration panel
+         */
+        private JComboBox hemisphereCombo = new JComboBox(Hemisphere.values());
+
         
         @Override
@@ -168 +183 @@
         }
 
-        @Override
-        public String description() {
-                return "UTM projection ported from Ben Gimpert's ruby port.\n" +
-                        "http://www.openstreetmap.org/websvn/filedetails.php?repname=" +
-                        "OpenStreetMap&path=%2Futils%2Ftiger_import%2Ftiger%2Futm.rb";
-        }
-
+        /**
+         * Helper class for the zone detection
+         * @author imi
+         */
+        private class ZoneData {
+                int zone = 0;
+                Hemisphere hemisphere = Hemisphere.north;
+        }
+        /**
+         * Try to autodetect the zone and hemisphere from the dataset.
+         * @param dataSet The dataset to extrakt zone information from.
+         * @return The zone data extrakted from the dataset.
+         */
+        private ZoneData autoDetect(DataSet dataSet) {
+                ZoneData zd = new ZoneData();
+                
+                Bounds b = dataSet.getBoundsLatLon();
+                if (b == null)
+                        return zd;
+                GeoPoint center = b.centerLatLon();
+                double lat = center.lat;
+                double lon = center.lon;
+                // make sure the longitude is between -180.00 .. 179.9
+                double long_temp = (lon + 180) - (Math.floor((lon + 180) / 360) * 360) - 180;
+                
+                zd.zone = (int)((long_temp + 180) / 6) + 1;
+                if ((lat >= 56.0) && (lat < 64.0) && (long_temp >= 3.0) && (long_temp < 12.0))
+                        zd.zone = 32; 
+                // special zones for Svalbard
+                if ((lat >= 72.0) && (lat < 84.0))
+                {
+                        if ((long_temp >= 0.0) && (long_temp < 9.0))
+                                zd.zone = 31;
+                        else if ((long_temp >= 9.0) && (long_temp < 21.0))
+                                zd.zone = 33;
+                        else if ((long_temp >= 21.0) && (long_temp < 33.0))
+                                zd.zone = 35;
+                        else if ((long_temp >= 33.0) && (long_temp < 42.0))
+                                zd.zone = 37;
+                }
+                zd.hemisphere = lat > 0 ? Hemisphere.north : Hemisphere.south;
+                return zd;
+        }
+        
         /**
          * If the zone is not already set, calculate it from this dataset. 
@@ -184 +236 @@
         public void init(DataSet dataSet) {
                 if (zone == 0) {
-                        Bounds b = dataSet.getBoundsLatLon();
-                        if (b == null)
-                                return;
-                        GeoPoint center = b.centerLatLon();
-                        double lat = center.lat;
-                        double lon = center.lon;
-                        // make sure the longitude is between -180.00 .. 179.9
-                        double long_temp = (lon + 180) - (Math.floor((lon + 180) / 360) * 360) - 180;
-                        
-                        zone = (int)((long_temp + 180) / 6) + 1;
-                        if ((lat >= 56.0) && (lat < 64.0) && (long_temp >= 3.0) && (long_temp < 12.0))
-                                zone = 32; 
-                        // special zones for Svalbard
-                        if ((lat >= 72.0) && (lat < 84.0))
-                        {
-                                if ((long_temp >= 0.0) && (long_temp < 9.0))
-                                        zone = 31;
-                                else if ((long_temp >= 9.0) && (long_temp < 21.0))
-                                        zone = 33;
-                                else if ((long_temp >= 21.0) && (long_temp < 33.0))
-                                        zone = 35;
-                                else if ((long_temp >= 33.0) && (long_temp < 42.0))
-                                        zone = 37;
-                        }
-                        hemisphere = lat > 0 ? Hemisphere.north : Hemisphere.south;
+                        ZoneData zd = autoDetect(dataSet);
+                        zone = zd.zone;
+                        hemisphere = zd.hemisphere;
                 }
         }
@@ -214 +244 @@
         @Override
         public JComponent getConfigurationPanel() {
-                Border border = BorderFactory.createEmptyBorder(5,0,0,0);
-                Box panel = Box.createVerticalBox();
-
+                JPanel panel = new JPanel(new GridBagLayout());
+                GBC gbc = GBC.std().insets(0,0,5,0);
+                
                 // ellipsoid
-                Box ellipsoidPanel = Box.createHorizontalBox();
-                ellipsoidPanel.add(new JLabel("Ellipsoid"));
-                final JComboBox ellipsoidCombo = new JComboBox(allEllipsoids);
-                ellipsoidPanel.add(ellipsoidCombo);
+                panel.add(new JLabel("Ellipsoid"), gbc);
+                panel.add(ellipsoidCombo, GBC.eol());
                 ellipsoidCombo.setSelectedItem(ellipsoid);
-                ellipsoidCombo.addActionListener(new ActionListener(){
+                
+                // zone
+                panel.add(new JLabel("Zone"), gbc);
+                panel.add(zoneSpinner, GBC.eol().insets(0,5,0,5));
+                if (zone != 0)
+                        zoneSpinner.setValue(zone);
+                
+                // hemisphere
+                panel.add(new JLabel("Hemisphere"), gbc);
+                panel.add(hemisphereCombo, GBC.eop());
+                hemisphereCombo.setSelectedItem(hemisphere);
+
+                // Autodetect
+                JButton autoDetect = new JButton("Detect");
+                autoDetect.addActionListener(new ActionListener(){
                         public void actionPerformed(ActionEvent e) {
-                                ellipsoid = (Ellipsoid)ellipsoidCombo.getSelectedItem();
-                                fireStateChanged();
+                                if (Main.main.getMapFrame() != null) {
+                                        DataSet ds = Main.main.getMapFrame().mapView.dataSet;
+                                        ZoneData zd = autoDetect(ds);
+                                        if (zd.zone == 0)
+                                                JOptionPane.showMessageDialog(Main.main, "Autodetection failed. Maybe the data set contain too few information.");
+                                        else {
+                                                zoneSpinner.setValue(zd.zone);
+                                                hemisphereCombo.setSelectedItem(zd.hemisphere);
+                                        }
+                                } else {
+                                        JOptionPane.showMessageDialog(Main.main, "No data loaded. Please open a data set first.");
+                                }
                         }
                 });
-                ellipsoidPanel.setBorder(border);
-                panel.add(ellipsoidPanel);
-                
-                // zone
-                Box zonePanel = Box.createHorizontalBox();
-                zonePanel.add(new JLabel("Zone"));
-                final JSpinner zoneSpinner = new JSpinner(new SpinnerNumberModel(zone,1,60,1));
-                zonePanel.add(zoneSpinner);
-                zoneSpinner.addChangeListener(new ChangeListener(){
-                        public void stateChanged(ChangeEvent e) {
-                                zone = (Integer)zoneSpinner.getValue();
-                                fireStateChanged();
-                        }
-                });
-                zonePanel.setBorder(border);
-                panel.add(zonePanel);
-                
-                // hemisphere
-                Box hemispherePanel = Box.createHorizontalBox();
-                hemispherePanel.add(new JLabel("Hemisphere"));
-                final JComboBox hemisphereCombo = new JComboBox(Hemisphere.values());
-                hemispherePanel.add(hemisphereCombo);
-                hemisphereCombo.setSelectedItem(hemisphere);
-                hemisphereCombo.addActionListener(new ActionListener(){
-                        public void actionPerformed(ActionEvent e) {
-                                hemisphere = (Hemisphere)hemisphereCombo.getSelectedItem();
-                                fireStateChanged();
-                        }
-                });
-                hemispherePanel.setBorder(border);
-                panel.add(hemispherePanel);
-
+                JLabel descLabel = new JLabel("Autodetect parameter based on loaded data");
+                descLabel.setFont(descLabel.getFont().deriveFont(Font.ITALIC));
+                panel.add(descLabel, GBC.eol().fill(GBC.HORIZONTAL));
+                panel.add(autoDetect, GBC.eol().anchor(GBC.CENTER));
+                
                 return panel;
         }
+
+        @Override
+        public void commitConfigurationPanel() {
+                ellipsoid = (Ellipsoid)ellipsoidCombo.getSelectedItem();
+                zone = (Integer)zoneSpinner.getValue();
+                hemisphere = (Hemisphere)hemisphereCombo.getSelectedItem();
+                fireStateChanged();
+        }
 }