Changeset 425 in josm for trunk/src/org

Timestamp:

2007-10-26T09:14:14+02:00 (17 years ago)

Author:

gebner

Message:

Fix combining of ways that are members of not-yet-uploaded relations.

File:

• trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (modified) (4 diffs)

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

@@ -53 +53 @@
         }
 
+        private static class RelationRolePair {
+                public Relation rel;
+                public String role;
+
+                public RelationRolePair(Relation rel, String role) {
+                        this.rel = rel;
+                        this.role = role;
+                }
+
+                @Override public boolean equals(Object o) {
+                        return o instanceof RelationRolePair
+                                && rel == ((RelationRolePair) o).rel
+                                && role.equals(((RelationRolePair) o).role);
+                }
+
+                @Override public int hashCode() {
+                        return rel.hashCode() ^ role.hashCode();
+                }
+        }
+
         public void actionPerformed(ActionEvent event) {
                 Collection<OsmPrimitive> selection = Main.ds.getSelected();
@@ -74 +94 @@
                 // should be kept.
                 
-                // Step 1, iterate over all relations and create counters indicating
-                // how many of the selected ways are part of relation X in role Y
-                // (hashMap backlinks contains keys formed like X@Y)
-                HashMap<String, Integer> backlinks = new HashMap<String, Integer>();
+                // Step 1, iterate over all relations and figure out which of our
+                // selected ways are members of a relation.
+                HashMap<RelationRolePair, HashSet<Way>> backlinks =
+                        new HashMap<RelationRolePair, HashSet<Way>>();
                 HashSet<Relation> relationsUsingWays = new HashSet<Relation>();
                 for (Relation r : Main.ds.relations) {
@@ -85 +105 @@
                                         for(Way w : selectedWays) {
                                                 if (rm.member == w) {
-                                                        String hash = Long.toString(r.id) + "@" + rm.role;
-                                                        System.out.println(hash);
-                                                        if (backlinks.containsKey(hash)) {
-                                                                backlinks.put(hash, new Integer(backlinks.get(hash)+1));
+                                                        RelationRolePair pair = new RelationRolePair(r, rm.role);
+                                                        HashSet<Way> waylinks = new HashSet<Way>();
+                                                        if (backlinks.containsKey(pair)) {
+                                                                waylinks = backlinks.get(pair);
                                                         } else {
-                                                                backlinks.put(hash, 1);
+                                                                waylinks = new HashSet<Way>();
+                                                                backlinks.put(pair, waylinks);
                                                         }
+                                                        waylinks.add(w);
+
                                                         // this is just a cache for later use
                                                         relationsUsingWays.add(r);
@@ -102 +125 @@
                 // Step 2, all values of the backlinks HashMap must now equal the size
                 // of the selection.
-                for (Integer i : backlinks.values()) {
-                        if (i.intValue() != selectedWays.size()) {
+                for (HashSet<Way> waylinks : backlinks.values()) {
+                        if (!selectedWays.equals(waylinks)) {
                                 JOptionPane.showMessageDialog(Main.parent, tr("The selected ways cannot be combined as they have differing relation memberships."));
-                                return;                         
+                                return;
                         }
                 }