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

Timestamp:

01.05.2011 21:56:49 (13 months ago)

Author:

jttt

Message:

Improved wms cache

• files saved in original format (no need to recode to png)
• possibility to tile with different pos/ppd that overlaps current tile

File:

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

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

@@ -6 +6 @@
 /**
  * This is a simple data class for "rectangular" areas of the world, given in
- * lat/lon min/max values.
+ * east/north min/max values.
  *
  * @author imi
@@ -14 +14 @@
      * The minimum and maximum coordinates.
      */
-    public EastNorth min, max;
+    public double minEast, minNorth, maxEast, maxNorth;
 
     /**
@@ -20 +20 @@
      */
     public ProjectionBounds(EastNorth min, EastNorth max) {
-        this.min = min;
-        this.max = max;
+        this.minEast = min.east();
+        this.minNorth = min.north();
+        this.maxEast = max.east();
+        this.maxNorth = max.north();
     }
     public ProjectionBounds(EastNorth p) {
-        this.min = p;
-        this.max = p;
+        this.minEast = this.maxEast = p.east();
+        this.minNorth = this.maxNorth = p.north();
     }
     public ProjectionBounds(EastNorth center, double east, double north) {
-        this.min = new EastNorth(center.east()-east/2.0, center.north()-north/2.0);
-        this.max = new EastNorth(center.east()+east/2.0, center.north()+north/2.0);
+        this.minEast = center.east()-east/2.0;
+        this.minNorth = center.north()-north/2.0;
+        this.maxEast = center.east()+east/2.0;
+        this.maxNorth = center.north()+north/2.0;
+    }
+    public ProjectionBounds(double minEast, double minNorth, double maxEast, double maxNorth) {
+        this.minEast = minEast;
+        this.minNorth = minNorth;
+        this.maxEast = maxEast;
+        this.maxNorth = maxNorth;
     }
     public void extend(EastNorth e)
     {
-        if (e.east() < min.east() || e.north() < min.north())
-            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()));
+        if (e.east() < minEast) {
+            minEast = e.east();
+        }
+        if (e.east() > maxEast) {
+            maxEast = e.east();
+        }
+        if (e.north() < minNorth) {
+            minNorth = e.north();
+        }
+        if (e.north() > maxNorth) {
+            maxNorth = e.north();
+        }
     }
     public EastNorth getCenter()
     {
-        return min.getCenter(max);
+        return new EastNorth((minEast + maxEast) / 2.0, (minNorth + maxNorth) / 2.0);
     }
 
     @Override public String toString() {
-        return "ProjectionBounds["+min.east()+","+min.north()+","+max.east()+","+max.north()+"]";
+        return "ProjectionBounds["+minEast+","+minNorth+","+maxEast+","+maxNorth+"]";
     }
+
+    /**
+     * The two bounds intersect? Compared to java Shape.intersects, if does not use
+     * the interior but the closure. (">=" instead of ">")
+     */
+    public boolean intersects(ProjectionBounds b) {
+        return b.maxEast >= minEast &&
+        b.maxNorth >= minNorth &&
+        b.minEast <= maxEast &&
+        b.minNorth <= maxNorth;
+    }
+
+    public EastNorth getMin() {
+        return new EastNorth(minEast, minNorth);
+    }
+
+    public EastNorth getMax() {
+        return new EastNorth(maxEast, maxNorth);
+    }
+
 }