Changeset 1724 in josm for trunk/src/org/openstreetmap/josm/data/ProjectionBounds.java

Timestamp:

2009-07-03T22:19:22+02:00 (15 years ago)

Author:

stoecker

Message:

some more changes and bug fixes related to new projection stuff - GPX should now work also

File:

• trunk/src/org/openstreetmap/josm/data/ProjectionBounds.java (modified) (2 diffs)

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

@@ -25 +25 @@
         this.max = max;
     }
+    public ProjectionBounds(EastNorth p) {
+        this.min = p;
+        this.max = p;
+    }
     public ProjectionBounds(EastNorth center, double east, double north) {
         this.min = new EastNorth(center.east()-east/2.0, center.north()-north/2.0);
@@ -32 +36 @@
     {
         if (e.east() < min.east() || e.north() < min.north())
-            min = e;
-        else if (e.east() > max.east() || e.north() > max.north())
-            max = e;
+            min = new EastNorth(Math.min(e.east(), min.east()), Math.min(e.north(), min.north()));
+        if (e.east() > max.east() || e.north() > max.north())
+            max = new EastNorth(Math.max(e.east(), max.east()), Math.max(e.north(), max.north()));
     }
     public EastNorth getCenter()
     {
-        return  new EastNorth(min.east()/2+max.east()/2, min.north()/2+max.north()/2);
+        return min.getCenter(max);
+    }
+
+    @Override public String toString() {
+        return "ProjectionBounds["+min.east()+","+min.north()+","+max.east()+","+max.north()+"]";
     }
 }