Changeset 18956 in josm for trunk/src

Timestamp:

2024-01-24T14:11:38+01:00 (10 months ago)

Author:

GerdP

Message:

fix #20405: History browser for complex relations requires lots of memory

• avoid to create equal instances of RelationMemberData. This is simple and very effective when relations have many versions as most members are the same in each version

File:

• trunk/src/org/openstreetmap/josm/io/AbstractParser.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/io/AbstractParser.java

@@ -5 +5 @@
 
 import java.time.Instant;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -31 +33 @@
     /** if true, replace user information in input by anonymous user */
     protected boolean useAnonymousUser;
+    private Map<RelationMemberData, RelationMemberData> memberCache = new HashMap<>();
 
     @Override
@@ -182 +185 @@
         String role = getMandatoryAttributeString(atts, "role");
         RelationMemberData member = new RelationMemberData(role, type, ref);
-        ((HistoryRelation) currentPrimitive).addMember(member);
+        // see #20405: cache equal instances of members
+        RelationMemberData cachedMember = memberCache .putIfAbsent(member, member);
+        if (cachedMember == null)
+            cachedMember = member;
+        ((HistoryRelation) currentPrimitive).addMember(cachedMember);
     }