[GRASS-SVN] r46565 - grass/branches/develbranch_6/vector/v.in.ogr

[svn_grass at osgeo.org]

Author: mmetz
Date: 2011-06-04 00:31:29 -0700 (Sat, 04 Jun 2011)
New Revision: 46565

Modified:
   grass/branches/develbranch_6/vector/v.in.ogr/main.c
Log:
optimize topo cleaning

Modified: grass/branches/develbranch_6/vector/v.in.ogr/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.in.ogr/main.c	2011-06-04 07:28:05 UTC (rev 46564)
+++ grass/branches/develbranch_6/vector/v.in.ogr/main.c	2011-06-04 07:31:29 UTC (rev 46565)
@@ -1010,7 +1010,12 @@
 		Vect_clean_small_angles_at_nodes(&Tmp, GV_BOUNDARY, NULL);
 	} while (nmodif > 0);
 
+	/* merge boundaries */
 	G_message("%s", separator);
+	G_message(_("Merge boundaries:"));
+	Vect_merge_lines(&Tmp, GV_BOUNDARY, NULL, NULL);
+
+	G_message("%s", separator);
 	if (type & GV_BOUNDARY) {	/* that means lines were converted boundaries */
 	    G_message(_("Change boundary dangles to lines:"));
 	    Vect_chtype_dangles(&Tmp, -1.0, NULL);
@@ -1030,11 +1035,6 @@
 	    Vect_remove_bridges(&Tmp, NULL);
 	}
 
-	/* merge boundaries */
-	G_message("%s", separator);
-	G_message(_("Merge boundaries:"));
-	Vect_merge_lines(&Tmp, GV_BOUNDARY, NULL, NULL);
-
 	/* Boundaries are hopefully clean, build areas */
 	G_message("%s", separator);
 	Vect_build_partial(&Tmp, GV_BUILD_ATTACH_ISLES);