Semi-working tindex.

PDAL · May 14, 2015 · 23c207c · 23c207c
1 parent 5f33657
commit 23c207c
Show file tree

Hide file tree

Showing 6 changed files with 318 additions and 130 deletions.
diff --git a/include/pdal/GDALUtils.hpp b/include/pdal/GDALUtils.hpp
@@ -48,12 +48,68 @@
 #include "gdal.h"
 #include <cpl_vsi.h>
 #include <ogr_api.h>
+#include <ogr_srs_api.h>
 
 namespace pdal
 {
 namespace gdal
 {
 
+typedef std::shared_ptr<void> RefPtr;
+
+class SpatialRef
+{
+public:
+    SpatialRef()
+        { newRef(OSRNewSpatialReference("")); }
+    SpatialRef(const std::string& srs)
+    {
+        newRef(OSRNewSpatialReference(""));
+        OSRSetFromUserInput(get(), srs.data());
+    }
+
+    void setFromLayer(OGRLayerH layer)
+        { newRef(OSRClone(OGR_L_GetSpatialRef(layer))); }
+    operator bool () const
+        { return m_ref.get() != NULL; }
+    OGRSpatialReferenceH get() const
+        { return m_ref.get(); }
+
+private:
+    void newRef(void *v)
+    {
+        m_ref = RefPtr(v, [](void* t){ OSRDestroySpatialReference(t); } );
+    }
+
+    RefPtr m_ref;
+};
+
+class Geometry
+{
+public:
+    Geometry()
+        {}
+    Geometry(const std::string& wkt, const SpatialRef& srs)
+    {
+        OGRGeometryH geom;
+
+        char *p_wkt = const_cast<char *>(wkt.data());
+        OGR_G_CreateFromWkt(&p_wkt, srs.get(), &geom);
+        newRef(geom);
+    }
+
+    operator bool () const
+        { return get() != NULL; }
+    OGRGeometryH get() const
+        { return m_ref.get(); }
+
+private:
+    void newRef(void *v)
+    {
+        m_ref = RefPtr(v, [](void* t){ OGR_G_DestroyGeometry(t); } );
+    }
+    RefPtr m_ref;
+};
 
 class PDAL_DLL ErrorHandler 
 {
@@ -64,7 +120,8 @@ class PDAL_DLL ErrorHandler
 
     static void CPL_STDCALL trampoline(::CPLErr code, int num, char const* msg)
     {
-        ErrorHandler* debug = static_cast<ErrorHandler*>(CPLGetErrorHandlerUserData());
+        ErrorHandler* debug =
+            static_cast<ErrorHandler*>(CPLGetErrorHandlerUserData());
         if (!debug)
             return;
 

diff --git a/include/pdal/Kernel.hpp b/include/pdal/Kernel.hpp
@@ -143,6 +143,7 @@ class PDAL_DLL Kernel
     }
     bool argumentExists(const std::string& name)
         { return (bool)m_variablesMap.count(name); }
+    bool argumentSpecified(const std::string& name);
 
     bool m_usestdin;
     int m_argc;