Changeset 17581 in josm for trunk/src/org

Timestamp:

2021-03-17T22:15:55+01:00 (4 years ago)

Author:

simon04

Message:

see #20613 - Avoid heap allocations in MapViewState.getOutsideRectangleFlags

4.74% in AbstractMapRendererPerformanceTestParent#testCity amount to Rectangle2D.Double from MapViewState

File:

• trunk/src/org/openstreetmap/josm/gui/MapViewState.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/MapViewState.java

@@ -559 +559 @@
          */
         public int getOutsideRectangleFlags(MapViewRectangle rect) {
-            Rectangle2D bounds = rect.getInView();
             int flags = 0;
-            if (getInViewX() < bounds.getMinX()) {
+            double inViewX = getInViewX();
+            if (inViewX < rect.getInViewMinX()) {
                 flags |= OUTSIDE_LEFT;
-            } else if (getInViewX() > bounds.getMaxX()) {
+            } else if (inViewX > rect.getInViewMaxX()) {
                 flags |= OUTSIDE_RIGHT;
             }
-            if (getInViewY() < bounds.getMinY()) {
+            double inViewY = getInViewY();
+            if (inViewY < rect.getInViewMinY()) {
                 flags |= OUTSIDE_TOP;
-            } else if (getInViewY() > bounds.getMaxY()) {
+            } else if (inViewY > rect.getInViewMaxY()) {
                 flags |= OUTSIDE_BOTTOM;
             }
@@ -734 +735 @@
             double y2 = p2.getInViewY();
             return new Rectangle2D.Double(Math.min(x1, x2), Math.min(y1, y2), Math.abs(x1 - x2), Math.abs(y1 - y2));
+        }
+
+        double getInViewMinX() {
+            return Math.min(p1.getInViewX(), p2.getInViewX());
+        }
+
+        double getInViewMaxX() {
+            return Math.max(p1.getInViewX(), p2.getInViewX());
+        }
+
+        double getInViewMinY() {
+            return Math.min(p1.getInViewY(), p2.getInViewY());
+        }
+
+        double getInViewMaxY() {
+            return Math.max(p1.getInViewY(), p2.getInViewY());
         }