Changeset 5667 in josm for trunk/src/org/openstreetmap

Timestamp:

2013-01-22T01:35:23+01:00 (12 years ago)

Author:

Don-vip

Message:

fix #8096 - Do not consider deleted primitives when fixing duplicate ones

Location:

trunk/src/org/openstreetmap/josm/data/validation/tests

Files:

• DuplicateRelation.java (modified) (2 diffs)
• DuplicateWay.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java

@@ -215 +215 @@
         Map<String, String> rkeys = r.getKeys();
         for (String key : ignoreKeys)
-            rkeys.remove(ignoreKeys);
+            rkeys.remove(key);
         RelationPair rKey = new RelationPair(rMembers, rkeys);
         relations.put(rKey, r);
@@ -232 +232 @@
 
         for (OsmPrimitive osm : sel)
-            if (osm instanceof Relation) {
+            if (osm instanceof Relation && !osm.isDeleted()) {
                 rel_fix.add((Relation)osm);
             }

trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java

@@ -218 +218 @@
 
         for (OsmPrimitive osm : sel) {
-            if (osm instanceof Way) {
+            if (osm instanceof Way && !osm.isDeleted()) {
                 ways.add((Way)osm);
             }