add new flag to combine tools with recommended follow-up tools

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@48327 15284696-431f-4ddb-bdfa-cd5b030d7da7

vector/v.clean/main.c

@@ -32,7 +32,7 @@ int main(int argc, char *argv[])
     struct GModule *module;
     struct Option *in_opt, *field_opt, *out_opt, *type_opt, *tool_opt, *thresh_opt,
 	*err_opt;
-    struct Flag *no_build_flag;
+    struct Flag *no_build_flag, *combine_flag;
     int *tools, ntools, atools;
     double *threshs;
     int level;
@@ -119,6 +119,11 @@ int main(int argc, char *argv[])
     no_build_flag->description =
 	_("Don't build topology for the output vector");
 
+    combine_flag = G_define_flag();
+    combine_flag->key = 'c';
+    combine_flag->description =
+	_("Combine tools with recommended follow-up tools.");
+
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 
@@ -329,6 +334,10 @@ int main(int argc, char *argv[])
 	case TOOL_BREAK:
 	    G_message(_("Tool: Break lines at intersections"));
 	    Vect_break_lines(&Out, otype, pErr);
+	    if (combine_flag->answer) {
+		G_message(_("Tool: Remove duplicates"));
+		Vect_remove_duplicates(&Out, otype, pErr);
+	    }
 	    break;
 	case TOOL_RMDUPL:
 	    G_message(_("Tool: Remove duplicates"));
@@ -357,10 +366,27 @@ int main(int argc, char *argv[])
 	case TOOL_SNAP:
 	    G_message(_("Tool: Snap line to vertex in threshold"));
 	    Vect_snap_lines(&Out, otype, threshs[i], pErr);
+	    if (combine_flag->answer) {
+		int nmod;
+
+		do {
+		    G_message(_("Tool: Break lines at intersections"));
+		    Vect_break_lines(&Out, otype, pErr);
+		    G_message(_("Tool: Remove duplicates"));
+		    Vect_remove_duplicates(&Out, otype, pErr);
+		    G_message(_("Tool: Remove small angles at nodes"));
+		    nmod =
+			Vect_clean_small_angles_at_nodes(&Out, otype, pErr);
+		} while (nmod > 0);
+	    }
 	    break;
 	case TOOL_BPOL:
 	    G_message(_("Tool: Break polygons"));
 	    Vect_break_polygons(&Out, otype, pErr);
+	    if (combine_flag->answer) {
+		G_message(_("Tool: Remove duplicates"));
+		Vect_remove_duplicates(&Out, otype, pErr);
+	    }
 	    break;
 	case TOOL_PRUNE:
 	    G_message(_("Tool: Prune lines/boundaries"));
@@ -373,8 +399,23 @@ int main(int argc, char *argv[])
 	    break;
 	case TOOL_RMSA:
 	    G_message(_("Tool: Remove small angles at nodes"));
-	    count =
-		Vect_clean_small_angles_at_nodes(&Out, otype, pErr);
+	    if (!combine_flag->answer) {
+		count =
+		    Vect_clean_small_angles_at_nodes(&Out, otype, pErr);
+	    }
+	    else {
+		int nmod;
+
+		while ((nmod =
+		          Vect_clean_small_angles_at_nodes(&Out, otype, pErr)) > 0) {
+		    count += nmod;
+		    G_message(_("Tool: Break lines at intersections"));
+		    Vect_break_lines(&Out, otype, pErr);
+		    G_message(_("Tool: Remove duplicates"));
+		    Vect_remove_duplicates(&Out, otype, pErr);
+		    G_message(_("Tool: Remove small angles at nodes"));
+		}
+	    }
 	    break;
 	case TOOL_RMLINE:
 	    G_message(_("Tool: Remove all lines and boundaries of zero length"));

vector/v.clean/v.clean.html

@@ -14,7 +14,8 @@ breaks lines/boundaries forming a collapsed loop, for example 0.0;1.0;0.0
 is broken at 1.0.
 <p>
 Breaking lines should be followed by removing duplicates, e.g. 
-<em>v.clean tool=break,rmdupl</em>.
+<em>v.clean tool=break,rmdupl</em>. If the <em>-c</em> flag is used with 
+<em>v.clean tool=break</em>, duplicates are automatically removed.
 
 <h3>Remove duplicate geometry features</h3>
 <em>tool=rmdupl</em>
@@ -97,12 +98,16 @@ The <em>snap</em> tool snaps vertices to another vertex not farther away
 than <em>thresh</em>. If there is no other vertex within <em>thresh</em>, 
 no snapping will be done. The <em>type</em> option can have a strong 
 influence on the result. A too large threshold and <em>type=boundary</em>
-can severely damage area topology.
+can severely damage area topology, beyond repair.
 <p>
-Snapped boundaries may need to be cleaned with <em>rmdangle,break,rmdupl</em>.
+Snapped boundaries may need to be cleaned with <em>break,rmdupl,rmsa</em>. 
+If the <em>-c</em> flag is used with <em>v.clean tool=snap</em>, the 
+sequence of <em>break,rmdupl,rmsa</em> is automatically repeated after 
+snapping until no more small angles a left. Additional cleaning with e.g.
+<em>tool=rmdangle</em>may be necessary.
 
 <h3>Remove duplicate area centroids</h3>
-<em>tool=rmdupl</em>
+<em>tool=rmdac</em>
 <p>
 Threshold does not apply, use dummy value if <em>v.clean</em> is 
 run with several tools.
@@ -124,7 +129,9 @@ all boundary nodes (start and end points of each boundary). The
 does not break collapsed loops. The <em>bpol</em> tool is faster than 
 the <em>break</em> tool but needs more memory.
 <p>
-The <em>bpol</em> tool should be followed by <em>rmdupl</em>.
+The <em>bpol</em> tool should be followed by <em>rmdupl</em>. If the 
+<em>-c</em> flag is used with <em>v.clean tool=bpol</em>, duplicates are 
+automatically removed.
 
 <h3>Remove vertices in threshold from lines and boundaries</h3>
 <em>tool=prune</em>
@@ -174,7 +181,12 @@ the tool does.
 </td></tr>
 </table>
 <p>
-The <em>rmsa</em> tool should be followed by <em>break,rmdupl</em>.
+The <em>rmsa</em> tool should be followed by <em>break,rmdupl</em>. The 
+<em>rmsa</em> tool followed by <em>break,rmdupl</em> may need to be run 
+more than once to remove all small angles. If the <em>-c</em> flag is 
+used with <em>v.clean tool=rmsa</em>, the sequence of 
+<em>rmsa,break,rmdupl</em> is automatically repeated until no more small 
+angles a left.
 
 <h2>NOTES</h2>