Changeset 28693 in osm for applications/editors/josm/plugins/reltoolbox/src/relcontext/ChosenRelation.java

Timestamp:

2012-09-07T16:40:13+02:00 (13 years ago)

Author:

larry0ua

Message:

'RelToolbox: refactored relation fixing code, added associatedStreet as a fixable relation'

File:

• applications/editors/josm/plugins/reltoolbox/src/relcontext/ChosenRelation.java (modified) (2 diffs)

applications/editors/josm/plugins/reltoolbox/src/relcontext/ChosenRelation.java

@@ -118 +118 @@
         if( opacity < 0.01 )
             return;
-
+        
+        Composite oldComposite = g.getComposite();
         Stroke oldStroke = g.getStroke();
-        Composite oldComposite = g.getComposite();
+        g.setStroke(new BasicStroke(9, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
         g.setColor(Color.yellow);
-        g.setStroke(new BasicStroke(9, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
         g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.3f * opacity));
-        for( OsmPrimitive element : chosenRelation.getMemberPrimitives() ) {
+        
+        drawRelations(g, mv, bbox, chosenRelation);
+        
+        g.setComposite(oldComposite);
+        g.setStroke(oldStroke);
+        
+    }
+    private void drawRelations(Graphics2D g, MapView mv, Bounds bbox, Relation rel) {
+        for( OsmPrimitive element : rel.getMemberPrimitives() ) {
             if( element.getType() == OsmPrimitiveType.NODE ) {
                 Node node = (Node)element;
@@ -142 +150 @@
                 }
             } else if( element.getType() == OsmPrimitiveType.RELATION ) {
-                // todo: draw all relation members (recursion?)
+                Color oldColor = g.getColor();
+                g.setColor(Color.magenta);
+                drawRelations(g, mv, bbox, (Relation)element);
+                g.setColor(oldColor);
             }
             // todo: closedway, multipolygon - ?
         }
-        g.setStroke(oldStroke);
-        g.setComposite(oldComposite);
     }