Changeset 1597:859b71bc722c

Timestamp:

03/01/10 07:43:01 (5 months ago)

Author:

Howard Butler <hobu.inc@…>

Branch:

default

Message:

re-enable extent overriding

File:

• apps/las2oci.cpp (modified) (3 diffs)

apps/las2oci.cpp

@@ -683 +683 @@
     long* p_srid  = 0;
     
-    if (srid) {
+    
+    if (srid != 0) {
         p_srid = (long*) malloc (1 * sizeof(long));
         p_srid[0] = srid;
+        printf("srid: %d", p_srid[0]);
     }
     statement->Bind(p_srid);
@@ -1078 +1080 @@
     double tolerance = 0.05;
     
-    // if (bSetExtents){
-    //     x0 = xmin; x1 = xmax;
-    //     y0 = ymin; y1 = ymax;
-    //     z0 = zmin; z1 = zmax;
-    // } else {
+    // Nuke our extents of we're overridding them
+    if (bSetExtents){
+        e->x0 = xmin; e->x1 = xmax;
+        e->y0 = ymin; e->y1 = ymax;
+        e->z0 = zmin; e->z1 = zmax;
+    }
         // x0 = query->bounds.getLow(0);
         //  x1 = query->bounds.getHigh(0);
@@ -1410 +1413 @@
             bSetExtents = true;
         }
-        else if (   strcmp(argv[i],"--xmin") == 0  ||
-                    strcmp(argv[i],"-xmin") == 0
-                )
-        {
-            i++;
-            xmin = atof(argv[i]);
-            printf("xmin: %.3f", xmin);
-            bSetExtents = true;
-        }
 
         else if (   strcmp(argv[i],"--xmax") == 0  ||