Changeset 2678 in josm

Timestamp:

2009-12-24T13:32:58+01:00 (14 years ago)

Author:

jttt

Message:

Minor cleanup in multipolygon code

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• Way.java (modified) (1 diff)
• visitor/paint/MapPaintVisitor.java (modified) (9 diffs)

trunk/src/org/openstreetmap/josm/data/osm/Way.java

@@ -398 +398 @@
         return super.isUsable() && !hasIncompleteNodes();
     }
+
+    @Override
+    public boolean isDrawable() {
+        return super.isDrawable() && !hasIncompleteNodes();
+    }
 }

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

@@ -190 +190 @@
     {
         Collection<PolyData> res = new LinkedList<PolyData>();
-        Object[] joinArray = join.toArray();
+        Way[] joinArray = join.toArray(new Way[join.size()]);
         int left = join.size();
         while(left != 0)
@@ -205 +205 @@
                     if(joinArray[i] != null)
                     {
-                        Way c = (Way)joinArray[i];
+                        Way c = joinArray[i];
                         if(w == null)
                         { w = c; selected = data.isSelected(w); joinArray[i] = null; --left; }
@@ -631 +631 @@
         for (PolyData pdOuter : outerPolygons)
         {
-            Integer c = pdOuter.contains(pdInner.poly);
+            int c = pdOuter.contains(pdInner.poly);
             if(c >= 1)
             {
@@ -664 +664 @@
         boolean drawn = false;
 
-        for (RelationMember m : r.getMembers())
-        {
+        // Fill inner and outer list with valid ways
+        for (RelationMember m : r.getMembers()) {
             if (m.getMember().isDeleted()) {
                 putError(r, tr("Deleted member ''{0}'' in relation.",
                         m.getMember().getDisplayName(DefaultNameFormatter.getInstance())), true);
-            } else if(m.getMember().isIncomplete()) {
+            } else if (m.getMember().isIncomplete()) {
                 incomplete = true;
-            } else {
+            } else if(m.getMember().isDrawable()) {
                 if(m.isWay()) {
                     Way w = m.getWay();
@@ -688 +688 @@
                             outer.add(w);
                         } else if(data.isSelected(r)) {
+                            // TODO Is this necessary?
                             drawSelectedMember(m.getMember(), styles != null
                                     ? getPrimitiveStyle(m.getMember()) : null, true, true);
@@ -701 +702 @@
         }
 
-        ElemStyle wayStyle = styles != null ? getPrimitiveStyle(r) : null;
-        if(styles != null && (wayStyle == null || !(wayStyle instanceof AreaElemStyle)))
-        {
-            for (Way w : outer)
-            {
-                if(wayStyle == null) {
-                    wayStyle = styles.getArea(w);
+        ElemStyle wayStyle = getPrimitiveStyle(r);
+
+        // If area style was not found for relation then use style of ways
+        if(styles != null && !(wayStyle instanceof AreaElemStyle)) {
+            for (Way w : outer) {
+                wayStyle = styles.getArea(w);
+                if(wayStyle != null) {
+                    break;
                 }
             }
@@ -713 +715 @@
         }
 
-        if(wayStyle != null && wayStyle instanceof AreaElemStyle)
-        {
+        if (wayStyle instanceof AreaElemStyle) {
             boolean zoomok = isZoomOk(wayStyle);
             boolean visible = false;
@@ -737 +738 @@
                 }
             }
+
+
             if(outerclosed.size() == 0 && outerjoin.size() == 0)
             {
@@ -771 +774 @@
                 }
             }
+
             if(!visible)
                 return drawn;