Changeset 4649 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

10.12.2011 16:56:02 (6 months ago)

Author:

Don-vip

Message:

see #7131 and #6987 - Let Multipolygon cache handle incomplete relations

Location:

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations

Files:

• Multipolygon.java (modified) (3 diffs)
• MultipolygonCache.java (modified) (1 diff)

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

@@ -336 +336 @@
     private final List<PolyData> outerPolygons = new ArrayList<PolyData>();
     private final List<PolyData> combinedPolygons = new ArrayList<PolyData>();
+    
+    private boolean incomplete;
 
     public Multipolygon(Relation r) {
@@ -346 +348 @@
         // Fill inner and outer list with valid ways
         for (RelationMember m : r.getMembers()) {
-            if (m.getMember().isDrawable()) {
+            if (m.getMember().isIncomplete()) {
+                this.incomplete = true;
+            } else if (m.getMember().isDrawable()) {
                 if (m.isWay()) {
                     Way w = m.getWay();
@@ -370 +374 @@
             addInnerToOuters();
         }
+    }
+    
+    public final boolean isIncomplete() {
+        return incomplete;
     }
 

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

@@ -229 +229 @@
     @Override
     public void dataChanged(DataChangedEvent event) {
-        // Do nothing
+        // Do not call updateMultipolygonsReferringTo as getPrimitives() 
+        // can return all the data set primitives for this event
+        Collection<Map<Relation, Multipolygon>> maps = null;
+        for (OsmPrimitive p : event.getPrimitives()) {
+            if (isMultipolygon(p)) {
+                if (maps == null) {
+                    maps = getMapsFor(event.getDataset());
+                }
+                for (Map<Relation, Multipolygon> map : maps) {
+                    Multipolygon mp = map.get(p);
+                    // DataChangedEvent is sent after downloading incomplete members,
+                    // without having received RelationMembersChangedEvent or PrimitivesAddedEvent
+                    if (mp != null && mp.isIncomplete()) {
+                        // This ensures previously incomplete multipolygons will be correctly redrawn
+                        map.remove(p);
+                    }
+                }
+            }
+        }
     }