Changeset 2327 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2009-10-27T01:21:32+01:00 (16 years ago)

Author:

Gubaer

Message:

Cleanup in download logic (less global, more encapsulation)

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• Bounds.java (modified) (4 diffs)
• Preferences.java (modified) (1 diff)
• coor/Coordinate.java (modified) (1 diff)
• coor/LatLon.java (modified) (2 diffs)
• osm/visitor/BoundingXYVisitor.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/Bounds.java

@@ -4 +4 @@
 import java.awt.geom.Rectangle2D;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 /**
@@ -16 +18 @@
      * The minimum and maximum coordinates.
      */
-    public LatLon min, max;
+    private LatLon min, max;
+    
+    public LatLon getMin() {
+        return min;
+    }
+
+    public LatLon getMax() {
+        return max;
+    }
 
     /**
@@ -30 +40 @@
         this.max = b;
     }
+    
+    public Bounds(double minlat, double minlon, double maxlat, double maxlon) {
+        this.min = new LatLon(minlat, minlon);
+        this.max = new LatLon(maxlat, maxlon);
+    }
+    
+    public Bounds(double [] coords) {
+        if (coords == null)
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null", "coords"));
+        if (coords.length != 4)
+            throw new IllegalArgumentException(tr("Expected array of length 4, got {0}", coords.length));
+        this.min = new LatLon(coords[0], coords[1]);
+        this.max = new LatLon(coords[2], coords[3]);
+    }
+    
+    public Bounds(String asString, String separator) throws IllegalArgumentException {
+        if (asString == null)
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null", "asString"));
+        String[] components = asString.split(separator);
+        if (components.length != 4) {
+            throw new IllegalArgumentException(tr("Exactly four doubles excpected in string, got {0}", components.length));
+        }
+        double[] values = new double[4];
+        for (int i=0; i<4; i++) {
+            try {
+                values[i] = Double.parseDouble(components[i]);
+            } catch(NumberFormatException e) {
+                throw new IllegalArgumentException(tr("Illegal double value ''{0}''", components[i]));
+            }
+        }
+        this.min = new LatLon(values[0], values[1]);
+        this.max = new LatLon(values[2], values[3]);
+    }
+    
+    public Bounds(Bounds other) {
+        this.min = new LatLon(other.min);
+        this.max = new LatLon(other.max);
+    }
 
+    public Bounds(Rectangle2D rect) {
+        this.min = new LatLon(rect.getMinY(), rect.getMinX());
+        this.max = new LatLon(rect.getMaxY(), rect.getMaxX());
+    }
+    
     @Override public String toString() {
         return "Bounds["+min.lat()+","+min.lon()+","+max.lat()+","+max.lon()+"]";
@@ -70 +123 @@
         return new Rectangle2D.Double(min.lon(), min.lat(), max.lon()-min.lon(), max.lat()-min.lat());
     }
+    
+    public double getArea() {
+        return (max.lon() - min.lon()) * (max.lat() - min.lat());
+    }
+
+    public String encodeAsString(String separator) {
+        StringBuffer sb = new StringBuffer();
+        sb.append(min.lat()).append(separator).append(min.lon())
+        .append(separator).append(max.lat()).append(separator)
+        .append(max.lon());
+        return sb.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((max == null) ? 0 : max.hashCode());
+        result = prime * result + ((min == null) ? 0 : min.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        Bounds other = (Bounds) obj;
+        if (max == null) {
+            if (other.max != null)
+                return false;
+        } else if (!max.equals(other.max))
+            return false;
+        if (min == null) {
+            if (other.min != null)
+                return false;
+        } else if (!min.equals(other.min))
+            return false;
+        return true;
+    }
 
 }

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

@@ -62 +62 @@
         public String name;
         public double[] latlon = new double[4]; // minlat, minlon, maxlat, maxlon
+        
+        public Bookmark() {           
+        }
+        
+        public Bookmark(Bounds b) {
+            if (b == null) {
+                latlon[0] = 0.0;
+                latlon[1] = 0.0;
+                latlon[2] = 0.0;
+                latlon[3] = 0.0;
+            } else {
+                latlon[0] = b.getMin().lat();
+                latlon[1] = b.getMin().lon();
+                latlon[2] = b.getMax().lat();
+                latlon[3] = b.getMax().lon();
+            }
+        }
+        
         @Override public String toString() {
             return name;
         }
+                
         public int compareTo(Bookmark b) {
             return name.toLowerCase().compareTo(b.name.toLowerCase());
+        }
+        
+        public Bounds asBounds() {
+            return new Bounds(latlon[0], latlon[1], latlon[2], latlon[3]);
         }
     }

trunk/src/org/openstreetmap/josm/data/coor/Coordinate.java

@@ -45 +45 @@
     }
 
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = super.hashCode();
+        long temp;
+        temp = java.lang.Double.doubleToLongBits(x);
+        result = prime * result + (int) (temp ^ (temp >>> 32));
+        temp = java.lang.Double.doubleToLongBits(y);
+        result = prime * result + (int) (temp ^ (temp >>> 32));
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (!super.equals(obj))
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        Coordinate other = (Coordinate) obj;
+        if (java.lang.Double.doubleToLongBits(x) != java.lang.Double.doubleToLongBits(other.x))
+            return false;
+        if (java.lang.Double.doubleToLongBits(y) != java.lang.Double.doubleToLongBits(other.y))
+            return false;
+        return true;
+    }
 }

trunk/src/org/openstreetmap/josm/data/coor/LatLon.java

@@ -90 +90 @@
     public boolean isOutSideWorld() {
         Bounds b = Main.proj.getWorldBoundsLatLon();
-        return lat() < b.min.lat() || lat() > b.max.lat() ||
-        lon() < b.min.lon() || lon() > b.max.lon();
+        return lat() < b.getMin().lat() || lat() > b.getMax().lat() ||
+        lon() < b.getMin().lon() || lon() > b.getMax().lon();
     }
 
@@ -98 +98 @@
      */
     public boolean isWithin(Bounds b) {
-        return lat() >= b.min.lat() && lat() <= b.max.lat() && lon() > b.min.lon() && lon() < b.max.lon();
+        return lat() >= b.getMin().lat() && lat() <= b.getMax().lat() && lon() > b.getMin().lon() && lon() < b.getMax().lon();
     }
 

trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java

@@ -45 +45 @@
         if(b != null)
         {
-            visit(b.min);
-            visit(b.max);
+            visit(b.getMin());
+            visit(b.getMax());
         }
     }