Changeset 1613 in josm for trunk/src/org/openstreetmap/josm/corrector

Timestamp:

2009-05-23T20:24:40+02:00 (14 years ago)

Author:

stoecker

Message:

fixed #2172 - Teemu Koskinen - ReverseWayTagCorrector's role correction broken

Location:

trunk/src/org/openstreetmap/josm/corrector

Files:

• ReverseWayTagCorrector.java (modified) (3 diffs)
• TagCorrector.java (modified) (1 diff)

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

@@ -35 +35 @@
             this.b = b;
             startPattern = Pattern.compile(
-                    "^(" + a + "|" + b + ")" + SEPARATOR,
+                    "^(" + a + "|" + b + ")(" + SEPARATOR + "|$)",
                     Pattern.CASE_INSENSITIVE);
             endPattern = Pattern.compile(
@@ -68 +68 @@
 
     @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>>();
@@ -113 +113 @@
         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;

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

@@ -33 +33 @@
 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;