Changeset 749 in josm for trunk

Timestamp:

2008-08-06T15:41:33+02:00 (16 years ago)

Author:

stoecker

Message:

Fixed Align circles in node in case of way usage. Closes bug #1389.

File:

• trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java

@@ -23 +23 @@
 /**
  * Aligns all selected nodes within a circle. (Useful for roundabouts)
- * 
+ *
  * @author Matthew Newton
  */
@@ -35 +35 @@
                 Collection<OsmPrimitive> sel = Main.ds.getSelected();
                 Collection<Node> nodes = new LinkedList<Node>();
-                
+
                 for (OsmPrimitive osm : sel)
                         if (osm instanceof Node)
                                 nodes.add((Node)osm);
-                
+
                 // special case if no single nodes are selected and exactly one way is: 
                 // then use the way's nodes
@@ -45 +45 @@
                         for (OsmPrimitive osm : sel)
                                 if (osm instanceof Way)
-                                        nodes.addAll(((Way)osm).nodes);
-                
+                                        for (Node n : ((Way)osm).nodes)
+                                        {
+                                                if(!nodes.contains(n))
+                                                        nodes.add(n);
+                                        }
+
                 if (nodes.size() < 4) {
                         JOptionPane.showMessageDialog(Main.parent, tr("Please select at least four nodes."));