Changeset 15959 in osm

Timestamp:

2009-06-17T08:42:11+02:00 (15 years ago)

Author:

stoecker

Message:

close #1733

Location:

applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker

Files:

• Lakewalker.java (modified) (3 diffs)
• LakewalkerApp.java (modified) (1 diff)
• LakewalkerException.java (modified) (2 diffs)

applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java

@@ -290 +290 @@
     }
 
+        /*
     public ArrayList<double[]> douglasPeuckerNR(ArrayList<double[]> nodes, double epsilon){
-        /*
         command_stack = [(0, len(nodes) - 1)]
 
@@ -351 +351 @@
             return [nodes[0], nodes[-1]];
         }
+        return nodes;
+    }
         */
-        return nodes;
-    }
-
-    public ArrayList<double[]> douglasPeucker(ArrayList<double[]> nodes, double epsilon){
+
+    public ArrayList<double[]> douglasPeucker(ArrayList<double[]> nodes, double epsilon, int depth){
 
         // Check if node list is empty
-        if(nodes.size()<=1){
+        if(nodes.size()<=1 || depth > 500){
             return nodes;
         }
@@ -383 +383 @@
 
         if(farthest_dist > epsilon){
-            seg_a = douglasPeucker(sublist(nodes,0,farthest_node+1),epsilon);
-            seg_b = douglasPeucker(sublist(nodes,farthest_node,nodes.size()-1),epsilon);
+            seg_a = douglasPeucker(sublist(nodes,0,farthest_node+1),epsilon, depth+1);
+            seg_b = douglasPeucker(sublist(nodes,farthest_node,nodes.size()-1),epsilon,depth+1);
 
             new_nodes.addAll(seg_a);

applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerApp.java

@@ -48 +48 @@
         System.out.println("After vertex reduction, "+nodelist.size()+" nodes remain.");
 
-        nodelist = lw.douglasPeucker(nodelist, dp);
+        nodelist = lw.douglasPeucker(nodelist, dp, 0);
 
         System.out.println("After dp approximation, "+nodelist.size()+" nodes remain.");

applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.lakewalker;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 class LakewalkerException extends Exception {
@@ -6 +8 @@
     public LakewalkerException(){
         super();
-        this.error = "An unknown error has occured";
+        this.error = tr("An unknown error has occurred");
     }