Changeset 3789 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2011-01-15T20:28:49+01:00 (13 years ago)

Author:

bastiK

Message:

see #5109 (patch by Petr Dlouhy) - relation analysis; fix left-right and connection issue

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java

@@ -952 +952 @@
         }
 
-        int firstGroupIdx=0;
+        firstGroupIdx=0;
 
         lastForwardWay = UNCONNECTED;
@@ -984 +984 @@
                     wct.isOnewayHead = true;
                     lastForwardWay = i-1;
-                    lastBackwardWay = i;
+                    lastBackwardWay = i-1;
                     onewayBeginning = true;
                 }
@@ -1017 +1017 @@
 
             if(!wct.linkPrev) {
-                if(i > 0) makeLoopIfNeeded(con, i-1, firstGroupIdx);
+                if(i > 0) makeLoopIfNeeded(con, i-1);
                 firstGroupIdx = i;
             }
         }
-        makeLoopIfNeeded(con, members.size()-1, firstGroupIdx);
+        makeLoopIfNeeded(con, members.size()-1);
         connectionType = con;
         //        for (int i=0; i<con.size(); ++i) {
@@ -1056 +1056 @@
     }
 
-    private void makeLoopIfNeeded(final List<WayConnectionType> con, final int i, final int firstGroupIdx) {
+    int firstGroupIdx;
+    private void makeLoopIfNeeded(final List<WayConnectionType> con, final int i) {
         boolean loop;
         if (i == firstGroupIdx) { //is primitive loop
@@ -1092 +1093 @@
         Direction dirBW = NONE;
         if(onewayBeginning) {
-            if(lastBackwardWay != i)
-                dirBW = determineDirection(lastBackwardWay, reverse(con.get(lastBackwardWay).direction), i, true);
+            if(lastBackwardWay < 0)
+                dirBW = determineDirection(firstGroupIdx, reverse(con.get(firstGroupIdx).direction), i, true);
+            else
+                dirBW = determineDirection(lastBackwardWay, con.get(lastBackwardWay).direction, i, true);
+
             if(dirBW != NONE)
                 onewayBeginning = false;
@@ -1117 +1121 @@
                     wct.isOnewayHead = true;
                     lastForwardWay = i-1;
-                    lastBackwardWay = i;
+                    lastBackwardWay = i-1;
                 } else {
                     lastForwardWay = UNCONNECTED;