Changeset 2683 in josm

Timestamp:

Dec 27, 2009 4:51:22 PM (3 years ago)

Author:

mjulius

Message:

fixes #4149 - exception when undoing reversal of way with tag corrections

don't try to undo Command for a primitive that does not belong to a dataset

fixes issue with ChangeRelationMemberRoleCommand.undoCommand() doing nothing except resetting modified flag
don't reverse tags on way nodes when reversing way
reversing way now also reverses 'incline=*' tags

Location:

trunk/src/org/openstreetmap/josm

Files:

• command/ChangeRelationMemberRoleCommand.java (modified) (2 diffs)
• command/Command.java (modified) (1 diff)
• corrector/ReverseWayTagCorrector.java (modified) (5 diffs)
• corrector/TagCorrector.java (modified) (2 diffs)
• data/osm/OsmUtils.java (modified) (1 diff)

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

@@ -50 +50 @@
 
         oldRole = relation.getMember(position).getRole();
+        if (newRole.equals(oldRole)) return true;
         relation.setMember(position, new RelationMember(newRole, relation.getMember(position).getMember()));
 
@@ -58 +59 @@
 
     @Override public void undoCommand() {
-        relation.getMember(position).getRole().equals(oldRole);
+        relation.setMember(position, new RelationMember(oldRole, relation.getMember(position).getMember()));
         relation.setModified(oldModified);
     }

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

@@ -92 +92 @@
     public void undoCommand() {
         for (Entry<OsmPrimitive, PrimitiveData> e : cloneMap.entrySet()) {
-            e.getKey().load(e.getValue());
+            OsmPrimitive primitive = e.getKey();
+            if (primitive.getDataSet() != null) {
+                e.getKey().load(e.getValue());
+            }
         }
     }

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

@@ -5 +5 @@
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
@@ -68 +69 @@
     };
 
