Changeset 2999 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2010-02-17T08:17:23+01:00 (14 years ago)

Author:

jttt

Message:

Fix #4541 simplify way tool creates ways with duplicate nodes

File:

• trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java (modified) (5 diffs)

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

@@ -8 +8 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -216 +217 @@
         int lower = 0;
         int i = 0;
-        List<Node> newNodes = new LinkedList<Node>();
+        List<Node> newNodes = new ArrayList<Node>(w.getNodesCount());
         while(i < w.getNodesCount()){
             if (isRequiredNode(w,w.getNode(i))) {
@@ -232 +233 @@
             }
             // ... and simplify them
-            buildSimplifiedNodeList(w, lower, Math.min(w.getNodesCount()-1, i), threshold,newNodes);
+            buildSimplifiedNodeList(w.getNodes(), lower, Math.min(w.getNodesCount()-1, i), threshold,newNodes);
             lower=i;
             i++;
@@ -260 +261 @@
      * @param threshold
      */
-    protected void buildSimplifiedNodeList(Way wnew, int from, int to, double threshold, List<Node> simplifiedNodes) {
-
-        Node fromN = wnew.getNode(from);
-        Node toN = wnew.getNode(to);
-
+    protected void buildSimplifiedNodeList(List<Node> wnew, int from, int to, double threshold, List<Node> simplifiedNodes) {
+
+        Node fromN = wnew.get(from);
+        Node toN = wnew.get(to);
+
+        // Get max xte
         int imax = -1;
         double xtemax = 0;
         for (int i = from + 1; i < to; i++) {
-            Node n = wnew.getNode(i);
+            Node n = wnew.get(i);
             double xte = Math.abs(EARTH_RAD
                     * xtd(fromN.getCoor().lat() * Math.PI / 180, fromN.getCoor().lon() * Math.PI / 180, toN.getCoor().lat() * Math.PI
@@ -280 +282 @@
 
         if (imax != -1 && xtemax >= threshold) {
+            // Segment cannot be simplified - try shorter segments
             buildSimplifiedNodeList(wnew, from, imax,threshold,simplifiedNodes);
-            simplifiedNodes.add(wnew.getNode(imax));
+            //simplifiedNodes.add(wnew.get(imax));
             buildSimplifiedNodeList(wnew, imax, to, threshold,simplifiedNodes);
         } else {
+            // Simplify segment
             if (simplifiedNodes.isEmpty() || simplifiedNodes.get(simplifiedNodes.size()-1) != fromN) {
                 simplifiedNodes.add(fromN);
             }
-            if (simplifiedNodes.isEmpty() || simplifiedNodes.get(simplifiedNodes.size()-1) != toN) {
+            if (fromN != toN) {
                 simplifiedNodes.add(toN);
             }