Changeset 4621 in josm for trunk

Timestamp:

2011-11-29T21:25:55+01:00 (12 years ago)

Author:

Don-vip

Message:

fix #6987 - Crashing on osm file open -> Fix a performance problem with very large multipolygons loaded thousands of times

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MapView.java (modified) (2 diffs)
• mappaint/ElemStyles.java (modified) (6 diffs)

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

@@ -51 +51 @@
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
 import org.openstreetmap.josm.gui.layer.markerlayer.PlayHeadMarker;
+import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
 import org.openstreetmap.josm.tools.AudioPlayer;
 import org.openstreetmap.josm.tools.BugReportExceptionHandler;
@@ -842 +843 @@
         Main.pref.removePreferenceChangeListener(this);
         DataSet.removeSelectionListener(repaintSelectionChangedListener);
+        MapPaintStyles.getStyles().clearMultipolygonsCache(this);
     }
 

trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java

@@ -6 +6 @@
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
 
@@ -28 +30 @@
     private boolean defaultNodes, defaultLines;
     private int defaultNodesIdx, defaultLinesIdx;
+    
+    private final Map<NavigatableComponent, Map<Relation, Multipolygon>> multipolygonsCache;
 
     public ElemStyles()
     {
         styleSources = new ArrayList<StyleSource>();
+        multipolygonsCache = new HashMap<NavigatableComponent, Map<Relation,Multipolygon>>();
     }
 
@@ -116 +121 @@
     }
 
+    private final Multipolygon getCachedMultipolygon(NavigatableComponent nc, Relation r) {
+        Multipolygon multipolygon = null;
+        Map<Relation, Multipolygon> map = multipolygonsCache.get(nc);
+        if (map == null) {
+            multipolygonsCache.put(nc, map = new HashMap<Relation, Multipolygon>());
+        }
+        multipolygon = map.get(r);
+        if (multipolygon == null) {
+            map.put(r, multipolygon = new Multipolygon(nc));
+            multipolygon.load(r);
+        }
+        return multipolygon;
+    }
+    
     /**
      * Create the list of styles and its valid scale range for one primitive.
@@ -160 +179 @@
                     continue;
                 }
-                Multipolygon multipolygon = new Multipolygon(nc);
-                multipolygon.load(r);
+                Multipolygon multipolygon = getCachedMultipolygon(nc, r);
 
                 if (multipolygon.getOuterWays().contains(osm)) {
@@ -226 +244 @@
                     continue;
                 }
-                Multipolygon multipolygon = new Multipolygon(nc);
-                multipolygon.load(ref);
+                final Multipolygon multipolygon = getCachedMultipolygon(nc, ref);
 
                 if (multipolygon.getInnerWays().contains(osm)) {
@@ -413 +430 @@
     }
 
+    public void clearMultipolygonsCache(NavigatableComponent nc) {
+        multipolygonsCache.remove(nc);
+    }
 }