Changeset 2611 in josm

Timestamp:

2009-12-11T22:39:45+01:00 (15 years ago)

Author:

mjulius

Message:

fixes #4104 - reversing of way does not update direction dependent roles

Location:

trunk/src/org/openstreetmap/josm

Files:

• command/ChangeRelationMemberRoleCommand.java (modified) (2 diffs)
• corrector/ReverseWayTagCorrector.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java

@@ -14 +14 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -49 +50 @@
 
         oldRole = relation.getMember(position).getRole();
-        relation.getMember(position).getRole().equals(newRole);
+        relation.setMember(position, new RelationMember(newRole, relation.getMember(position).getMember()));
 
         oldModified = relation.isModified();

trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java

@@ -12 +12 @@
 import java.util.regex.Pattern;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -142 +141 @@
         roleCorrectionMap.put(way, new ArrayList<RoleCorrection>());
 
-        for (Relation relation : Main.main.getCurrentDataSet().getRelations()) {
+        Collection<OsmPrimitive> referrers = oldway.getReferrers();
+        for (OsmPrimitive referrer: referrers) {
+            if (! (referrer instanceof Relation)) {
+                continue;
+            }
+            Relation relation = (Relation)referrer;
             int position = 0;
             for (RelationMember member : relation.getMembers()) {