Changeset 7621 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/AreaElemStyle.java

Timestamp:

2014-10-14T21:11:26+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #10615 - Inner ways of multipolygon not correctly displayed (regression from r7555)

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/AreaElemStyle.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/AreaElemStyle.java

@@ -86 +86 @@
 
     @Override
-    public void paintPrimitive(OsmPrimitive osm, MapPaintSettings paintSettings, StyledMapRenderer painter, boolean selected, boolean member) {
+    public void paintPrimitive(OsmPrimitive osm, MapPaintSettings paintSettings, StyledMapRenderer painter,
+            boolean selected, boolean outermember, boolean member) {
         Color myColor = color;
         if (osm instanceof Way) {
@@ -92 +93 @@
                 if (selected) {
                     myColor = paintSettings.getSelectedColor(color.getAlpha());
-                } else if (member) {
+                } else if (outermember) {
                     myColor = paintSettings.getRelationSelectedColor(color.getAlpha());
                 }
@@ -98 +99 @@
             painter.drawArea((Way) osm, myColor, fillImage, text);
         } else if (osm instanceof Relation) {
-            if (color != null && (selected || (member && ((Relation) osm).isMultipolygon()))) {
+            if (color != null && (selected || outermember)) {
                 myColor = paintSettings.getRelationSelectedColor(color.getAlpha());
             }