Changeset 1601:3970d7dd6303

Timestamp:

03/02/10 10:49:27 (5 months ago)

Author:

Howard Butler <hobu.inc@…>

Branch:

default

Message:

remove interfaces.hpp #168

Files:

• apps/las2oci.cpp (modified) (5 diffs)
• include/Makefile.am (modified) (1 diff)
• include/liblas/detail/reader/reader.hpp (modified) (1 diff)
• include/liblas/detail/writer/writer.hpp (modified) (1 diff)
• include/liblas/interfaces.hpp (deleted)
• include/liblas/lasreader.hpp (modified) (1 diff)
• include/liblas/laswriter.hpp (modified) (1 diff)
• include/liblas/liblas.hpp (modified) (2 diffs)

apps/las2oci.cpp

@@ -108 +108 @@
 }
 
-std::string ReadSQLData(char* filename)
+std::string ReadSQLData(char const* filename)
 {
     std::istream* infile = OpenInput(filename, true);
@@ -852 +852 @@
         s_srid << srid;
     }
-    
-    double x0, x1, y0, y1, z0, z1;
+
     double tolerance = 0.05;
-    
+    extent* e = GetExtent(  &(query->bounds), bUse3d );
+
+    if (IsGeographic(connection, srid)) {
+        e->x0 = -180.0; e->x1 = 180.0;
+        e->y0 = -90.0; e->y1 = 90.0;
+        e->z0 = 0.0; e->z1 = 20000.0;
+
+        tolerance = 0.000000005;
+    }
+
+
     if (bSetExtents){
-        x0 = xmin; x1 = xmax;
-        y0 = ymin; y1 = ymax;
-        z0 = zmin; z1 = zmax;
-    } else {
-        x0 = query->bounds.getLow(0);
-        x1 = query->bounds.getHigh(0);
-        y0 = query->bounds.getLow(1);
-        y1 = query->bounds.getHigh(1);
-        
-        if (bUse3d) {
-            try {
-                z0 = query->bounds.getLow(2);
-                z1 = query->bounds.getHigh(2);
-            } catch (Tools::IndexOutOfBoundsException& e) {
-                z0 = 0;
-                z1 = 20000;
-            }
-        // } else if (bGeographic) {
-        //     x0 = -180.0;
-        //     x1 = 180.0;
-        //     y0 = -90.0;
-        //     y1 = 90.0;
-        //     z0 = 0.0;
-        //     z1 = 20000.0;
-        //     tolerance = 0.000000005;
-        } else {
-            z0 = 0.0;
-            z1 = 20000.0;            
-        }
-    }
-    
+        e->x0 = xmin; e->x1 = xmax;
+        e->y0 = ymin; e->y1 = ymax;
+        e->z0 = zmin; e->z1 = zmax;
+    }     
 
      
@@ -893 +875 @@
         "','blk_extent', MDSYS.SDO_DIM_ARRAY(";
     
-    oss << "MDSYS.SDO_DIM_ELEMENT('X', " << x0 << "," << x1 <<"," << tolerance << "),"
-           "MDSYS.SDO_DIM_ELEMENT('Y', " << y0 << "," << y1 <<"," << tolerance << ")";
+    oss << "MDSYS.SDO_DIM_ELEMENT('X', " << e->x0 << "," << e->x1 <<"," << tolerance << "),"
+           "MDSYS.SDO_DIM_ELEMENT('Y', " << e->y0 << "," << e->y1 <<"," << tolerance << ")";
            
-    if (bUse3d) {
+    if (e->bUse3d) {
         oss << ",";
-        oss <<"MDSYS.SDO_DIM_ELEMENT('Z', "<< z0 << "," << z1 << "," << tolerance << ")";
+        oss <<"MDSYS.SDO_DIM_ELEMENT('Z', "<< e->z0 << "," << e->z1 << "," << tolerance << ")";
     }
     oss << ")," << s_srid.str() << ")";
@@ -905 +887 @@
     if (statement != 0) delete statement; else return false;
     oss.str("");
+    
+    delete e;
     
     return true;
@@ -1045 +1029 @@
 
     bool is_geo = IsGeographic(connection, srid);
-    
-    std::cout <<"Is Geographic? :" << is_geo << std::endl;
+
     if (srid == 0) {
         s_srid << "NULL";

include/Makefile.am

@@ -5 +5 @@
     liblas/exception.hpp \
     liblas/guid.hpp \
-    liblas/interfaces.hpp \
     liblas/iterator.hpp \
     liblas/lasclassification.hpp \

include/liblas/detail/reader/reader.hpp

@@ -46 +46 @@
 #include <liblas/detail/reader/point.hpp>
 #include <liblas/detail/reader/header.hpp>
-#include <liblas/interfaces.hpp>
+#include <liblas/liblas.hpp>
 
 // std

include/liblas/detail/writer/writer.hpp

@@ -44 +44 @@
 
 #include <liblas/detail/fwd.hpp>
-#include <liblas/interfaces.hpp>
+#include <liblas/liblas.hpp>
 #include <liblas/detail/writer/point.hpp>
 #include <liblas/detail/writer/header.hpp>

include/liblas/lasreader.hpp

@@ -45 +45 @@
 
 #include <liblas/detail/fwd.hpp>
-#include <liblas/interfaces.hpp>
+#include <liblas/liblas.hpp>
 
 #include <liblas/lasheader.hpp>

include/liblas/laswriter.hpp

@@ -47 +47 @@
 #include <liblas/laspoint.hpp>
 #include <liblas/detail/fwd.hpp>
-#include <liblas/interfaces.hpp>
+#include <liblas/liblas.hpp>
 
 // std

include/liblas/liblas.hpp

@@ -47 +47 @@
 
 #include <liblas/cstdint.hpp>
+#include <liblas/detail/fwd.hpp>
 #include <fstream>
 #include <string>
@@ -146 +147 @@
 
 };
-    
+
+
+class ReaderI
+{
+public:
+
+    virtual LASHeader const& ReadHeader() = 0;
+    virtual LASPoint const& ReadNextPoint(const LASHeader& header) = 0;
+    virtual LASPoint const& ReadPointAt(std::size_t n, const LASHeader& header) = 0;
+
+    virtual void Reset(const LASHeader& header) = 0;
+    virtual void SetInputSRS(const LASSpatialReference& srs) = 0;
+    virtual void SetOutputSRS(const LASSpatialReference& srs, const LASHeader& header) = 0;
+
+    virtual ~ReaderI() {};    
+};
+
+class WriterI
+{
+public:
+
+    virtual LASHeader const& WriteHeader(const LASHeader& header) = 0;
+    virtual void UpdateHeader(const LASHeader& header) = 0;
+    virtual void WritePoint(const LASPoint& point, const LASHeader& header) = 0;
+
+    virtual void SetInputSRS(const LASSpatialReference& srs) = 0;
+    virtual void SetOutputSRS(const LASSpatialReference& srs, const LASHeader& header) = 0;
+
+    virtual ~WriterI() {};    
+
+};
 } // namespace liblas