Explorar o código

sidx initialization consistent with topo initialization

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@38634 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Metz %!s(int64=15) %!d(string=hai) anos
pai
achega
dcf7ef0ea7
Modificáronse 3 ficheiros con 3 adicións e 6 borrados
  1. 0 4
      lib/vector/Vlib/open.c
  2. 1 1
      lib/vector/diglib/plus.c
  3. 2 1
      lib/vector/diglib/spindex.c

+ 0 - 4
lib/vector/Vlib/open.c

@@ -848,8 +848,6 @@ int Vect_open_sidx(struct Map_info *Map, int mode)
 	/* initialize spatial index */
 	Map->plus.Spidx_new = 0;
 
-	dig_spidx_init(Plus);
-
 	/* load head */
 	if (dig_Rd_spidx_head(&(Map->plus.spidx_fp), Plus) == -1) {
 	    fclose(Map->plus.spidx_fp.file);
@@ -884,8 +882,6 @@ int Vect_open_sidx(struct Map_info *Map, int mode)
 	/* open new spatial index */
 	Map->plus.Spidx_new = 1;
 
-	dig_spidx_init(Plus);
-
 	if (mode == 1) {
 	    /* load spatial index for update */
 	    if (dig_Rd_spidx(&(Map->plus.spidx_fp), Plus) == -1) {

+ 1 - 1
lib/vector/diglib/plus.c

@@ -95,7 +95,7 @@ int dig_init_plus(struct Plus_head *Plus)
     Plus->Volume_spidx_offset = 0L;
     Plus->Hole_spidx_offset = 0L;
 
-    /* dig_spidx_init(Plus); */
+    dig_spidx_init(Plus);
     dig_cidx_init(Plus);
 
     return 1;

+ 2 - 1
lib/vector/diglib/spindex.c

@@ -38,7 +38,6 @@ int dig_spidx_init(struct Plus_head *Plus)
     ndims = Plus->with_z ? 3 : 2;
 
     G_debug(1, "dig_spidx_init()");
-    G_debug(1, "Plus->spidx_separate = %d", Plus->Spidx_new);
 
     Plus->Node_spidx = RTreeNewIndex(ndims);
     Plus->Line_spidx = RTreeNewIndex(ndims);
@@ -56,6 +55,8 @@ int dig_spidx_init(struct Plus_head *Plus)
     Plus->Volume_spidx_offset = 0L;
     Plus->Hole_spidx_offset = 0L;
 
+    Plus->Spidx_built = 0;
+    
     return 1;
 }