Changeset 4623 in josm

Timestamp:

Dec 1, 2011 12:53:26 AM (18 months ago)

Author:

Don-vip

Message:

see #6987 - multipolygon cache aware of events requiring cache refresh (data change, zoom, layer removing)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/visitor/paint/MapPainter.java (modified) (2 diffs)
• data/osm/visitor/paint/relations/Multipolygon.java (modified) (5 diffs)
• data/osm/visitor/paint/relations/MultipolygonCache.java (added)
• data/validation/tests/MultipolygonTest.java (modified) (1 diff)
• gui/MapView.java (modified) (4 diffs)
• gui/layer/OsmDataLayer.java (modified) (2 diffs)
• gui/mappaint/ElemStyles.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPainter.java

@@ -38 +38 @@
 import org.openstreetmap.josm.data.osm.visitor.paint.relations.Multipolygon;
 import org.openstreetmap.josm.data.osm.visitor.paint.relations.Multipolygon.PolyData;
+import org.openstreetmap.josm.data.osm.visitor.paint.relations.MultipolygonCache;
 import org.openstreetmap.josm.gui.NavigatableComponent;
 import org.openstreetmap.josm.gui.mappaint.BoxTextElemStyle;
@@ -860 +861 @@
 
     public void drawArea(Relation r, Color color, BufferedImage fillImage, float fillImageAlpha, TextElement text) {
-        Multipolygon multipolygon = new Multipolygon(nc);
-        multipolygon.load(r);
+        Multipolygon multipolygon = MultipolygonCache.getInstance().get(nc, r);
         if(!r.isDisabled() && !multipolygon.getOuterWays().isEmpty()) {
             for (PolyData pd : multipolygon.getCombinedPolygons()) {

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java

@@ -134 +134 @@
      */
     private static MultipolygonRoleMatcher roleMatcher;
-    private static MultipolygonRoleMatcher getMultipoloygonRoleMatcher() {
+    private static MultipolygonRoleMatcher getMultipolygonRoleMatcher() {
         if (roleMatcher == null) {
             roleMatcher = new MultipolygonRoleMatcher();
@@ -237 +237 @@
     }
 
-    private final NavigatableComponent nc;
-
     private final List<Way> innerWays = new ArrayList<Way>();
     private final List<Way> outerWays = new ArrayList<Way>();
@@ -245 +243 @@
     private final List<PolyData> combinedPolygons = new ArrayList<PolyData>();
 
-    public Multipolygon(NavigatableComponent nc) {
-        this.nc = nc;
-    }
-
-    public void load(Relation r) {
-        MultipolygonRoleMatcher matcher = getMultipoloygonRoleMatcher();
+    public Multipolygon(NavigatableComponent nc, Relation r) {
+        load(r, nc);
+    }
+
+    private void load(Relation r, NavigatableComponent nc) {
+        MultipolygonRoleMatcher matcher = getMultipolygonRoleMatcher();
 
         // Fill inner and outer list with valid ways
@@ -273 +271 @@
         }
 
-        createPolygons(innerWays, innerPolygons);
-        createPolygons(outerWays, outerPolygons);
+        createPolygons(nc, innerWays, innerPolygons);
+        createPolygons(nc, outerWays, outerPolygons);
         if (!outerPolygons.isEmpty()) {
             addInnerToOuters();
@@ -280 +278 @@
     }
 
-    private void createPolygons(List<Way> ways, List<PolyData> result) {
+    private void createPolygons(NavigatableComponent nc, List<Way> ways, List<PolyData> result) {
         List<Way> waysToJoin = new ArrayList<Way>();
         for (Way way: ways) {

trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java

@@ -134 +134 @@
             checkMembersAndRoles(r);
 
-            Multipolygon polygon = new Multipolygon(Main.map.mapView);
-            polygon.load(r);
+            Multipolygon polygon = new Multipolygon(Main.map.mapView, r);
 
             boolean hasOuterWay = false;

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

@@ -45 +45 @@
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.data.osm.visitor.paint.PaintColors;
+import org.openstreetmap.josm.data.osm.visitor.paint.relations.MultipolygonCache;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -51 +52 @@
 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;
@@ -238 +238 @@
             }
         });
+        
+        // Add Multipolygon cache to layer and zoom listeners
+        addLayerChangeListener(MultipolygonCache.getInstance());
+        addZoomChangeListener(MultipolygonCache.getInstance());
     }
 
@@ -843 +847 @@
         Main.pref.removePreferenceChangeListener(this);
         DataSet.removeSelectionListener(repaintSelectionChangedListener);
-        MapPaintStyles.getStyles().clearMultipolygonsCache(this);
+        MultipolygonCache.getInstance().clear(this);
     }
 

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -63 +63 @@
 import org.openstreetmap.josm.data.osm.visitor.paint.MapRendererFactory;
 import org.openstreetmap.josm.data.osm.visitor.paint.Rendering;
+import org.openstreetmap.josm.data.osm.visitor.paint.relations.MultipolygonCache;
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.validation.TestError;
@@ -207 +208 @@
         conflicts = new ConflictCollection();
         data.addDataSetListener(new DataSetListenerAdapter(this));
+        data.addDataSetListener(MultipolygonCache.getInstance());
         DataSet.addSelectionListener(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;
 
@@ -17 +15 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.paint.relations.Multipolygon;
+import org.openstreetmap.josm.data.osm.visitor.paint.relations.MultipolygonCache;
 import org.openstreetmap.josm.gui.NavigatableComponent;
 import org.openstreetmap.josm.gui.mappaint.StyleCache.StyleList;
@@ -31 +30 @@
     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>>();
     }
 
@@ -121 +117 @@
     }
 
-    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.
@@ -179 +161 @@
                     continue;
                 }
-                Multipolygon multipolygon = getCachedMultipolygon(nc, r);
+                Multipolygon multipolygon = MultipolygonCache.getInstance().get(nc, r);
 
                 if (multipolygon.getOuterWays().contains(osm)) {
@@ -244 +226 @@
                     continue;
                 }
-                final Multipolygon multipolygon = getCachedMultipolygon(nc, ref);
+                final Multipolygon multipolygon = MultipolygonCache.getInstance().get(nc, ref);
 
                 if (multipolygon.getInnerWays().contains(osm)) {
@@ -277 +259 @@
                 if (!Utils.exists(p.a, AreaElemStyle.class)) {
                     // look at outer ways to find area style
-                    Multipolygon multipolygon = new Multipolygon(nc);
-                    multipolygon.load((Relation) osm);
+                    Multipolygon multipolygon = MultipolygonCache.getInstance().get(nc, (Relation) osm);
                     for (Way w : multipolygon.getOuterWays()) {
                         Pair<StyleList, Range> wayStyles = generateStyles(w, scale, null, false);
@@ -429 +410 @@
         styleSources.addAll(sources);
     }
-
-    public void clearMultipolygonsCache(NavigatableComponent nc) {
-        multipolygonsCache.remove(nc);
-    }
 }