Changeset 17703 in josm

Timestamp:

2021-04-07T20:40:02+02:00 (3 years ago)

Author:

simon04

Message:

see #19399 - Extract interface IBounds

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• Bounds.java (modified) (16 diffs)
• IBounds.java (added)
• osm/BBox.java (modified) (14 diffs)

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

@@ -22 +22 @@
  * @see BBox to represent invalid areas.
  */
-public class Bounds {
+public class Bounds implements IBounds {
     /**
      * The minimum and maximum coordinates.
@@ -32 +32 @@
      * @return The point
      */
+    @Override
     public LatLon getMin() {
         return new LatLon(minLat, minLon);
@@ -42 +43 @@
      * @since 6203
      */
+    @Override
     public double getMinLat() {
         return minLat;
@@ -52 +54 @@
      * @since 6203
      */
+    @Override
     public double getMinLon() {
         return minLon;
@@ -60 +63 @@
      * @return The point
      */
+    @Override
     public LatLon getMax() {
         return new LatLon(maxLat, maxLon);
@@ -70 +74 @@
      * @since 6203
      */
+    @Override
     public double getMaxLat() {
         return maxLat;
@@ -80 +85 @@
      * @since 6203
      */
+    @Override
     public double getMaxLon() {
         return maxLon;
@@ -364 +370 @@
      * @return Center of the bounding box.
      */
+    @Override
     public LatLon getCenter() {
         if (crosses180thMeridian()) {
@@ -446 +453 @@
      * @since 12161
      */
+    @Override
     public boolean contains(ILatLon ll) {
         if (!ll.isLatLonKnown()) {
@@ -462 +470 @@
     }
 
-    private static boolean intersectsLonCrossing(Bounds crossing, Bounds notCrossing) {
-        return notCrossing.minLon <= crossing.maxLon || notCrossing.maxLon >= crossing.minLon;
+    private static boolean intersectsLonCrossing(IBounds crossing, IBounds notCrossing) {
+        return notCrossing.getMinLon() <= crossing.getMaxLon() || notCrossing.getMaxLon() >= crossing.getMinLon();
     }
 
@@ -473 +481 @@
      */
     public boolean intersects(Bounds b) {
-        if (b.maxLat < minLat || b.minLat > maxLat)
+        return intersects((IBounds) b);
+    }
+
+    @Override
+    public boolean intersects(IBounds b) {
+        if (b.getMaxLat() < minLat || b.getMinLat() > maxLat)
             return false;
 
@@ -483 +496 @@
             return true;
         } else {
-            return b.maxLon >= minLon && b.minLon <= maxLon;
+            return b.getMaxLon() >= minLon && b.getMinLon() <= maxLon;
         }
     }
@@ -492 +505 @@
      * @return true if this Bounds object crosses the 180th Meridian.
      */
+    @Override
     public boolean crosses180thMeridian() {
         return this.minLon > this.maxLon;
@@ -509 +523 @@
      * @since 14521
      */
+    @Override
     public double getHeight() {
         return maxLat-minLat;
@@ -518 +533 @@
      * @since 14521
      */
+    @Override
     public double getWidth() {
         return maxLon-minLon + (crosses180thMeridian() ? 360.0 : 0.0);
@@ -526 +542 @@
      * @return The area
      */
+    @Override
     public double getArea() {
         return getWidth() * getHeight();

trunk/src/org/openstreetmap/josm/data/osm/BBox.java

@@ -6 +6 @@
 
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.IBounds;
 import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -15 +16 @@
  * In contrast to a {@link Bounds} object, a BBox can represent an invalid (empty) area.
  */
-public class BBox {
+public class BBox implements IBounds {
 
     protected double xmin = Double.POSITIVE_INFINITY;
@@ -173 +174 @@
      */
     public void addPrimitive(OsmPrimitive primitive, double extraSpace) {
-        BBox primBbox = primitive.getBBox();
-        add(primBbox.xmin - extraSpace, primBbox.ymin - extraSpace);
-        add(primBbox.xmax + extraSpace, primBbox.ymax + extraSpace);
+        IBounds primBbox = primitive.getBBox();
+        add(primBbox.getMinLon() - extraSpace, primBbox.getMinLat() - extraSpace);
+        add(primBbox.getMaxLon() + extraSpace, primBbox.getMaxLat() + extraSpace);
     }
 
@@ -196 +197 @@
      */
     public double height() {
+        return getHeight();
+    }
+
+    @Override
+    public double getHeight() {
         if (isValid()) {
             return ymax - ymin;
@@ -208 +214 @@
      */
     public double width() {
+        return getWidth();
+    }
+
+    @Override
+    public double getWidth() {
         if (isValid()) {
             return xmax - xmin;
@@ -229 +240 @@
      */
     public boolean bounds(BBox b) {
-        return xmin <= b.xmin && xmax >= b.xmax
-            && ymin <= b.ymin && ymax >= b.ymax;
+        return contains(b);
     }
 
@@ -239 +249 @@
      */
     public boolean bounds(LatLon c) {
-        return xmin <= c.lon() && xmax >= c.lon()
-            && ymin <= c.lat() && ymax >= c.lat();
+        return contains(c);
     }
 
@@ -250 +259 @@
      */
     public boolean intersects(BBox b) {
-        return xmin <= b.xmax && xmax >= b.xmin
-            && ymin <= b.ymax && ymax >= b.ymin;
+        return intersects((IBounds) b);
     }
 
@@ -268 +276 @@
      */
     public double getTopLeftLat() {
+        return getMaxLat();
+    }
+
+    @Override
+    public double getMaxLat() {
         return ymax;
     }
@@ -277 +290 @@
      */
     public double getTopLeftLon() {
+        return getMinLon();
+    }
+
+    @Override
+    public double getMinLon() {
         return xmin;
     }
@@ -294 +312 @@
      */
     public double getBottomRightLat() {
+        return getMinLat();
+    }
+
+    @Override
+    public double getMinLat() {
         return ymin;
     }
@@ -303 +326 @@
      */
     public double getBottomRightLon() {
+        return getMaxLon();
+    }
+
+    @Override
+    public double getMaxLon() {
         return xmax;
     }
@@ -310 +338 @@
      * @return The center.
      */
+    @Override
     public LatLon getCenter() {
         return new LatLon(ymin + (ymax-ymin)/2.0, xmin + (xmax-xmin)/2.0);
@@ -391 +420 @@
      * @since 11269
      */
+    @Override
     public boolean isValid() {
         return xmin <= xmax && ymin <= ymax;