Changeset 6411 in josm for trunk

Timestamp:

2013-11-25T02:03:59+01:00 (11 years ago)

Author:

Don-vip

Message:

allow to call SimplifyWayAction with a custom threshold

File:

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

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

@@ -35 +35 @@
 /**
  * Delete unnecessary nodes from a way
+ * @since 2575
  */
 public class SimplifyWayAction extends JosmAction {
@@ -110 +111 @@
             Collection<Command> allCommands = new LinkedList<Command>();
             for (Way way: ways) {
-                SequenceCommand simplifyCommand = simplifyWay(way, ds);
+                SequenceCommand simplifyCommand = simplifyWay(way);
                 if (simplifyCommand == null) {
                     continue;
@@ -152 +153 @@
 
     /**
-     * Simplifies a way
+     * Simplifies a way with default threshold (read from preferences).
      *
      * @param w the way to simplify
-     */
-    public SequenceCommand simplifyWay(Way w, DataSet ds) {
-        double threshold = Main.pref.getDouble("simplify-way.max-error", 3.0);
+     * @return The sequence of commands to run
+     * @since 6411
+     */
+    public final SequenceCommand simplifyWay(Way w) {
+        return simplifyWay(w, Main.pref.getDouble("simplify-way.max-error", 3.0));
+    }
+
+    /**
+     * Simplifies a way with a given threshold.
+     *
+     * @param w the way to simplify
+     * @return The sequence of commands to run
+     * @since 6411
+     */
+    public SequenceCommand simplifyWay(Way w, double threshold) {
         int lower = 0;
         int i = 0;
@@ -163 +176 @@
         while(i < w.getNodesCount()){
             if (isRequiredNode(w,w.getNode(i))) {
-                // copy a required node to the list of new nodes. Simplify not
-                // possible
+                // copy a required node to the list of new nodes. Simplify not possible
                 newNodes.add(w.getNode(i));
                 i++;
@@ -192 +204 @@
         cmds.add(new ChangeCommand(w, newWay));
         cmds.add(new DeleteCommand(delNodes));
-        ds.clearSelection(delNodes);
+        w.getDataSet().clearSelection(delNodes);
         return new SequenceCommand(trn("Simplify Way (remove {0} node)", "Simplify Way (remove {0} nodes)", delNodes.size(), delNodes.size()), cmds);
     }