Changeset 335 in josm for branch

Timestamp:

2007-09-30T01:44:08+02:00 (17 years ago)

Author:

gebner

Message:

CombineWayAction: Reorder ways if that makes it possible to combine them.

Location:

branch/0.5/src/org/openstreetmap/josm

Files:

• actions/CombineWayAction.java (modified) (2 diffs)
• data/osm/NodePair.java (modified) (1 diff)

branch/0.5/src/org/openstreetmap/josm/actions/CombineWayAction.java

@@ -73 +73 @@
                         }
                 }
-                
-                // Battle plan:
-                //  1. Split the ways into small chunks of 2 nodes and weed out
-                //         duplicates.
-                //  2. Take a chunk and see if others could be appended or prepended,
-                //         if so, do it and remove it from the list of remaining chunks.
-                //         Rather, rinse, repeat.
-                //  3. If this algorithm does not produce a single way,
-                //     complain to the user.
-                //  4. Profit!
-                
-                HashSet<NodePair> chunkSet = new HashSet<NodePair>();
-                for (Way w : selectedWays) {
-                        if (w.nodes.size() == 0) continue;
-                        Node lastN = null;
-                        for (Node n : w.nodes) {
-                                if (lastN == null) {
-                                        lastN = n;
-                                        continue;
-                                }
-                                chunkSet.add(new NodePair(lastN, n));
-                                lastN = n;
-                        }
-                }
-                LinkedList<NodePair> chunks = new LinkedList<NodePair>(chunkSet);
-
-                if (chunks.isEmpty()) {
-                        JOptionPane.showMessageDialog(Main.parent, tr("All the ways were empty"));
-                        return;
-                }
-
-                List<Node> nodeList = chunks.poll().toArrayList();
-                while (!chunks.isEmpty()) {
-                        ListIterator<NodePair> it = chunks.listIterator();
-                        boolean foundChunk = false;
-                        while (it.hasNext()) {
-                                NodePair curChunk = it.next();
-                                if (curChunk.a == nodeList.get(nodeList.size() - 1)) { // append
-                                        nodeList.add(curChunk.b);
-                                        foundChunk = true;
-                                } else if (curChunk.b == nodeList.get(0)) { // prepend
-                                        nodeList.add(0, curChunk.a);
-                                        foundChunk = true;
-                                }
-                                if (foundChunk) {
-                                        it.remove();
-                                        break;
-                                }
-                        }
-                        if (!foundChunk) break;
-                }
-
-                if (!chunks.isEmpty()) {
-                        JOptionPane.showMessageDialog(Main.parent,
-                                tr("Could not combine ways (Hint: ways have to point into the same direction)"));
-                        return;
+
+                List<Node> nodeList = null;
+                Object firstTry = actuallyCombineWays(selectedWays, false);
+                if (firstTry instanceof List) {
+                        nodeList = (List<Node>) firstTry;
+                } else {
+                        Object secondTry = actuallyCombineWays(selectedWays, true);
+                        if (secondTry instanceof List) {
+                                int option = JOptionPane.showConfirmDialog(Main.parent,
+                                        tr("The ways can not be combined in their current directions.  "
+                                        + "Do you want to reverse some of them?"), tr("Change directions?"),
+                                        JOptionPane.YES_NO_OPTION);
+                                if (option != JOptionPane.YES_OPTION) {
+                                        return;
+                                }
+                                nodeList = (List<Node>) secondTry;
+                        } else {
+                                JOptionPane.showMessageDialog(Main.parent, (String) secondTry);
+                                return;
+                        }
                 }
 
@@ -165 +129 @@
 
         /**
+         * @return a message if combining failed, else a list of nodes.
+         */
+        private Object actuallyCombineWays(List<Way> ways, boolean ignoreDirection) {
+                // Battle plan:
+                //  1. Split the ways into small chunks of 2 nodes and weed out
+                //         duplicates.
+                //  2. Take a chunk and see if others could be appended or prepended,
+                //         if so, do it and remove it from the list of remaining chunks.
+                //         Rather, rinse, repeat.
+                //  3. If this algorithm does not produce a single way,
+                //     complain to the user.
+                //  4. Profit!
+                
+                HashSet<NodePair> chunkSet = new HashSet<NodePair>();
+                for (Way w : ways) {
+                        if (w.nodes.size() == 0) continue;
+                        Node lastN = null;
+                        for (Node n : w.nodes) {
+                                if (lastN == null) {
+                                        lastN = n;
+                                        continue;
+                                }
+
+                                NodePair np = new NodePair(lastN, n);
+                                if (ignoreDirection) {
+                                        np.sort();
+                                }
+                                chunkSet.add(np);
+
+                                lastN = n;
+                        }
+                }
+                LinkedList<NodePair> chunks = new LinkedList<NodePair>(chunkSet);
+
+                if (chunks.isEmpty()) {
+                        return tr("All the ways were empty");
+                }
+
+                List<Node> nodeList = chunks.poll().toArrayList();
+                while (!chunks.isEmpty()) {
+                        ListIterator<NodePair> it = chunks.listIterator();
+                        boolean foundChunk = false;
+                        while (it.hasNext()) {
+                                NodePair curChunk = it.next();
+                                if (curChunk.a == nodeList.get(nodeList.size() - 1)) { // append
+                                        nodeList.add(curChunk.b);
+                                } else if (curChunk.b == nodeList.get(0)) { // prepend
+                                        nodeList.add(0, curChunk.a);
+                                } else if (ignoreDirection && curChunk.b == nodeList.get(nodeList.size() - 1)) { // append
+                                        nodeList.add(curChunk.a);
+                                } else if (ignoreDirection && curChunk.a == nodeList.get(0)) { // prepend
+                                        nodeList.add(0, curChunk.b);
+                                } else {
+                                        continue;
+                                }
+
+                                foundChunk = true;
+                                it.remove();
+                                break;
+                        }
+                        if (!foundChunk) break;
+                }
+
+                if (!chunks.isEmpty()) {
+                        return tr("Could not combine ways "
+                                + "(They could not be merged into a single string of nodes)");
+                } else {
+                        return nodeList;
+                }
+        }
+
+        /**
          * Enable the "Combine way" menu option if more then one way is selected
          */

branch/0.5/src/org/openstreetmap/josm/data/osm/NodePair.java

@@ -30 +30 @@
                 return l;
         }
+
+        public void sort() {
+                if (b.hashCode() < a.hashCode()) {
+                        Node tmp = a;
+                        a = b;
+                        b = tmp;
+                }
+        }
 }