Changeset 600 in josm

Timestamp:

2008-04-12T02:08:37+02:00 (16 years ago)

Author:

framm

Message:

• for "align in line", use nodes from selected way if none selected; patch by Zorko <zorkos@…>. Closes #687

File:

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

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

@@ -17 +17 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Way;
 
 /**
@@ -45 +46 @@
                                 itnodes.add((Node)osm);
                         }
+                // special case if no single nodes are selected and exactly one way is: 
+                // then use the way's nodes
+                if ((nodes.size() == 0) && (sel.size() == 1))
+                        for (OsmPrimitive osm : sel)
+                                if (osm instanceof Way) {
+                                        nodes.addAll(((Way)osm).nodes);
+                                        itnodes.addAll(((Way)osm).nodes);
+                                }
                 if (nodes.size() < 3) {
                         JOptionPane.showMessageDialog(Main.parent, tr("Please select at least three nodes."));
@@ -60 +69 @@
                         itnodes.remove(n);
                         for (Node m : itnodes) {
-                                double dist = Math.sqrt(n.eastNorth.distance(m.eastNorth));
+                                double dist = Math.sqrt(n.eastNorth.distanceSq(m.eastNorth));
                                 if (dist > distance) {
                                         nodea = n;