Changeset 7621 in josm for trunk/src/org/openstreetmap/josm/gui

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/gui/mappaint

Files:

• AreaElemStyle.java (modified) (3 diffs)
• BoxTextElemStyle.java (modified) (1 diff)
• ElemStyle.java (modified) (1 diff)
• LineElemStyle.java (modified) (2 diffs)
• LineTextElemStyle.java (modified) (1 diff)
• NodeElemStyle.java (modified) (1 diff)
• RepeatImageElemStyle.java (modified) (1 diff)

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