Changeset 16559 in josm for trunk

Timestamp:

2020-06-07T17:02:23+02:00 (4 years ago)

Author:

simon04

Message:

fix #19356, see #18750 - Deduplicate ImageryBounds

Reduces retained size of ImageryBounds from 3_372_384 to 1_985_952

File:

• trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java

@@ -7 +7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -132 +133 @@
         private ImageryInfo mirrorEntry;
         private ImageryBounds bounds;
+        private Map<ImageryBounds, ImageryBounds> boundsInterner = new HashMap<>();
         private Shape shape;
         // language of last element, does only work for simple ENTRY_ATTRIBUTE's
@@ -542 +544 @@
                 break;
             case BOUNDS:
-                entry.setBounds(bounds);
+                entry.setBounds(intern(bounds));
                 bounds = null;
                 break;
@@ -567 +569 @@
                 // nothing to do for these or the unknown type
             }
+        }
+
+        private ImageryBounds intern(ImageryBounds imageryBounds) {
+            return boundsInterner.computeIfAbsent(imageryBounds, ignore -> imageryBounds);
         }
     }