Changeset 235 in josm for src

Timestamp:

2007-05-08T23:01:07+02:00 (18 years ago)

Author:

framm

Message:

Properly sort newly added ways; bug had been introduced with 222.
Fixes (sorta) #137.

Location:

src/org/openstreetmap/josm/actions

Files:

• ReorderAction.java (modified) (3 diffs)
• mapmode/AddWayAction.java (modified) (1 diff)

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

@@ -77 +77 @@
      */
     public static Command reorderWay(Way way) {
-            final LinkedList<Segment> sel = new LinkedList<Segment>(sortSegments(new LinkedList<Segment>(way.segments)));       
+            final LinkedList<Segment> sel = new LinkedList<Segment>(sortSegments(new LinkedList<Segment>(way.segments), false));        
 
             Collection<Command> c = new LinkedList<Command>();
@@ -160 +160 @@
 
         /**
-         * This sort is based on the sort in the old ReorderAction, but it works 
+         * This sort is based on the sort in the old ReorderAction, but it can work 
          * irresepective of the direction of the segments. This produces a sort 
          * that can be useful even if the segments are facing the wrong direction.
+         * 
+         * @param segments list of segments to be sorted
+         * @param strict true if segment direction should be observed, false if not
          */
-        public static LinkedList<Segment> sortSegments(LinkedList<Segment> segments) {
+        public static LinkedList<Segment> sortSegments(LinkedList<Segment> segments, boolean strict) {
                 
                 LinkedList<Segment> sortedSegments = new LinkedList<Segment>();
@@ -179 +182 @@
                                         if (ls.incomplete)
                                                 continue; // incomplete segments are never added to a new way
-                                        if (ls.from == pivotList.getLast().to || ls.to == pivotList.getLast().to || ls.from == pivotList.getLast().from || ls.to == pivotList.getLast().from) {
+                                        if (ls.from == pivotList.getLast().to || (!strict && (ls.to == pivotList.getLast().to || ls.from == pivotList.getLast().from || ls.to == pivotList.getLast().from))) {
                                                 pivotList.addLast(ls);
                                                 it.remove();
                                                 found = true;
-                                        } else if (ls.to == pivotList.getFirst().from || ls.from == pivotList.getFirst().from || ls.to == pivotList.getFirst().to || ls.from == pivotList.getFirst().to) {
+                                        } else if (ls.to == pivotList.getFirst().from || (!strict && (ls.from == pivotList.getFirst().from || ls.to == pivotList.getFirst().to || ls.from == pivotList.getFirst().to))) {
                                                 pivotList.addFirst(ls);
                                                 it.remove(); 

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

@@ -189 +189 @@
 
                 LinkedList<Segment> rawSegments = new LinkedList<Segment>(segmentSet);
-                LinkedList<Segment> sortedSegments = ReorderAction.sortSegments(rawSegments);
+                LinkedList<Segment> sortedSegments = ReorderAction.sortSegments(rawSegments, true);
 
                 if (wayToAdd != null) {