changed RTree struct names: update diglib

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

lib/vector/diglib/spindex.c

@@ -253,7 +253,7 @@ int
 dig_spidx_add_node(struct Plus_head *Plus, int node,
 		   double x, double y, double z)
 {
-    struct Rect rect;
+    struct RTree_Rect rect;
 
     G_debug(3, "dig_spidx_add_node(): node = %d, x,y,z = %f, %f, %f", node, x,
 	    y, z);
@@ -280,7 +280,7 @@ dig_spidx_add_node(struct Plus_head *Plus, int node,
  */
 int dig_spidx_add_line(struct Plus_head *Plus, int line, struct bound_box * box)
 {
-    struct Rect rect;
+    struct RTree_Rect rect;
 
     G_debug(3, "dig_spidx_add_line(): line = %d", line);
 
@@ -306,7 +306,7 @@ int dig_spidx_add_line(struct Plus_head *Plus, int line, struct bound_box * box)
  */
 int dig_spidx_add_area(struct Plus_head *Plus, int area, struct bound_box * box)
 {
-    struct Rect rect;
+    struct RTree_Rect rect;
 
     G_debug(3, "dig_spidx_add_area(): area = %d", area);
 
@@ -333,7 +333,7 @@ int dig_spidx_add_area(struct Plus_head *Plus, int area, struct bound_box * box)
 
 int dig_spidx_add_isle(struct Plus_head *Plus, int isle, struct bound_box * box)
 {
-    struct Rect rect;
+    struct RTree_Rect rect;
 
     G_debug(3, "dig_spidx_add_isle(): isle = %d", isle);
 
@@ -362,7 +362,7 @@ int dig_spidx_del_node(struct Plus_head *Plus, int node)
 {
     int ret;
     struct P_node *Node;
-    struct Rect rect;
+    struct RTree_Rect rect;
 
     G_debug(3, "dig_spidx_del_node(): node = %d", node);
 
@@ -396,7 +396,7 @@ int dig_spidx_del_node(struct Plus_head *Plus, int node)
 int dig_spidx_del_line(struct Plus_head *Plus, int line, double x, double y, double z)
 {
     struct P_line *Line;
-    struct Rect rect;
+    struct RTree_Rect rect;
     int ret;
 
     G_debug(3, "dig_spidx_del_line(): line = %d", line);
@@ -434,10 +434,10 @@ int dig_spidx_del_area(struct Plus_head *Plus, int area)
 {
     int ret;
     struct P_area *Area;
-    struct Rect rect;
     struct P_line *Line;
     struct P_node *Node;
     struct P_topo_b *topo;
+    struct RTree_Rect rect;
 
     G_debug(3, "dig_spidx_del_area(): area = %d", area);
 
@@ -480,10 +480,10 @@ int dig_spidx_del_isle(struct Plus_head *Plus, int isle)
 {
     int ret;
     struct P_isle *Isle;
-    struct Rect rect;
     struct P_line *Line;
     struct P_node *Node;
     struct P_topo_b *topo;
+    struct RTree_Rect rect;
 
     G_debug(3, "dig_spidx_del_isle(): isle = %d", isle);
 
@@ -509,7 +509,7 @@ int dig_spidx_del_isle(struct Plus_head *Plus, int isle)
 }
 
 /* This function is called by RTreeSearch() to add selected node/line/area/isle to the list */
-static int _add_item(int id, struct Rect rect, struct ilist *list)
+static int _add_item(int id, struct RTree_Rect rect, struct ilist *list)
 {
     dig_list_add(list, id);
     return 1;
@@ -517,7 +517,7 @@ static int _add_item(int id, struct Rect rect, struct ilist *list)
 
 /* This function is called by RTreeSearch() to add 
  * selected node/line/area/isle to the box list */
-static int _add_item_with_box(int id, struct Rect rect, struct boxlist *list)
+static int _add_item_with_box(int id, struct RTree_Rect rect, struct boxlist *list)
 {
     struct bound_box box;
     
@@ -534,7 +534,7 @@ static int _add_item_with_box(int id, struct Rect rect, struct boxlist *list)
 
 /* This function is called by RTreeSearch() to add 
  * selected node/line/area/isle to the box list */
-static int _set_item_box(int id, struct Rect rect, struct boxlist *list)
+static int _set_item_box(int id, struct RTree_Rect rect, struct boxlist *list)
 {
     if (id == list->id[0]) {
 	
@@ -565,7 +565,7 @@ int
 dig_select_nodes(struct Plus_head *Plus, const struct bound_box * box,
 		 struct ilist *list)
 {
-    struct Rect rect;
+    struct RTree_Rect rect;
 
     G_debug(3, "dig_select_nodes()");
 
@@ -587,7 +587,7 @@ dig_select_nodes(struct Plus_head *Plus, const struct bound_box * box,
 }
 
 /* This function is called by RTreeSearch() for nodes to find the node id */
-static int _add_node(int id, struct Rect rect, int *node)
+static int _add_node(int id, struct RTree_Rect rect, int *node)
 {
     *node = id;
     return 0;
@@ -604,14 +604,11 @@ static int _add_node(int id, struct Rect rect, int *node)
  */
 int dig_find_node(struct Plus_head *Plus, double x, double y, double z)
 {
-    struct Rect rect;
-    struct ilist list;
+    struct RTree_Rect rect;
     int node;
 
     G_debug(3, "dig_find_node()");
 
-    dig_init_list(&list);
-
     rect.boundary[0] = x;
     rect.boundary[1] = y;
     rect.boundary[2] = z;
@@ -641,7 +638,7 @@ int
 dig_select_lines(struct Plus_head *Plus, const struct bound_box * box,
 		 struct ilist *list)
 {
-    struct Rect rect;
+    struct RTree_Rect rect;
 
     G_debug(3, "dig_select_lines()");
 
@@ -675,7 +672,7 @@ dig_select_lines(struct Plus_head *Plus, const struct bound_box * box,
 int dig_select_lines_with_box(struct Plus_head *Plus, const struct bound_box *box,
 		      struct boxlist *list)
 {
-    struct Rect rect;
+    struct RTree_Rect rect;
 
     G_debug(3, "dig_select_lines_with_box()");
 
@@ -707,7 +704,7 @@ int dig_select_lines_with_box(struct Plus_head *Plus, const struct bound_box *bo
  */
 int dig_find_line_box(const struct Plus_head *Plus, struct boxlist *list)
 {
-    struct Rect rect;
+    struct RTree_Rect rect;
     int ret;
 
     G_debug(3, "dig_find_line_box()");
@@ -743,7 +740,7 @@ int
 dig_select_areas(struct Plus_head *Plus, const struct bound_box * box,
 		 struct ilist *list)
 {
-    struct Rect rect;
+    struct RTree_Rect rect;
 
     G_debug(3, "dig_select_areas()");
 
@@ -777,7 +774,7 @@ int
 dig_select_areas_with_box(struct Plus_head *Plus, const struct bound_box * box,
 		 struct boxlist *list)
 {
-    struct Rect rect;
+    struct RTree_Rect rect;
 
     G_debug(3, "dig_select_areas_with_box()");
 
@@ -809,7 +806,7 @@ dig_select_areas_with_box(struct Plus_head *Plus, const struct bound_box * box,
  */
 int dig_find_area_box(const struct Plus_head *Plus, struct boxlist *list)
 {
-    struct Rect rect;
+    struct RTree_Rect rect;
     int ret;
 
     G_debug(3, "dig_find_line_box()");
@@ -845,7 +842,7 @@ int
 dig_select_isles(struct Plus_head *Plus, const struct bound_box * box,
 		 struct ilist *list)
 {
-    struct Rect rect;
+    struct RTree_Rect rect;
 
     G_debug(3, "dig_select_isles()");
 
@@ -879,7 +876,7 @@ int
 dig_select_isles_with_box(struct Plus_head *Plus, const struct bound_box * box,
 		 struct boxlist *list)
 {
-    struct Rect rect;
+    struct RTree_Rect rect;
 
     G_debug(3, "dig_select_areas_with_box()");
 
@@ -911,7 +908,7 @@ dig_select_isles_with_box(struct Plus_head *Plus, const struct bound_box * box,
  */
 int dig_find_isle_box(const struct Plus_head *Plus, struct boxlist *list)
 {
-    struct Rect rect;
+    struct RTree_Rect rect;
     int ret;
 
     G_debug(3, "dig_find_line_box()");

lib/vector/diglib/spindex_rw.c

@@ -477,7 +477,7 @@ int dig_Rd_spidx_head(struct gvfile * fp, struct Plus_head *ptr)
     return (0);
 }
 
-static int rtree_dump_node(FILE *, struct Node *n, int);
+static int rtree_dump_node(FILE *, struct RTree_Node *n, int);
 
 /*!
    \brief Dump R-tree branch to the file
@@ -489,10 +489,10 @@ static int rtree_dump_node(FILE *, struct Node *n, int);
 
    \return 0
  */
-static int rtree_dump_branch(FILE * fp, struct Branch *b, int with_z,
+static int rtree_dump_branch(FILE * fp, struct RTree_Branch *b, int with_z,
 			     int level)
 {
-    const struct Rect *r;
+    const struct RTree_Rect *r;
 
     r = &(b->rect);
 
@@ -517,7 +517,7 @@ static int rtree_dump_branch(FILE * fp, struct Branch *b, int with_z,
 
    \return 0
  */
-int rtree_dump_node(FILE * fp, struct Node *n, int with_z)
+int rtree_dump_node(FILE * fp, struct RTree_Node *n, int with_z)
 {
     int i;
 
@@ -558,10 +558,10 @@ static int rtree_dump_node_file(FILE *, off_t, int, struct RTree *);
 
    \return 0
  */
-static int rtree_dump_branch_file(FILE * fp, struct Branch *b, int with_z,
+static int rtree_dump_branch_file(FILE * fp, struct RTree_Branch *b, int with_z,
 			     int level, struct RTree *t)
 {
-    const struct Rect *r;
+    const struct RTree_Rect *r;
 
     r = &(b->rect);
 
@@ -590,7 +590,7 @@ static int rtree_dump_branch_file(FILE * fp, struct Branch *b, int with_z,
 int rtree_dump_node_file(FILE * fp, off_t pos, int with_z, struct RTree *t)
 {
     int i;
-    struct Node n;
+    struct RTree_Node n;
 
     /* recursive nearly-but-a-bit-messy depth-first pre-order traversal
      * potentially filling up memory */
@@ -658,12 +658,12 @@ static off_t rtree_write_from_memory(struct gvfile *fp, off_t startpos,
 {
     off_t nextfreepos = startpos;
     int sidx_nodesize, sidx_leafsize;
-    struct Node *n;
+    struct RTree_Node *n;
     int i, j, writeout, maxcard;
     struct spidxstack
     {
 	off_t pos[MAXCARD];	/* file position of child node, object ID on level 0 */
-	struct Node *sn;	/* stack node */
+	struct RTree_Node *sn;	/* stack node */
 	int branch_id;		/* branch no to follow down */
     } s[50];
     int top = 0;
@@ -763,12 +763,12 @@ static off_t rtree_write_from_file(struct gvfile *fp, off_t startpos,
 {
     off_t nextfreepos = startpos;
     int sidx_nodesize, sidx_leafsize;
-    struct Node *n;
+    struct RTree_Node *n;
     int i, j, writeout, maxcard;
     struct spidxstack
     {
 	off_t pos[MAXCARD];	/* file position of child node, object ID on level 0 */
-	struct Node sn;		/* stack node */
+	struct RTree_Node sn;	/* stack node */
 	int branch_id;		/* branch no to follow down */
     } s[MAXLEVEL];
     int top = 0;
@@ -877,12 +877,12 @@ static off_t rtree_write_to_sidx(struct gvfile *fp, off_t startpos,
 static void rtree_load_to_memory(struct gvfile *fp, off_t rootpos,
 				  struct RTree *t, int off_t_size)
 {
-    struct Node *newnode = NULL;
+    struct RTree_Node *newnode = NULL;
     int i, j, loadnode, maxcard;
     struct spidxstack
     {
 	off_t pos[MAXCARD];	/* file position of child node, object ID on level 0 */
-	struct Node sn;		/* stack node */
+	struct RTree_Node sn;	/* stack node */
 	int branch_id;		/* branch no to follow down */
     } s[50], *last;
     int top = 0;
@@ -1002,13 +1002,13 @@ static void rtree_load_to_memory(struct gvfile *fp, off_t rootpos,
 static void rtree_load_to_file(struct gvfile *fp, off_t rootpos,
 				  struct RTree *t, int off_t_size)
 {
-    struct Node newnode;
+    struct RTree_Node newnode;
     off_t newnode_pos = -1;
     int i, j, loadnode, maxcard;
     struct spidxstack
     {
 	off_t pos[MAXCARD];	/* file position of child node, object ID on level 0 */
-	struct Node sn;		/* stack node */
+	struct RTree_Node sn;	/* stack node */
 	int branch_id;		/* branch no to follow down */
     } s[MAXLEVEL], *last;
     int top = 0;
@@ -1279,7 +1279,7 @@ int dig_dump_spidx(FILE * fp, const struct Plus_head *Plus)
 
    \return number of qualifying rectangles
  */
-int rtree_search(struct RTree *t, struct Rect *r, SearchHitCallback shcb,
+int rtree_search(struct RTree *t, struct RTree_Rect *r, SearchHitCallback shcb,
 		 void *cbarg, struct Plus_head *Plus)
 {
     int hitCount = 0, found, maxcard;
@@ -1287,7 +1287,7 @@ int rtree_search(struct RTree *t, struct Rect *r, SearchHitCallback shcb,
     struct spidxstack
     {
 	off_t pos[MAXCARD];	/* file position of child node, object ID on level 0 */
-	struct Node sn;	        /* stack node */
+	struct RTree_Node sn;	        /* stack node */
 	int branch_id;		/* branch no to follow down */
     } s[50], *last;
     int top = 0;