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

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

Location:

src/org/openstreetmap/josm/data

Files:

• GeoPoint.java (modified) (1 diff)
• Preferences.java (modified) (8 diffs)
• osm/DataSet.java (modified) (1 diff)
• osm/Node.java (modified) (1 diff)
• osm/visitor/SelectionComponentVisitor.java (modified) (6 diffs)
• projection/UTM.java (modified) (6 diffs)

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

@@ -59 +59 @@
         }
         
-        
+        /**
+         * @return <code>true</code>, if the other GeoPoint has the same lat/lon values.
+         */
+        public boolean equalsLatLon(GeoPoint other) {
+                return lat == other.lat && lon == other.lon;
+        }
 }

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;
@@ -38 +40 @@
 
 
+        /**
+         * Whether lines should be drawn between track points of raw gps data.
+         */
+        private boolean drawRawGpsLines = false;
         /**
          * Whether nodes on the same place should be considered identical.
@@ -100 +106 @@
 
                         mergeNodes = root.getChild("mergeNodes") != null;
+                        drawRawGpsLines = root.getChild("drawRawGpsLines") != null;
                 } catch (Exception e) {
                         if (e instanceof PreferencesException)
@@ -120 +127 @@
                 if (mergeNodes)
                         children.add(new Element("mergeNodes"));
+                if (drawRawGpsLines)
+                        children.add(new Element("drawRawGpsLines"));
 
                 try {
@@ -134 +143 @@
         
         /**
-         * 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>();
+        private Collection<PropertyChangeListener> listener = new LinkedList<PropertyChangeListener>();
         /**
          * Add a listener of projection changes to the list of listeners.
          * @param listener The listerner to add.
          */
