Changeset 668 in josm for trunk/src/org

Timestamp:

2008-06-28T01:05:49+02:00 (16 years ago)

Author:

framm

Message:

• when a way is split, make both parts member of any relation the old way was part of. This is wrong for some relations but right for the frequently used route relation. Patch by Dirk Stoecker <openstreetmap@…>. References #701

File:

• trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java

@@ -29 +29 @@
 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.NameVisitor;
@@ -243 +244 @@
                         Main.debug("wayToAdd: " + wayToAdd);
                         newSelection.add(wayToAdd);
+
+                        // now copy all relations to new way also
+                        for (Relation r : Main.ds.relations) {
+                                if (r.deleted || r.incomplete) continue;
+                                for (RelationMember rm : r.members) {
+                                        if (rm.member instanceof Way) {
+                                                if (rm.member == selectedWay)
+                                                {
+                                                        Relation c = new Relation(r);
+                                                        RelationMember em = new RelationMember();
+                                                        em.member = wayToAdd;
+                                                        em.role = rm.role;
+                                                        c.members.add(em);
+                                                        commandList.add(new ChangeCommand(r, c));
+                                                }
+                                        }
+                                }
+                        }
                 }