Changeset 1596 in josm for trunk/src/org

Timestamp:

2009-05-18T00:07:01+02:00 (16 years ago)

Author:

framm

Message:

• added primitive code to relation editor that shows whether or not two subsequent members are linked

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/Relation.java (modified) (1 diff)
• gui/dialogs/RelationEditor.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/osm/Relation.java

@@ -112 +112 @@
         return false;
     }
+    
+    public RelationMember firstMember() {
+        return (members.size() == 0) ? null : members.get(0);
+    }
+    public RelationMember lastMember() {
+        return (members.size() == 0) ? null : members.get(members.size() -1);
+    }
 }

trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java

@@ -37 +37 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.DataSource;
+import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.MergeVisitor;
 import org.openstreetmap.josm.gui.ExtendedDialog;
@@ -195 +197 @@
         // setting up the member table
 
-        memberData.setColumnIdentifiers(new String[]{tr("Role"),tr("Occupied By")});
+        memberData.setColumnIdentifiers(new String[]{tr("Role"),tr("Occupied By"), tr("linked")});
         memberTable.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
         memberTable.getColumnModel().getColumn(1).setCellRenderer(new OsmPrimitivRenderer());
@@ -366 +368 @@
 
         memberData.setRowCount(0);
-        for (RelationMember em : clone.members) {
-            memberData.addRow(new Object[]{em.role, em.member});
+        for (int i=0; i<clone.members.size(); i++) {
+            
+            // this whole section is aimed at finding out whether the
+            // relation member is "linked" with the next, i.e. whether
+            // (if both are ways) these ways are connected. It should
+            // really produce a much more beautiful output (with a linkage
+            // symbol somehow places betweeen the two member lines!), and
+            // it should cache results, so... FIXME ;-)
+            
+            RelationMember em = clone.members.get(i);
+            boolean linked = false;
+            Node n1 = null;
+            Node n2 = null;
+            RelationMember m = em;
+            while (true) {
+                if (m.member instanceof Way) {
+                    n1 = ((Way) m.member).lastNode();
+                    break;
+                } else if (em.member instanceof Relation) {
+                    m = ((Relation)m.member).lastMember();
+                } else {
+                    break;
+                }
+            }
+            if (i<clone.members.size()-1) {
+                m = clone.members.get(i+1);
+                while (true) {
+                    if (m.member instanceof Way) {
+                        n2 = ((Way) (m.member)).firstNode();
+                        break;
+                    } else if (em.member instanceof Relation) {
+                        m = ((Relation)(m.member)).firstMember();
+                    } else {
+                        break;
+                    }
+                }
+            }
+            linked = (n1 != null) && n1.equals(n2);
+            
+            // end of section to determine linkedness. 
+           
+            memberData.addRow(new Object[]{em.role, em.member, linked ? tr("yes") : tr("no")});
         }
         status.setText(tr("Members: {0}", clone.members.size()));