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

Timestamp:

2005-10-01T04:01:45+02:00 (20 years ago)

Author:

imi

Message:

• pretty preferrences menu
• drawing double circles on double position hit
• mergeNodes option

Location:

src/org/openstreetmap/josm/data

Files:

• GeoPoint.java (modified) (2 diffs)
• Preferences.java (modified) (4 diffs)
• osm/DataSet.java (modified) (1 diff)
• osm/Node.java (modified) (1 diff)
• osm/OsmPrimitive.java (modified) (1 diff)
• projection/Projection.java (modified) (1 diff)
• projection/UTM.java (modified) (1 diff)

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

@@ -1 +1 @@
 package org.openstreetmap.josm.data;
+
 
 /**
@@ -44 +45 @@
                 return null;
         }
+
+        /**
+         * GeoPoints are equal, if their lat/lon are equal or, if lat or lon are NaN, 
+         * if their x/y are equal.
+         */
+        @Override
+        public boolean equals(Object obj) {
+                if (!(obj instanceof GeoPoint))
+                        return false;
+                GeoPoint gp = (GeoPoint)obj;
+                
+                if (Double.isNaN(lat) || Double.isNaN(lon))
+                        return x == gp.x && y == gp.y;
+                return lat == gp.lat && lon == gp.lon;
+        }
+
+        @Override
+        public int hashCode() {
+                return super.hashCode();
+        }
+        
+        
 }

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

@@ -4 +4 @@
 import java.io.FileReader;
 import java.io.FileWriter;
+import java.util.List;
 
 import javax.swing.UIManager;
@@ -34 +35 @@
         public Projection projection = new UTM();
 
+
         /**
-         * The monitor geometry in meter per pixel. (How big is 1 pixel in meters)
-         * Example: 17" Sony flatscreen in 1280x1024 mode: 0.000264 ppm
-         * 
-         * Remember: ppm = dpi/25400
+         * Whether nodes on the same place should be considered identical.
          */
-        public double ppm = 0.000264;
+        public boolean mergeNodes = true;
+        
+        
 
-        
+        /**
+         * List of all available Projections.
+         */
         public static final Projection[] allProjections = new Projection[]{
                 new UTM(),
@@ -85 +88 @@
                         
                         projection = (Projection)Class.forName(root.getChildText("projection")).newInstance();
+                        mergeNodes = root.getChild("mergeNodes") != null;
                 } catch (Exception e) {
                         if (e instanceof PreferencesException)
@@ -100 +104 @@
                 Element root = new Element("josm-settings");
                 
-                root.getChildren().add(new Element("laf").setText(laf.getClassName()));
-                root.getChildren().add(new Element("projection").setText(projection.getClass().getName()));
+                List children = root.getChildren();
+                children.add(new Element("laf").setText(laf.getClassName()));
+                children.add(new Element("projection").setText(projection.getClass().getName()));
+                if (mergeNodes)
+                        children.add(new Element("mergeNodes"));
 
                 try {

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

@@ -119 +119 @@
         }
         
+        @Override
         public DataSet clone() {
                 try {return (DataSet)super.clone();} catch (CloneNotSupportedException e) {}

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

@@ -15 +15 @@
          */
         public GeoPoint coor;
+
+        /**
+         * Nodes are equal when their coordinates are equal.
+         */
+        @Override
+        public boolean equals(Object obj) {
+                if (!(obj instanceof Node))
+                        return false;
+                Node n = (Node)obj;
+                if (coor == null)
+                        return n.coor == null;
+                return coor.equals(n.coor) && super.equals(obj);
+        }
+
+        /**
+         * Compute the hashcode from the OsmPrimitive's hash and the coor's hash.
+         */
+        @Override
+        public int hashCode() {
+                return (coor == null ? 0 : coor.hashCode()) + super.hashCode();
+        }
+        
+        
 }

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

@@ -20 +20 @@
          * If set to true, this object has been modified in the current session.
          */
-        public boolean modified = false;
+        transient public boolean modified = false;
         
         /**
          * If set to true, this object is currently selected.
          */
-        public boolean selected = false;
+        transient public boolean selected = false;
+
+        /**
+         * Osm primitives are equal, when their keys are equal. 
+         */
+        @Override
+        public boolean equals(Object obj) {
+                if (obj == null)
+                        return false;
+                if (!(obj instanceof OsmPrimitive))
+                        return false;
+                OsmPrimitive osm = (OsmPrimitive)obj;
+                if (keys == null)
+                        return osm.keys == null;
+                return keys.equals(osm.keys);
+        }
+
+        /**
+         * Compute the hashCode from the keys.
+         */
+        @Override
+        public int hashCode() {
+                return keys == null ? 0 : keys.hashCode();
+        }
+        
+        
 }

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

@@ -45 +45 @@
          * Describe the projection converter in one or two words.
          */
+        @Override
         abstract public String toString();
         

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

@@ -49 +49 @@
                         this.ecc_squared = ecc_squared;
                 }
+                @Override
                 public String toString() {
                         return name;