-        public void addProjectionChangeListener(ProjectionChangeListener listener) {
+        public void addPropertyChangeListener(PropertyChangeListener listener) {
                 if (listener != null)
                         this.listener.add(listener);
@@ -155 +157 @@
          * Remove the listener from the list.
          */
-        public void removeProjectionChangeListener(ProjectionChangeListener listener) {
+        public void removePropertyChangeListener(PropertyChangeListener listener) {
                 this.listener.remove(listener);
         }
+        /**
+         * Fires a PropertyChangeEvent if the old value differs from the new value.
+         */
+        private <T> void firePropertyChanged(String name, T oldValue, T newValue) {
+                if (oldValue == newValue)
+                        return;
+                PropertyChangeEvent evt = null;
+                for (PropertyChangeListener l : listener) {
+                        if (evt == null)
+                                evt = new PropertyChangeEvent(this, name, oldValue, newValue);
+                        l.propertyChange(evt);
+                }
+        }
+
+        // getter / setter
+        
         /**
          * Set the projection and fire an event to all ProjectionChangeListener
@@ -165 +183 @@
                 Projection old = this.projection;
                 this.projection = projection;
-                if (old != projection)
-                        for (ProjectionChangeListener l : listener)
-                                l.projectionChanged(old, projection);
+                firePropertyChanged("projection", old, projection);
         }
         /**
@@ -176 +192 @@
                 return projection;
         }
+        public void setDrawRawGpsLines(boolean drawRawGpsLines) {
+                boolean old = this.drawRawGpsLines;
+                this.drawRawGpsLines = drawRawGpsLines;
+                firePropertyChanged("drawRawGpsLines", old, drawRawGpsLines);
+        }
+        public boolean isDrawRawGpsLines() {
+                return drawRawGpsLines;
+        }
 }

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

@@ -186 +186 @@
 
         /**
+         * Import the given dataset by merging all data with this dataset.
+         * The objects imported are not cloned, so from now on, these data belong
+         * to both datasets. So use mergeFrom only if you are about to abandon the
+         * other dataset or this dataset.
+         * 
+         * @param ds    The DataSet to merge into this one.
+         * @param mergeEqualNodes If <code>true</code>, nodes with the same lat/lon
+         *              are merged together.
+         */
+        public void mergeFrom(DataSet ds, boolean mergeEqualNodes) {
+                if (mergeEqualNodes) {
+                        LinkedList<Node> nodesToAdd = new LinkedList<Node>();
+                        for (Node n : ds.nodes)
+                                for (Node mynode : nodes) {
+                                        if (mynode.coor.equalsLatLon(n.coor))
+                                                mynode.mergeFrom(n);
+                                        else
+                                                nodesToAdd.add(n);
+                                }
+                } else
+                        nodes.addAll(ds.nodes);
+                tracks.addAll(ds.tracks);
+                pendingLineSegments.addAll(ds.pendingLineSegments);
+        }
+
+        /**
          * Remove the selection from every value in the collection.
          * @param list The collection to remove the selection from.

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

@@ -33 +33 @@
                 return Collections.unmodifiableCollection(parentSegment);
         }
+
+        /**
+         * Merge the node given at parameter with this node.
+         * All parents of the parameter-node become parents of this node.
+         * 
+         * The argument node is not changed.
+         * 
+         * @param node Merge the node to this.
+         */
+        public void mergeFrom(Node node) {
+                parentSegment.addAll(node.parentSegment);
+                if (keys == null)
+                        keys = node.keys;
+                else if (node.keys != null)
+                        keys.putAll(node.keys);
+        }
         
         /**

src/org/openstreetmap/josm/data/osm/visitor/SelectionComponentVisitor.java

@@ -7 +7 @@
 
 import javax.swing.Icon;
-import javax.swing.ImageIcon;
 
 import org.openstreetmap.josm.data.osm.Key;
@@ -13 +12 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Track;
-import org.openstreetmap.josm.gui.Main;
+import org.openstreetmap.josm.gui.ImageProvider;
 
 /**
@@ -38 +37 @@
         public void visit(Key k) {
                 name = k.name;
-                icon = new ImageIcon(Main.class.getResource("/images/data/key.png"));
+                icon = ImageProvider.get("data", "key");
         }
 
@@ -53 +52 @@
                         
                 this.name = name;
-                icon = new ImageIcon("images/data/linesegment.png");
+                icon = ImageProvider.get("data", "linesegment");
         }
 
@@ -67 +66 @@
                 
                 this.name = name;
-                icon = new ImageIcon("images/data/node.png");
+                icon = ImageProvider.get("data", "node");
         }
 
@@ -87 +86 @@
                 
                 this.name = name;
-                icon = new ImageIcon("images/data/track.png");
+                icon = ImageProvider.get("data", "track");
         }
 

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

@@ -98 +98 @@
          * Combobox with all ellipsoids for the configuration panel
          */
-        private JComboBox ellipsoidCombo = new JComboBox(allEllipsoids);
+        private JComboBox ellipsoidCombo;
         /**
          * Spinner with all possible zones for the configuration panel
          */
-        private JSpinner zoneSpinner = new JSpinner(new SpinnerNumberModel(1,1,60,1));
+        private JSpinner zoneSpinner;
         /**
          * Hemisphere combo for the configuration panel
          */
-        private JComboBox hemisphereCombo = new JComboBox(Hemisphere.values());
+        private JComboBox hemisphereCombo;
 
         
@@ -248 +248 @@
                 
                 // ellipsoid
+                if (ellipsoidCombo == null)
+                        ellipsoidCombo = new JComboBox(allEllipsoids);
                 panel.add(new JLabel("Ellipsoid"), gbc);
                 panel.add(ellipsoidCombo, GBC.eol());
@@ -253 +255 @@
                 
                 // zone
+                if (zoneSpinner == null)
+                        zoneSpinner = new JSpinner(new SpinnerNumberModel(1,1,60,1));
                 panel.add(new JLabel("Zone"), gbc);
                 panel.add(zoneSpinner, GBC.eol().insets(0,5,0,5));
@@ -259 +263 @@
                 
                 // hemisphere
+                if (hemisphereCombo == null)
+                        hemisphereCombo = new JComboBox(Hemisphere.values());
                 panel.add(new JLabel("Hemisphere"), gbc);
                 panel.add(hemisphereCombo, GBC.eop());
@@ -268 +274 @@
                         public void actionPerformed(ActionEvent e) {
                                 if (Main.main.getMapFrame() != null) {
-                                        DataSet ds = Main.main.getMapFrame().mapView.dataSet;
+                                        DataSet ds = Main.main.getMapFrame().mapView.getActiveDataSet();
                                         ZoneData zd = autoDetect(ds);
                                         if (zd.zone == 0)
@@ -291 +297 @@
         @Override
         public void commitConfigurationPanel() {
-                ellipsoid = (Ellipsoid)ellipsoidCombo.getSelectedItem();
-                zone = (Integer)zoneSpinner.getValue();
-                hemisphere = (Hemisphere)hemisphereCombo.getSelectedItem();
-                fireStateChanged();
+                if (ellipsoidCombo != null && zoneSpinner != null && hemisphereCombo != null) {
+                        ellipsoid = (Ellipsoid)ellipsoidCombo.getSelectedItem();
+                        zone = (Integer)zoneSpinner.getValue();
+                        hemisphere = (Hemisphere)hemisphereCombo.getSelectedItem();
+                        fireStateChanged();
+                }
         }
 }