Changeset 20799 in osm for applications/editors

Timestamp:

2010-04-06T18:29:45+02:00 (14 years ago)

Author:

bastik

Message:

'don't break relations, when fixing duplicate ways'

Location:

applications/editors/josm/plugins/validator

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java (modified) (6 diffs)

applications/editors/josm/plugins/validator/build.xml

@@ -26 +26 @@
           ** update before publishing
         -->
-        <property name="commit.message" value="validator: fixed memory leak" />
+        <property name="commit.message" value="don't break relations, when fixing duplicate ways" />
         <property name="plugin.main.version" value="3118" />
 

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java

@@ -4 +4 @@
 
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
@@ -10 +11 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.command.ChangeCommand;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.DeleteCommand;
@@ -16 +18 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -107 +111 @@
     {
         Collection<? extends OsmPrimitive> sel = testError.getPrimitives();
-        LinkedList<Way> ways = new LinkedList<Way>();
+        HashSet<Way> ways = new HashSet<Way>();
 
         for (OsmPrimitive osm : sel)
@@ -117 +121 @@
 
         long idToKeep = 0;
+        Way wayToKeep = ways.iterator().next();
         // Only one way will be kept - the one with lowest positive ID, if such exist
         // or one "at random" if no such exists. Rest of the ways will be deleted
         for (Way w: ways) {
             if (!w.isNew()) {
-                if (idToKeep == 0 || w.getId() < idToKeep) idToKeep = w.getId();
+                if (idToKeep == 0 || w.getId() < idToKeep) {
+                    idToKeep = w.getId();
+                    wayToKeep = w;
+                }
             }
         }
 
-        if (idToKeep > 0) {
-            //Remove chosen way from the list, rest of ways in the list will be deleted
-            for (Way w: ways) {
-                if (w.getId() == idToKeep) {
-                        ways.remove(w);
-                    break;
+        // Find the way that is member of one or more relations. (If any)
+        Way wayWithRelations = null;
+        List<Relation> relations = null;
+        for (Way w : ways) {
+            List<Relation> rel = OsmPrimitive.getFilteredList(w.getReferrers(), Relation.class);
+            if (!rel.isEmpty()) {
+                if (wayWithRelations != null)
+                    throw new AssertionError("Cannot fix duplicate Ways: More than one way is relation member.");
+                wayWithRelations = w;
+                relations = rel;
+            }
+        }
+
+        Collection<Command> commands = new LinkedList<Command>();
+
+        // Fix relations.
+        if (wayWithRelations != null && wayToKeep != wayWithRelations) {
+            for (Relation rel : relations) {
+                Relation newRel = new Relation(rel);
+                for (int i = 0; i < newRel.getMembers().size(); ++i) {
+                    RelationMember m = newRel.getMember(i);
+                    if (wayWithRelations.equals(m.getMember())) {
+                        newRel.setMember(i, new RelationMember(m.getRole(), wayToKeep));
+                    }
                 }
+                commands.add(new ChangeCommand(rel, newRel));
             }
-        } else {
-            //Remove first way from the list, delete the rest
-            ways.remove(0);
         }
 
         //Delete all ways in the list
         //Note: nodes are not deleted, these can be detected and deleted at next pass
-        Collection<Command> commands = new LinkedList<Command>();
+        ways.remove(wayToKeep);
         commands.add(new DeleteCommand(ways));
         Main.main.undoRedo.add(new SequenceCommand(tr("Delete duplicate ways"), commands));
@@ -149 +173 @@
     public boolean isFixable(TestError testError)
     {
-        return (testError.getTester() instanceof DuplicateWay);
+        if (!(testError.getTester() instanceof DuplicateWay))
+            return false;
+
+        // We fix it only if there is no more than one way that is relation member.
+        Collection<? extends OsmPrimitive> sel = testError.getPrimitives();
+        HashSet<Way> ways = new HashSet<Way>();
+
+        for (OsmPrimitive osm : sel)
+            if (osm instanceof Way)
+                ways.add((Way)osm);
+
+        if (ways.size() < 2)
+            return false;
+
+        int waysWithRelations = 0;
+        for (Way w : ways) {
+            List<Relation> rel = OsmPrimitive.getFilteredList(w.getReferrers(), Relation.class);
+            if (!rel.isEmpty()) {
+                ++waysWithRelations;
+            }
+        }
+        return (waysWithRelations <= 1);
     }
 }