Changeset 1613 in josm for trunk/src/org

Timestamp:

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

Author:

stoecker

Message:

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/PasteTagsAction.java (modified) (2 diffs)
• actions/ReverseWayAction.java (modified) (1 diff)
• corrector/ReverseWayTagCorrector.java (modified) (3 diffs)
• corrector/TagCorrector.java (modified) (1 diff)
• gui/dialogs/PropertiesDialog.java (modified) (2 diffs)

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

@@ -47 +47 @@
 
             for (String key : m.keySet()) {
-                if (! key.equals("created_by"))
-                    clist.add(new ChangePropertyCommand(selectionSubset, key, osm.keys.get(key)));
+                clist.add(new ChangePropertyCommand(selectionSubset, key, osm.keys.get(key)));
             }
         }
@@ -90 +89 @@
                 continue;
             for (String key : osm.keys.keySet()) {
-                if (key.equals("created_by")) // we ignore created_by
-                    continue;
                 String value = osm.keys.get(key);
                 if (! kvSeen.containsKey(key))

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

@@ -67 +67 @@
                 try
                 {
-                    final Collection<Command> changePropertyCommands = reverseWayTagCorrector.execute(wnew);
+                    final Collection<Command> changePropertyCommands = reverseWayTagCorrector.execute(w, wnew);
                     propertiesUpdated = propertiesUpdated
                         || (changePropertyCommands != null && !changePropertyCommands.isEmpty());

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;
 

trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java

@@ -228 +228 @@
             value = null; // delete the key instead
         }
-        if (newkey.equals("created_by"))
-        {
-            // we don't allow created_by to be changed.
-            return;
-        }
         if (key.equals(newkey) || value == null)
             Main.main.undoRedo.add(new ChangePropertyCommand(sel, newkey, value));
@@ -349 +344 @@
         if (value.equals(""))
             return;
-        if (key.equals("created_by"))
-            return;
         Main.main.undoRedo.add(new ChangePropertyCommand(sel, key, value));
         DataSet.fireSelectionChanged(sel);