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

Timestamp:

2017-05-13T14:56:51+02:00 (9 years ago)

Author:

zverik

Message:

Updated possible roles and did a little refactoring

File:

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

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

@@ -17 +17 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
@@ -150 +149 @@
         g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.3f * opacity));
 
-        drawRelations(g, mv, bbox, chosenRelation, new HashSet<>());
+        drawRelations(g, mv, bbox, chosenRelation, new HashSet<Relation>());
 
         g.setComposite(oldComposite);
@@ -160 +159 @@
             visitedRelations.add(rel);
             for (OsmPrimitive element : rel.getMemberPrimitives()) {
-                if (element.getType() == OsmPrimitiveType.NODE) {
-                    Node node = (Node) element;
-                    Point center = mv.getPoint(node);
-                    g.drawOval(center.x - 4, center.y - 4, 9, 9);
-                } else if (element.getType() == OsmPrimitiveType.WAY) {
-                    Way way = (Way) element;
-                    if (way.getNodesCount() >= 2) {
-                        GeneralPath b = new GeneralPath();
-                        Point p = mv.getPoint(way.getNode(0));
-                        b.moveTo(p.x, p.y);
-                        for (int i = 1; i < way.getNodesCount(); i++) {
-                            p = mv.getPoint(way.getNode(i));
-                            b.lineTo(p.x, p.y);
-                        }
-                        g.draw(b);
-                    }
-                } else if (element.getType() == OsmPrimitiveType.RELATION) {
-                    Color oldColor = g.getColor();
-                    g.setColor(Color.magenta);
-                    drawRelations(g, mv, bbox, (Relation) element, visitedRelations);
-                    g.setColor(oldColor);
+                if (null != element.getType()) switch(element.getType()) {
+                    case NODE:
+                        Node node = (Node) element;
+                        Point center = mv.getPoint(node);
+                        g.drawOval(center.x - 4, center.y - 4, 9, 9);
+                        break;
+                    case WAY:
+                        Way way = (Way) element;
+                        if (way.getNodesCount() >= 2) {
+                            GeneralPath b = new GeneralPath();
+                            Point p = mv.getPoint(way.getNode(0));
+                            b.moveTo(p.x, p.y);
+                            for (int i = 1; i < way.getNodesCount(); i++) {
+                                p = mv.getPoint(way.getNode(i));
+                                b.lineTo(p.x, p.y);
+                            }
+                            g.draw(b);
+                        }   break;
+                    case RELATION:
+                        Color oldColor = g.getColor();
+                        g.setColor(Color.magenta);
+                        drawRelations(g, mv, bbox, (Relation) element, visitedRelations);
+                        g.setColor(oldColor);
+                        break;
+                    default:
+                        break;
                 }
-                // todo: closedway, multipolygon - ?
             }
         }