+    private static ArrayList<String> reversibleTags = new ArrayList<String>(
+            Arrays.asList(new String[] {"oneway", "incline"}));
+
     public static boolean isReversible(Way way) {
-        ArrayList<OsmPrimitive> primitives = new ArrayList<OsmPrimitive>();
-        primitives.add(way);
-        primitives.addAll(way.getNodes());
-
-        for  (OsmPrimitive primitive : primitives) {
-            for (String key : primitive.keySet()) {
-                if (key.equals("oneway")) return false;
-                for (PrefixSuffixSwitcher prefixSuffixSwitcher : prefixSuffixSwitchers) {
-                    if (!key.equals(prefixSuffixSwitcher.apply(key))) return false;
-                }
+        for (String key : way.keySet()) {
+            if (reversibleTags.contains(key)) return false;
+            for (PrefixSuffixSwitcher prefixSuffixSwitcher : prefixSuffixSwitchers) {
+                if (!key.equals(prefixSuffixSwitcher.apply(key))) return false;
             }
         }
@@ -95 +93 @@
     }
 
+    public String invertNumber(String value) {
+        Pattern pattern = Pattern.compile("^([+-]?)(\\d.*)$", Pattern.CASE_INSENSITIVE);
+        Matcher matcher = pattern.matcher(value);
+        if (!matcher.matches()) return value;
+        String sign = matcher.group(1);
+        String rest = matcher.group(2);
+        sign = sign.equals("-") ? "" : "-";
+        return sign + rest;
+    }
+
     @Override
     public Collection<Command> execute(Way oldway, Way way) throws UserCancelException {
@@ -100 +108 @@
             new HashMap<OsmPrimitive, List<TagCorrection>>();
 
-        ArrayList<OsmPrimitive> primitives = new ArrayList<OsmPrimitive>();
-        primitives.add(way);
-        primitives.addAll(way.getNodes());
+        ArrayList<TagCorrection> tagCorrections = new ArrayList<TagCorrection>();
+        for (String key : way.keySet()) {
+            String newKey = key;
+            String value = way.get(key);
+            String newValue = value;
 
-        for (OsmPrimitive primitive : primitives) {
-            tagCorrectionsMap.put(primitive, new ArrayList<TagCorrection>());
-
-            for (String key : primitive.keySet()) {
-                String newKey = key;
-                String value = primitive.get(key);
-                String newValue = value;
-
-                if (key.equals("oneway")) {
-                    if (OsmUtils.isReversed(value)) {
-                        newValue = OsmUtils.trueval;
-                    } else {
-                        Boolean boolValue = OsmUtils.getOsmBoolean(value);
-                        if (boolValue != null && boolValue.booleanValue()) {
-                            newValue = OsmUtils.reverseval;
-                        }
-                    }
-                } else {
-                    for (PrefixSuffixSwitcher prefixSuffixSwitcher : prefixSuffixSwitchers) {
-                        newKey = prefixSuffixSwitcher.apply(key);
-                        if (!key.equals(newKey)) {
-                            break;
-                        }
+            if (key.equals("oneway")) {
+                if (OsmUtils.isReversed(value)) {
+                    newValue = OsmUtils.trueval;
+                } else if (OsmUtils.isTrue(value)) {
+                    newValue = OsmUtils.reverseval;
+                }
+            } else if (key.equals("incline")) {
+                PrefixSuffixSwitcher switcher = new PrefixSuffixSwitcher("up", "down");
+                newValue = switcher.apply(value);
+                if (newValue.equals(value)) {
+                    newValue = invertNumber(value);
+                }
+            } else {
+                for (PrefixSuffixSwitcher prefixSuffixSwitcher : prefixSuffixSwitchers) {
+                    newKey = prefixSuffixSwitcher.apply(key);
+                    if (!key.equals(newKey)) {
+                        break;
                     }
                 }
+            }
 
-                if (!key.equals(newKey) || !value.equals(newValue)) {
-                    tagCorrectionsMap.get(primitive).add(
-                            new TagCorrection(key, value, newKey, newValue));
-                }
+            if (!key.equals(newKey) || !value.equals(newValue)) {
+                tagCorrections.add(new TagCorrection(key, value, newKey, newValue));
             }
+        }
+        if (!tagCorrections.isEmpty()) {
+            tagCorrectionsMap.put(way, tagCorrections);
         }
 
         Map<OsmPrimitive, List<RoleCorrection>> roleCorrectionMap =
             new HashMap<OsmPrimitive, List<RoleCorrection>>();
-        roleCorrectionMap.put(way, new ArrayList<RoleCorrection>());
+        ArrayList<RoleCorrection> roleCorrections = new ArrayList<RoleCorrection>();
 
         Collection<OsmPrimitive> referrers = oldway.getReferrers();
@@ -166 +172 @@
 
                 if (found) {
-                    roleCorrectionMap.get(way).add(
-                            new RoleCorrection(relation, position, member, newRole));
+                    roleCorrections.add(new RoleCorrection(relation, position, member, newRole));
                 }
 
                 position++;
             }
+        }
+        if (!roleCorrections.isEmpty()) {
+            roleCorrectionMap.put(way, roleCorrections);
         }
 

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

@@ -50 +50 @@
             String description) throws UserCancelException {
 
-        boolean hasCorrections = false;
-        for (List<TagCorrection> tagCorrectionList : tagCorrectionsMap.values()) {
-            if (!tagCorrectionList.isEmpty()) {
-                hasCorrections = true;
-                break;
-            }
-        }
-
-        if (!hasCorrections) {
-            for (List<RoleCorrection> roleCorrectionList : roleCorrectionMap
-                    .values()) {
-                if (!roleCorrectionList.isEmpty()) {
-                    hasCorrections = true;
-                    break;
-                }
-            }
-        }
-
-        if (hasCorrections) {
+        if (!tagCorrectionsMap.isEmpty() || !roleCorrectionMap.isEmpty()) {
             Collection<Command> commands = new ArrayList<Command>();
             Map<OsmPrimitive, TagCorrectionTable> tagTableMap =
@@ -74 +56 @@
             Map<OsmPrimitive, RoleCorrectionTable> roleTableMap =
                 new HashMap<OsmPrimitive, RoleCorrectionTable>();
-
-            //NameVisitor nameVisitor = new NameVisitor();
 
             final JPanel p = new JPanel(new GridBagLayout());

trunk/src/org/openstreetmap/josm/data/osm/OsmUtils.java

@@ -35 +35 @@
         return REVERSE_VALUES.contains(value);
     }
+
+    public static boolean isTrue(String value) {
+        return TRUE_VALUES.contains(value);
+    }
+
+    public static boolean isFalse(String value) {
+        return FALSE_VALUES.contains(value);
+    }
 }