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

Timestamp:

2011-12-01T18:07:30+01:00 (12 years ago)

Author:

Don-vip

Message:

see #7101 and #6987 - Avoid Data consistency error in multipolygon cache after undo/redo

File:

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

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

@@ -50 +50 @@
 
     public final Multipolygon get(NavigatableComponent nc, Relation r) {
+        return get(nc, r, false);
+    }
+
+    public final Multipolygon get(NavigatableComponent nc, Relation r, boolean forceRefresh) {
         Multipolygon multipolygon = null;
         if (nc != null && r != null) {
@@ -61 +65 @@
             }
             multipolygon = map2.get(r);
-            if (multipolygon == null) {
+            if (multipolygon == null || forceRefresh) {
                 map2.put(r, multipolygon = new Multipolygon(nc, r));
             }
@@ -130 +134 @@
                     removeMultipolygonFrom((Relation) p, maps);
                     
-                } else if (p instanceof Way) {
+                } else if (p instanceof Way && p.getDataSet() != null) {
                     for (OsmPrimitive ref : p.getReferrers()) {
                         if (isMultipolygon(ref)) {
@@ -139 +143 @@
                         }
                     }
-                } else if (p instanceof Node) {
+                } else if (p instanceof Node && p.getDataSet() != null) {
                     maps = removeMultipolygonsReferringTo(p.getReferrers(), ds, maps);
                 }