Changeset 6203 in josm for trunk/src/org/openstreetmap/josm/data/coor

Timestamp:

2013-08-28T03:03:40+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #9024 - bbox/bounds memory optimizations (modified patch by shinigami) + javadoc

Location:

trunk/src/org/openstreetmap/josm/data/coor

Files:

• Coordinate.java (modified) (2 diffs)
• LatLon.java (modified) (1 diff)

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

@@ -3 +3 @@
 
 import java.io.Serializable;
+
+import org.openstreetmap.josm.data.osm.BBox;
 
 /**
@@ -89 +91 @@
     }
 
+    /**
+     * Converts to single point BBox.
+     * 
+     * @return single point BBox defined by this coordinate.
+     * @since 6203
+     */
+    public BBox toBBox() {
+        return new BBox(x, y);
+    }
+    
+    /**
+     * Creates bbox around this coordinate. Coordinate defines
+     * center of bbox, its edge will be 2*r.
+     * 
+     * @param r size
+     * @return BBox around this coordinate
+     * @since 6203
+     */
+    public BBox toBBox(final double r) {
+        return new BBox(x - r, y - r, x + r, y + r);
+    }
+
     @Override
     public int hashCode() {

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

@@ -216 +216 @@
     public boolean isOutSideWorld() {
         Bounds b = Main.getProjection().getWorldBoundsLatLon();
-        return lat() < b.getMin().lat() || lat() > b.getMax().lat() ||
-                lon() < b.getMin().lon() || lon() > b.getMax().lon();
+        return lat() < b.getMinLat() || lat() > b.getMaxLat() ||
+                lon() < b.getMinLon() || lon() > b.getMaxLon();
     }