Changeset 23 in josm for src/org/openstreetmap/josm/actions/mapmode/AddTrackAction.java

Timestamp:

2005-10-27T00:38:03+02:00 (19 years ago)

Author:

imi

Message:

• added commands to support undo later
• added Edit-Layer concept
• painting of deleted objects

File:

• src/org/openstreetmap/josm/actions/mapmode/AddTrackAction.java (modified) (2 diffs)

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

@@ -4 +4 @@
 import java.awt.event.KeyEvent;
 import java.util.Collection;
+import java.util.Iterator;
 import java.util.LinkedList;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.AddCommand;
-import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.osm.LineSegment;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -98 +98 @@
                 for (OsmPrimitive osm : selection) {
                         if (osm instanceof Track)
-                                lineSegments.addAll(((Track)osm).segments());
+                                lineSegments.addAll(((Track)osm).segments);
                         else if (osm instanceof LineSegment)
                                 lineSegments.add((LineSegment)osm);
                 }
+                
+                // sort the line 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 start or end 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<LineSegment> sortedLineSegments = new LinkedList<LineSegment>();
+                while (!lineSegments.isEmpty()) {
+                        LinkedList<LineSegment> pivotList = new LinkedList<LineSegment>();
+                        pivotList.add(lineSegments.getFirst());
+                        lineSegments.removeFirst();
+                        for (boolean found = true; found;) {
+                                found = false;
+                                for (Iterator<LineSegment> it = lineSegments.iterator(); it.hasNext();) {
+                                        LineSegment ls = it.next();
+                                        if (ls.start == pivotList.getLast().end) {
+                                                pivotList.addLast(ls);
+                                                it.remove();
+                                                found = true;
+                                        } else if (ls.end == pivotList.getFirst().start) {
+                                                pivotList.addFirst(ls);
+                                                it.remove();
+                                                found = true;
+                                        }
+                                }
+                        }
+                        sortedLineSegments.addAll(pivotList);
+                }
+                
                 Track t = new Track();
-                for (LineSegment ls : lineSegments)
+                for (LineSegment ls : sortedLineSegments)
                         t.add(ls);
-                Command c = new AddCommand(t);
-                c.executeCommand();
-                Main.main.commands.add(c);
+                mv.editLayer().add(new AddCommand(t));
                 Main.main.ds.clearSelection();
         }
-
-        @Override
-        protected boolean isEditMode() {
-                return true;
-        }
 }