Changeset 3329 in josm

Timestamp:

2010-06-10T09:53:42+02:00 (14 years ago)

Author:

stoecker

Message:

improve painting of disabled multipolygons

File:

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

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

@@ -373 +373 @@
         ElemStyle wayStyle = getPrimitiveStyle(r, false);
 
+        boolean disabled = r.isDisabled();
         // If area style was not found for relation then use style of ways
         if(styles != null && !(wayStyle instanceof AreaElemStyle)) {
             for (Way w : multipolygon.getOuterWays()) {
                 wayStyle = styles.getArea(w);
+                disabled = disabled || w.isDisabled();
                 if(wayStyle != null) {
                     break;
                 }
             }
-            r.mappaintStyle = wayStyle;
         }
 
@@ -390 +391 @@
             drawn = true;
 
-            if(zoomok && !multipolygon.getOuterWays().isEmpty()) {
+            if(zoomok && !disabled && !multipolygon.getOuterWays().isEmpty()) {
                 AreaElemStyle areaStyle = (AreaElemStyle)wayStyle;
                 for (PolyData pd : multipolygon.getCombinedPolygons()) {
@@ -410 +411 @@
                 ElemStyle innerStyle = getPrimitiveStyle(wInner, true);
                 if(innerStyle == null) {
-                    if (data.isSelected(wInner))
+                    if (data.isSelected(wInner) || disabled)
                         continue;
                     if(zoomok && (wInner.mappaintDrawnCode != paintid || multipolygon.getOuterWays().isEmpty())) {