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

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/osm

Files:

• BBox.java (modified) (5 diffs)
• DatasetConsistencyTest.java (modified) (1 diff)
• QuadBuckets.java (modified) (1 diff)
• visitor/paint/StyledMapRenderer.java (modified) (1 diff)
• visitor/paint/WireframeMapRenderer.java (modified) (1 diff)

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

@@ -4 +4 @@
 import java.util.Arrays;
 
-import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.coor.QuadTiling;
@@ -16 +15 @@
     private double ymax = Double.NEGATIVE_INFINITY;
 
-    public BBox(Bounds bounds) {
-        add(bounds.getMin());
-        add(bounds.getMax());
-    }
-
+    /**
+     * Constructs a new {@code BBox} defined by a single point.
+     * 
+     * @param x X coordinate
+     * @param y Y coordinate
+     * @since 6203
+     */
+    public BBox(final double x, final double y) {
+        xmax = xmin = x;
+        ymax = ymin = y;
+        sanity();
+    }
+
+    /**
+     * Constructs a new {@code BBox} defined by points <code>a</code> and <code>b</code>.
+     * Result is minimal BBox containing both points.
+     * 
+     * @param a 
+     * @param b
+     */
     public BBox(LatLon a, LatLon b) {
-        add(a);
-        add(b);
-    }
-
+        this(a.lon(), a.lat(), b.lon(), b.lat());
+    }
+
+    /**
+     * Constructs a new {@code BBox} from another one.
+     * 
+     * @param copy the BBox to copy
+     */
     public BBox(BBox copy) {
         this.xmin = copy.xmin;
@@ -34 +52 @@
 
     public BBox(double a_x, double a_y, double b_x, double b_y)  {
-        xmin = Math.min(a_x, b_x);
-        xmax = Math.max(a_x, b_x);
-        ymin = Math.min(a_y, b_y);
-        ymax = Math.max(a_y, b_y);
+        
+        if (a_x > b_x) {
+            xmax = a_x;
+            xmin = b_x;
+        } else {
+            xmax = b_x;
+            xmin = a_x;
+        }
+        
+        if (a_y > b_y) {
+            ymax = a_y;
+            ymin = b_y;
+        } else {
+            ymax = b_y;
+            ymin = a_y;
+        }
+        
         sanity();
     }
@@ -84 +115 @@
      */
     public void add(double x, double y) {
-        xmin = Math.min(xmin, x);
-        xmax = Math.max(xmax, x);
-        ymin = Math.min(ymin, y);
-        ymax = Math.max(ymax, y);
+        
+        if (x < xmin) {
+            xmin = x;
+        } else if (x > xmax) {
+            xmax = x;
+        }
+        
+        if (y < ymin) {
+            ymin = y;
+        } else if (y > ymax) {
+            ymax = y;
+        }
+
         sanity();
     }
 
     public void add(BBox box) {
-        add(box.getTopLeft());
-        add(box.getBottomRight());
+        xmin = Math.min(xmin, box.xmin);
+        xmax = Math.max(xmax, box.xmax);
+        ymin = Math.min(ymin, box.ymin);
+        ymax = Math.max(ymax, box.ymax);
+        sanity();
     }
 
@@ -151 +194 @@
     }
 
+    /**
+     * Returns the top-left point.
+     * @return The top-left point
+     */
     public LatLon getTopLeft() {
         return new LatLon(ymax, xmin);
     }
 
+    /**
+     * Returns the latitude of top-left point.
+     * @return The latitude of top-left point
+     * @since 6203
+     */
+    public double getTopLeftLat() {
+        return ymax;
+    }
+
+    /**
+     * Returns the longitude of top-left point.
+     * @return The longitude of top-left point
+     * @since 6203
+     */
+    public double getTopLeftLon() {
+        return xmin;
+    }
+
+    /**
+     * Returns the bottom-right point.
+     * @return The bottom-right point
+     */
     public LatLon getBottomRight() {
         return new LatLon(ymin, xmax);
+    }
+
+    /**
+     * Returns the latitude of bottom-right point.
+     * @return The latitude of bottom-right point
+     * @since 6203
+     */
+    public double getBottomRightLat() {
+        return ymin;
+    }
+
+    /**
+     * Returns the longitude of bottom-right point.
+     * @return The longitude of bottom-right point
+     * @since 6203
+     */
+    public double getBottomRightLon() {
+        return xmax;
     }
 

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

@@ -81 +81 @@
                 LatLon c = n.getCoor();
                 if (c != null) {
-                    BBox box = new BBox(new LatLon(c.lat() - 0.0001, c.lon() - 0.0001), new LatLon(c.lat() + 0.0001, c.lon() + 0.0001));
+                    BBox box = c.toBBox(0.0001);
                     if (!dataSet.searchNodes(box).contains(n)) {
                         printError("SEARCH NODES", "%s not found using Dataset.searchNodes()", n);

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

@@ -117 +117 @@
             double lat = bottom_left.lat() + parent.height() / 2;
             double lon = bottom_left.lon() + parent.width() / 2;
-            LatLon top_right = new LatLon(lat, lon);
-            return new BBox(bottom_left, top_right);
+            return new BBox(bottom_left.lon(), bottom_left.lat(), lon, lat);
         }
 

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -1404 +1404 @@
     public void render(final DataSet data, boolean renderVirtualNodes, Bounds bounds) {
         //long start = System.currentTimeMillis();
-        BBox bbox = new BBox(bounds);
+        BBox bbox = bounds.toBBox();
         getSettings(renderVirtualNodes);
 

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java

@@ -157 +157 @@
     @Override
     public void render(DataSet data, boolean virtual, Bounds bounds) {
-        BBox bbox = new BBox(bounds);
+        BBox bbox = bounds.toBBox();
         this.ds = data;
         getSettings(virtual);