[GRASS-SVN] r36518 - grass/trunk/lib/vector/Vlib

[svn_grass at osgeo.org]

Author: mmetz
Date: 2009-03-29 15:49:02 -0400 (Sun, 29 Mar 2009)
New Revision: 36518

Modified:
   grass/trunk/lib/vector/Vlib/build_nat.c
Log:
build_nat update

Modified: grass/trunk/lib/vector/Vlib/build_nat.c
===================================================================
--- grass/trunk/lib/vector/Vlib/build_nat.c	2009-03-29 19:47:29 UTC (rev 36517)
+++ grass/trunk/lib/vector/Vlib/build_nat.c	2009-03-29 19:49:02 UTC (rev 36518)
@@ -344,7 +344,6 @@
     static int first = 1;
     static struct ilist *List;
     P_AREA *Area;
-    P_NODE *Node;
     P_LINE *Line;
     struct Plus_head *plus;
 
@@ -390,7 +389,6 @@
 
 	centr = List->value[i];
 	Line = plus->Line[centr];
-	Node = plus->Node[Line->N1];
 
 	/* only attach unregistered and duplicate centroids because 
 	 * 1) all properly attached centroids are properly attached, really! Don't touch.
@@ -402,7 +400,7 @@
 
 	orig_area = Line->left;
 
-	sel_area = Vect_find_area(Map, Node->x, Node->y);
+	sel_area = Vect_find_area(Map, Line->E, Line->N);
 	G_debug(3, "  centroid %d is in area %d", centr, sel_area);
 	if (sel_area > 0) {
 	    Area = plus->Area[sel_area];
@@ -447,7 +445,6 @@
     struct line_pnts *Points, *APoints;
     struct line_cats *Cats;
     P_LINE *Line;
-    P_NODE *Node;
     P_AREA *Area;
     BOUND_BOX box;
     struct ilist *List;
@@ -650,10 +647,8 @@
 	    if (Line->type != GV_CENTROID)
 		continue;
 
-	    Node = plus->Node[Line->N1];
+	    area = Vect_find_area(Map, Line->E, Line->N);
 
-	    area = Vect_find_area(Map, Node->x, Node->y);
-
 	    if (area > 0) {
 		G_debug(3, "Centroid (line=%d) in area %d", line, area);