Ticket #2172: reversemember.patch

src/org/openstreetmap/josm/actions/ReverseWayAction.java

@@ -66 +66 @@
             if (Main.pref.getBoolean("tag-correction.reverse-way", true)) {
                 try
                 {
-                    final Collection<Command> changePropertyCommands = reverseWayTagCorrector.execute(wnew);
+                    final Collection<Command> changePropertyCommands = reverseWayTagCorrector.execute(w, wnew);
                     propertiesUpdated = propertiesUpdated
                         || (changePropertyCommands != null && !changePropertyCommands.isEmpty());
                     c.addAll(changePropertyCommands);

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

@@ -34 +34 @@
             this.a = a;
             this.b = b;
             startPattern = Pattern.compile(
-                    "^(" + a + "|" + b + ")" + SEPARATOR,
+                    "^(" + a + "|" + b + ")(" + SEPARATOR + "|$)",
                     Pattern.CASE_INSENSITIVE);
             endPattern = Pattern.compile(
                     SEPARATOR + "(" + a + "|" + b + ")$",
@@ -67 +67 @@
             };
 
     @Override
-    public Collection<Command> execute(Way way) throws UserCancelException {
+    public Collection<Command> execute(Way oldway, Way way) throws UserCancelException {
         Map<OsmPrimitive, List<TagCorrection>> tagCorrectionsMap =
                 new HashMap<OsmPrimitive, List<TagCorrection>>();
 
@@ -112 +112 @@
 
         for (Relation relation : Main.ds.relations) {
             for (RelationMember member : relation.members) {
-                if (!member.member.realEqual(way, true)
+                if (!member.member.realEqual(oldway, true)
                         || member.role.length() == 0)
                     continue;
 

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

@@ -32 +32 @@
 
 public abstract class TagCorrector<P extends OsmPrimitive> {
 
-    public abstract Collection<Command> execute(P primitive)
+    public abstract Collection<Command> execute(P primitive, P oldprimitive)
         throws UserCancelException;
 
     private String[] applicationOptions = new String[] {