Changeset 7621 in josm for trunk/src/org

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)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/OsmPrimitive.java (modified) (2 diffs)
• data/osm/visitor/paint/StyledMapRenderer.java (modified) (4 diffs)
• gui/mappaint/AreaElemStyle.java (modified) (3 diffs)
• gui/mappaint/BoxTextElemStyle.java (modified) (1 diff)
• gui/mappaint/ElemStyle.java (modified) (1 diff)
• gui/mappaint/LineElemStyle.java (modified) (2 diffs)
• gui/mappaint/LineTextElemStyle.java (modified) (1 diff)
• gui/mappaint/NodeElemStyle.java (modified) (1 diff)
• gui/mappaint/RepeatImageElemStyle.java (modified) (1 diff)

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

@@ -590 +590 @@
     }
 
+    /**
+     * Determines if this primitive is a member of a selected relation.
+     * @return {@code true} if this primitive is a member of a selected relation, {@code false} otherwise
+     */
     public boolean isMemberOfSelected() {
         if (referrers == null)
@@ -598 +602 @@
             if (ref instanceof Relation && ref.isSelected())
                 return true;
+        }
+        return false;
+    }
+
+    /**
+     * Determines if this primitive is an outer member of a selected multipolygon relation.
+     * @return {@code true} if this primitive is an outer member of a selected multipolygon relation, {@code false} otherwise
+     * @since 7621
+     */
+    public boolean isOuterMemberOfSelected() {
+        if (referrers == null)
+            return false;
+        if (referrers instanceof OsmPrimitive) {
+            return isOuterMemberOfMultipolygon((OsmPrimitive) referrers);
+        }
+        for (OsmPrimitive ref : (OsmPrimitive[]) referrers) {
+            if (isOuterMemberOfMultipolygon(ref))
+                return true;
+        }
+        return false;
+    }
+
+    private boolean isOuterMemberOfMultipolygon(OsmPrimitive ref) {
+        if (ref instanceof Relation && ref.isSelected() && ((Relation)ref).isMultipolygon()) {
+            for (RelationMember rm : ((Relation)ref).getMembersFor(Collections.singleton(this))) {
+                if ("outer".equals(rm.getRole())) {
+                    return true;
+                }
+            }
         }
         return false;

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

@@ -291 +291 @@
     private static final int FLAG_MEMBER_OF_SELECTED = 2;
     private static final int FLAG_SELECTED = 4;
+    private static final int FLAG_OUTERMEMBER_OF_SELECTED = 8;
 
     private static final double PHI = Math.toRadians(20);
@@ -1514 +1515 @@
             } else if (w.isSelected()) {
                 add(w, FLAG_SELECTED);
+            } else if (w.isOuterMemberOfSelected()) {
+                add(w, FLAG_OUTERMEMBER_OF_SELECTED);
             } else if (w.isMemberOfSelected()) {
                 add(w, FLAG_MEMBER_OF_SELECTED);
@@ -1527 +1530 @@
             } else if (r.isSelected()) {
                 add(r, FLAG_SELECTED);
+            } else if (r.isOuterMemberOfSelected()) {
+                add(r, FLAG_OUTERMEMBER_OF_SELECTED);
             } else if (r.isMemberOfSelected()) {
                 add(r, FLAG_MEMBER_OF_SELECTED);
@@ -1654 +1659 @@
                         StyledMapRenderer.this,
                         (r.flags & FLAG_SELECTED) != 0,
+                        (r.flags & FLAG_OUTERMEMBER_OF_SELECTED) != 0,
                         (r.flags & FLAG_MEMBER_OF_SELECTED) != 0
                 );

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());
             }

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

@@ -179 +179 @@
 
     @Override
-    public void paintPrimitive(OsmPrimitive osm, MapPaintSettings settings, StyledMapRenderer painter, boolean selected, boolean member) {
+    public void paintPrimitive(OsmPrimitive osm, MapPaintSettings settings, StyledMapRenderer painter,
+            boolean selected, boolean outermember, boolean member) {
         if (osm instanceof Node) {
             painter.drawBoxText((Node) osm, this);

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

@@ -43 +43 @@
      * @param painter
      * @param selected true, if primitive is selected
+     * @param outermember true, if primitive is not selected and outer member of a selected multipolygon relation
      * @param member true, if primitive is not selected and member of a selected relation
      */
-    public abstract void paintPrimitive(OsmPrimitive primitive, MapPaintSettings paintSettings, StyledMapRenderer painter, boolean selected, boolean member);
+    public abstract void paintPrimitive(OsmPrimitive primitive, MapPaintSettings paintSettings, StyledMapRenderer painter,
+            boolean selected, boolean outermember, boolean member);
 
     public boolean isProperLineStyle() {

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

@@ -264 +264 @@
 
     @Override
-    public void paintPrimitive(OsmPrimitive primitive, MapPaintSettings paintSettings, StyledMapRenderer painter, boolean selected, boolean member) {
+    public void paintPrimitive(OsmPrimitive primitive, MapPaintSettings paintSettings, StyledMapRenderer painter,
+            boolean selected, boolean outermember, boolean member) {
         Way w = (Way)primitive;
         /* show direction arrows, if draw.segment.relevant_directions_only is not set,
@@ -297 +298 @@
         if (selected) {
             myColor = paintSettings.getSelectedColor(color.getAlpha());
-        } else if (member) {
+        } else if (member || outermember) {
             myColor = paintSettings.getRelationSelectedColor(color.getAlpha());
         } else if(w.isDisabled()) {

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

@@ -32 +32 @@
 
     @Override
-    public void paintPrimitive(OsmPrimitive primitive, MapPaintSettings paintSettings, StyledMapRenderer painter, boolean selected, boolean member) {
+    public void paintPrimitive(OsmPrimitive primitive, MapPaintSettings paintSettings, StyledMapRenderer painter,
+            boolean selected, boolean outermember, boolean member) {
         Way w = (Way)primitive;
         painter.drawTextOnPath(w, text);

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

@@ -241 +241 @@
 
     @Override
-    public void paintPrimitive(OsmPrimitive primitive, MapPaintSettings settings, StyledMapRenderer painter, boolean selected, boolean member) {
+    public void paintPrimitive(OsmPrimitive primitive, MapPaintSettings settings, StyledMapRenderer painter,
+            boolean selected, boolean outermember, boolean member) {
         if (primitive instanceof Node) {
             Node n = (Node) primitive;

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

@@ -50 +50 @@
 
     @Override
-    public void paintPrimitive(OsmPrimitive primitive, MapPaintSettings paintSettings, StyledMapRenderer painter, boolean selected, boolean member) {
+    public void paintPrimitive(OsmPrimitive primitive, MapPaintSettings paintSettings, StyledMapRenderer painter,
+            boolean selected, boolean outermember, boolean member) {
         Way w = (Way) primitive;
         painter.drawRepeatImage(w, pattern.getImage(), offset, spacing, phase, align);