Changeset 4627 in josm for trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java

Timestamp:

2011-12-03T00:14:54+01:00 (12 years ago)

Author:

Don-vip

Message:

Major performance improvements in multipolygons rendering

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java (modified) (5 diffs)

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

@@ -26 +26 @@
 import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
 import org.openstreetmap.josm.gui.NavigatableComponent;
-import org.openstreetmap.josm.gui.NavigatableComponent.ZoomChangeListener;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -34 +33 @@
  * 
  */
-public class MultipolygonCache implements DataSetListener, LayerChangeListener, ZoomChangeListener, ProjectionChangeListener {
+public class MultipolygonCache implements DataSetListener, LayerChangeListener, ProjectionChangeListener {
 
     private static final MultipolygonCache instance = new MultipolygonCache(); 
@@ -41 +40 @@
     
     private MultipolygonCache() {
-        this.cache = new HashMap<NavigatableComponent, Map<DataSet, Map<Relation,Multipolygon>>>();
+        this.cache = new HashMap<NavigatableComponent, Map<DataSet, Map<Relation, Multipolygon>>>();
         Main.addProjectionChangeListener(this);
     }
@@ -66 +65 @@
             multipolygon = map2.get(r);
             if (multipolygon == null || forceRefresh) {
-                map2.put(r, multipolygon = new Multipolygon(nc, r));
+                map2.put(r, multipolygon = new Multipolygon(r));
             }
         }
@@ -209 +208 @@
 
     @Override
-    public void zoomChanged(/*NavigatableComponent source*/) {
-        // TODO Change zoomChanged() method to add a "NavigatableComponent source" argument ? (this method is however used at least by one plugin)
-        //clear(source);
-        clear();
-    }
-
-    @Override
     public void projectionChanged(Projection oldValue, Projection newValue) {
         clear();