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

Timestamp:

2009-01-15T19:54:02+01:00 (16 years ago)

Author:

stoecker

Message:

fixed som quirks in multipolygon handling

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java

@@ -117 +117 @@
 
         profilerVisibleNodes++;
-        
+
         IconElemStyle nodeStyle = (IconElemStyle)getPrimitiveStyle(n);
 
         if(profilerOmitDraw)
             return;
-            
+
         if (nodeStyle != null && isZoomOk(nodeStyle))
             drawNode(n, nodeStyle.icon, nodeStyle.annotate, n.selected);
@@ -161 +161 @@
 
         w.mappaintVisibleCode = 0;
+        if(fillAreas)
+            w.clearErrors();
 
         if(wayStyle==null)
@@ -185 +187 @@
                     profilerVisibleAreas++;
                     drawArea(polygon, w.selected ? selectedColor : ((AreaElemStyle)wayStyle).color);
+                    if(!w.isClosed())
+                        w.putError(tr("Area style way is not closed."), true);
                 }
                 drawWay(w, ((AreaElemStyle)wayStyle).line, ((AreaElemStyle)wayStyle).color, w.selected);
@@ -421 +425 @@
 
     public void visit(Relation r) {
-   
+
         r.mappaintVisibleCode = 0;
         /* TODO implement visible handling for relations too */
@@ -512 +516 @@
         {
             Boolean zoomok = isZoomOk(wayStyle);
+            Boolean visible = false;
             Collection<Way> join = new LinkedList<Way>();
 
@@ -541 +546 @@
                 r.putError(tr("No outer way for multipolygon ''{0}''.",
                 r.getName()), true);
-            }
-            else if(zoomok) 
+                visible = true; /* prevent killing remaining ways */
+            }
+            else if(zoomok)
             {
                 class PolyData {
@@ -638 +644 @@
                 for (PolyData pd : poly)
                 {
-                    drawArea(pd.get(), (pd.way.selected || r.selected) ? selectedColor
-                    : ((AreaElemStyle)wayStyle).color);
-                }
+                    if(isPolygonVisible(pd.get()))
+                    {
+                        drawArea(pd.get(), (pd.way.selected || r.selected) ? selectedColor
+                        : ((AreaElemStyle)wayStyle).color);
+                        visible = true;
+                    }
+                }
+            }
+            if(!visible) /* nothing visible, so disable relation and all its ways */
+            {
+                r.mappaintVisibleCode = viewid;
+                for (Way wInner : inner)
+                    wInner.mappaintVisibleCode = viewid;
+                for (Way wOuter : outer)
+                    wOuter.mappaintVisibleCode = viewid;
+                return;
             }
             for (Way wInner : inner)
@@ -647 +666 @@
                 if(innerStyle == null)
                 {
-                    if(zoomok)
+                    if(zoomok && (wInner.mappaintDrawnCode != paintid
+                    || outer.size() == 0))
                     {
                         drawWay(wInner, ((AreaElemStyle)wayStyle).line,