Changeset 3925 in josm for trunk/src/org/openstreetmap

Timestamp:

2011-02-22T00:02:18+01:00 (13 years ago)

Author:

bastiK

Message:

fixed #5963 (patch by Petr_Dlouhy) - Relation editor fails to detect closed path

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs/relation

Files:

• MemberTableModel.java (modified) (2 diffs)
• WayConnectionType.java (modified) (1 diff)

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

@@ -961 +961 @@
         for (int i=0; i<members.size(); ++i) {
             final RelationMember m = members.get(i);
-            if (! m.isWay()) {
-                con.set(i, new WayConnectionType());
-                firstGroupIdx = i;
-                continue;
-            }
-
-            final Way w = m.getWay();
-            if (w == null || w.isIncomplete()) {
+            if (!m.isWay() || m.getWay() == null || m.getWay().isIncomplete()) {
+                if(i > 0) makeLoopIfNeeded(con, i-1);
                 con.set(i, new WayConnectionType());
                 firstGroupIdx = i;
@@ -1023 +1017 @@
         makeLoopIfNeeded(con, members.size()-1);
         connectionType = con;
-        //        for (int i=0; i<con.size(); ++i) {
-        //            System.err.println(con.get(i));
-        //        }
     }
 

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

@@ -40 +40 @@
     public boolean isOnewayHead = false;
     public boolean isOnewayTail = false;
-//    public boolean isOnewayOppositeConnected = true;
 
     public WayConnectionType(boolean linkPrev, boolean linkNext, Direction direction) {