Changeset 184 in josm

Timestamp:

2006-12-31T21:24:56+01:00 (18 years ago)

Author:

imi

Message:

• added reorder action to order the segments in a way

Files:

• images/reorder.png (added)
• src/org/openstreetmap/josm/actions/ReorderAction.java (added)
• src/org/openstreetmap/josm/actions/ReverseSegmentAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/MainMenu.java (modified) (3 diffs)

src/org/openstreetmap/josm/actions/ReverseSegmentAction.java

@@ -20 +20 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Segment;
+import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.visitor.Visitor;
 
 public final class ReverseSegmentAction extends JosmAction {
@@ -28 +30 @@
 
         public void actionPerformed(ActionEvent e) {
-        Collection<OsmPrimitive> sel = Main.ds.getSelected();
-        boolean hasSegments = false;
-        for (OsmPrimitive osm : sel) {
-                if (osm instanceof Segment) {
-                        hasSegments = true;
-                        break;
-                }
-        }
-        if (!hasSegments) {
+        final Collection<Segment> sel = new LinkedList<Segment>();
+        new Visitor(){
+                        public void visit(Node n)    {}
+                        public void visit(Segment s) {sel.add(s);}
+                        public void visit(Way w)     {sel.addAll(w.segments);}
+                        public void visitAll() {
+                                for (OsmPrimitive osm : Main.ds.getSelected())
+                                        osm.visit(this);
+                        }
+        }.visitAll();
+
+        if (sel.isEmpty()) {
                 JOptionPane.showMessageDialog(Main.parent, tr("Please select at least one segment."));
                 return;
         }
         Collection<Command> c = new LinkedList<Command>();
-        for (OsmPrimitive osm : sel) {
-                if (!(osm instanceof Segment))
-                        continue;
-                Segment s = (Segment)osm;
+        for (Segment s : sel) {
                 Segment snew = new Segment(s);
                 Node n = snew.from;

src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java

@@ -149 +149 @@
                                 if (way != null) {
                                         Way newWay = new Way(way);
-                                        if (way.segments.get(0).from == n1)
+                                        if (way.segments.get(0).from == n1) {
+                                                Node tmp = s.from;
+                                                s.from = s.to;
+                                                s.to = tmp;
                                                 newWay.segments.add(0, s);
-                                        else
+                                        } else
                                                 newWay.segments.add(s);
                                         cmds.add(new ChangeCommand(way, newWay));

src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java

@@ -9 +9 @@
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.LinkedList;
 
@@ -15 +14 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.ReorderAction;
 import org.openstreetmap.josm.command.AddCommand;
 import org.openstreetmap.josm.command.ChangeCommand;
@@ -189 +189 @@
                         return null;
 
-                // sort the segments in best possible order. This is done by:
-                // 0  if no elements in list, quit
-                // 1  taking the first ls as pivot, remove it from list
-                // 2  searching for a connection at from or to of pivot
-                // 3  if found, attach it, remove it from list, goto 2
-                // 4  if not found, save the pivot-string and goto 0
-                LinkedList<Segment> sortedSegments = new LinkedList<Segment>();
-                LinkedList<Segment> segments = new LinkedList<Segment>(segmentSet);
-                while (!segments.isEmpty()) {
-                        LinkedList<Segment> pivotList = new LinkedList<Segment>();
-                        pivotList.add(segments.getFirst());
-                        segments.removeFirst();
-                        for (boolean found = true; found;) {
-                                found = false;
-                                for (Iterator<Segment> it = segments.iterator(); it.hasNext();) {
-                                        Segment ls = it.next();
-                                        if (ls.incomplete)
-                                                continue; // incomplete segments are never added to a new way
-                                        if (ls.from == pivotList.getLast().to) {
-                                                pivotList.addLast(ls);
-                                                it.remove();
-                                                found = true;
-                                        } else if (ls.to == pivotList.getFirst().from) {
-                                                pivotList.addFirst(ls);
-                                                it.remove();
-                                                found = true;
-                                        }
-                                }
-                        }
-                        sortedSegments.addAll(pivotList);
-                }
+                LinkedList<Segment> sortedSegments = ReorderAction.sortSegments(segmentSet);
 
                 if (wayToAdd != null) {

src/org/openstreetmap/josm/gui/MainMenu.java

@@ -20 +20 @@
 import org.openstreetmap.josm.actions.PreferencesAction;
 import org.openstreetmap.josm.actions.RedoAction;
+import org.openstreetmap.josm.actions.ReorderAction;
 import org.openstreetmap.josm.actions.ReverseSegmentAction;
 import org.openstreetmap.josm.actions.SaveAction;
@@ -48 +49 @@
         public final Action alignInCircle = new AlignInCircleAction();
         public final Action alignInLine = new AlignInLineAction();
+        public final Action reorder = new ReorderAction();
         public final Action upload = new UploadAction();
         public final Action save = new SaveAction();
@@ -87 +89 @@
                 editMenu.add(alignInCircle);
                 editMenu.add(alignInLine);
+                editMenu.add(reorder);
                 editMenu.addSeparator();
                 editMenu.add(preferences);