Changeset 17752 in josm for trunk/src/org/openstreetmap/josm/data/osm/Relation.java

Timestamp:

2021-04-12T00:16:06+02:00 (4 years ago)

Author:

simon04

Message:

see #20745 - Avoid heap allocations due to BBox in IPrimitive.getBBox

Cache and return an immutable bounding box.

37.75% in MapCSSTagCheckerPerformanceTest#testCity amount to BBox::new via IPrimitive.getBBox

File:

• trunk/src/org/openstreetmap/josm/data/osm/Relation.java (modified) (1 diff)

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

@@ -441 +441 @@
     @Override
     public BBox getBBox() {
-        if (getDataSet() != null && bbox != null)
-            return new BBox(bbox); // use cached value
+        if (getDataSet() != null && bbox != null) {
+            return this.bbox; // use cached immutable value
+        }
 
         BBox box = new BBox();
         addToBBox(box, new HashSet<PrimitiveId>());
-        if (getDataSet() != null)
-            setBBox(box); // set cache
-        return new BBox(box);
+        if (getDataSet() == null) {
+            return box;
+        }
+        setBBox(box); // set cached immutable value
+        return this.bbox;
     }
 
     private void setBBox(BBox bbox) {
-        this.bbox = bbox;
+        this.bbox = bbox == null ? null : bbox.toImmutable();
     }