Changeset 1617 in josm for trunk

Timestamp:

2009-05-24T12:21:41+02:00 (15 years ago)

Author:

stoecker

Message:

fix #2645 - patch by Teemu Koskinen - cleanup relation role handling on way reversing

Location:

trunk/src/org/openstreetmap/josm

Files:

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

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

@@ -21 +21 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.ChangeCommand;
+import org.openstreetmap.josm.command.ChangeRelationMemberRoleCommand;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.osm.Node;
@@ -168 +169 @@
                     List<RoleCorrection> roleCorrections = roleCorrectionMap
                             .get(primitive);
-                    for (Relation relation : Main.ds.relations) {
-                        Relation newRelation = new Relation(relation);
-                        Boolean changed = false;
 
-                        for (int i = 0; i < roleCorrections.size(); i++) {
-                            RoleCorrection roleCorrection = roleCorrections.get(i);
-                            if (roleCorrection.relation == relation &&
-                                    roleTableMap.get(primitive).getCorrectionTableModel().getApply(i)) {
-
-                                RelationMember member = newRelation.members.get(roleCorrection.position);
-
-                                if (member.equals(roleCorrection.member)) {
-                                    member.role = roleCorrection.newRole;
-                                    changed = true;
-                                }
-                            }
+                    for (int i = 0; i < roleCorrections.size(); i++) {
+                        RoleCorrection roleCorrection = roleCorrections.get(i);
+                        if (roleTableMap.get(primitive).getCorrectionTableModel().getApply(i)) {
+                            commands.add(new ChangeRelationMemberRoleCommand(roleCorrection.relation, roleCorrection.position, roleCorrection.newRole));
                         }
-                        if (changed)
-                            commands.add(new ChangeCommand(relation, newRelation));
                     }
                 }