Changeset 976:a81fe9716c7b

Timestamp:

02/19/09 20:19:21 (18 months ago)

Author:

Howard Butler <hobu.inc@…>

Branch:

default

Convert:

svn:1766ff46-f334-0410-ab20-d63176f87757/trunk@1054

Message:

C API for LASSRS

Files:

• include/liblas/capi/liblas.h (modified) (2 diffs)
• include/liblas/lassrs.hpp (modified) (2 diffs)
• src/las_c_api.cpp (modified) (4 diffs)
• src/lassrs.cpp (modified) (2 diffs)

include/liblas/capi/liblas.h

@@ -61 +61 @@
 typedef struct LASVLRHS *LASVLRH;
 typedef struct LASColorHS *LASColorH;
+typedef struct LASSRSHS *LASSRSH;
+
+
+/* Fake out the compiler if we don't have libgeotiff */
+#ifndef HAVE_LIBGEOTIFF
+    typedef struct GTIFS * GTIF;
+#else
+#include <geotiff.h>
+#endif
+
 
 LAS_C_START
@@ -1057 +1067 @@
 
 
+/****************************************************************************/
+/* SRS Operations                                                           */
+/****************************************************************************/
+
+/** Creates a new SRS
+ *  @return a new SRS
+*/
+LAS_DLL LASSRSH LASSRS_Create(void);
+
+
+LAS_DLL const GTIF* LASSRS_GetGTIF(LASSRSH hSRS);
+LAS_DLL char* LASSRS_GetWKT(LASSRSH hSRS);
+LAS_DLL LASError LASSRS_SetWKT(LASSRSH hSRS, const char* value);
+LAS_DLL char* LASSRS_GetProj4(LASSRSH hSRS);
+LAS_DLL LASError LASSRS_SetProj4(LASSRSH hSRS, const char* value);
+
+
 LAS_C_END
 #endif

include/liblas/lassrs.hpp

@@ -147 +147 @@
     void SetVLRs(const std::vector<LASVLR>& vlrs);
     
+    /// Add a VLR representing GeoTIFF keys to the SRS
+    void AddVLR(const LASVLR& vlr);
+    
     /// Return a copy of the LASVLRs that LASSRS maintains
     std::vector<LASVLR> GetVLRs() const;
@@ -157 +160 @@
 
     std::vector<LASVLR> m_vlrs;
+    bool IsGeoVLR(const LASVLR& vlr) const;
+    
 
 protected:

src/las_c_api.cpp

@@ -50 +50 @@
 #include <liblas/lasrecordheader.hpp>
 #include <liblas/guid.hpp>
+#include <liblas/lassrs.hpp>
 #include <liblas/capi/las_config.h>
 #include <liblas/capi/las_version.h>
@@ -60 +61 @@
 typedef struct LASVLRHS *LASVLRH;
 typedef struct LASColorHS *LASColorH;
-
+typedef struct LASSRSHS *LASSRSH;
 
 
@@ -73 +74 @@
 #include <vector>
 #include <cstdio>
+
 using namespace liblas;
 
@@ -1674 +1676 @@
 }
 
+LAS_DLL LASSRSH LASSRS_Create(void) {
+    return (LASSRSH) new LASSRS();
+}
+
+LAS_DLL void LASSRS_Destroy(LASSRSH hSRS){
+    VALIDATE_POINTER0(hSRS, "LASSRS_Destroy");
+    delete (LASSRS*)hSRS;
+    hSRS = NULL;
+}
+
+LAS_DLL const GTIF* LASSRS_GetGTIF(LASSRSH hSRS) {
+    VALIDATE_POINTER1(hSRS, "LASSRS_GetGTIF", 0);
+    
+    try {
+        return ((LASSRS*) hSRS)->GetGTIF();
+    }
+    catch (std::exception const& e) {
+        LASError_PushError(LE_Failure, e.what(), "LASSRS_GetGTIF");
+        return 0;
+    }
+}
+
+LAS_DLL char* LASSRS_GetProj4(LASSRSH hSRS) 
+{
+    VALIDATE_POINTER1(hSRS, "LASSRS_GetProj4", NULL);
+    LASSRS* srs = (LASSRS*)hSRS;
+
+    return strdup((srs)->GetProj4().c_str());
+    
+}
+
+LAS_DLL LASErrorEnum LASSRS_SetProj4(LASSRSH hSRS, const char* value)
+{
+    VALIDATE_POINTER1(hSRS, "LASSRS_SetProj4", LE_Failure);
+    VALIDATE_POINTER1(value, "LASSRS_SetProj4", LE_Failure);
+
+    try {
+         ((LASSRS*) hSRS)->SetProj4(value);
+    }
+    catch (std::exception const& e) {
+        LASError_PushError(LE_Failure, e.what(), "LASSRS_SetProj4");
+        return LE_Failure;
+    }
+
+    return LE_None;
+}
+
+LAS_DLL char* LASSRS_GetWKT(LASSRSH hSRS) 
+{
+    VALIDATE_POINTER1(hSRS, "LASSRS_GetWKT", NULL);
+    LASSRS* srs = (LASSRS*)hSRS;
+
+    return strdup((srs)->GetWKT().c_str());
+    
+}
+
+LAS_DLL LASErrorEnum LASSRS_SetWKT(LASSRSH hSRS, const char* value)
+{
+    VALIDATE_POINTER1(hSRS, "LASSRS_SetWKT", LE_Failure);
+    VALIDATE_POINTER1(value, "LASSRS_SetWKT", LE_Failure);
+
+    try {
+         ((LASSRS*) hSRS)->SetWKT(value);
+    }
+    catch (std::exception const& e) {
+        LASError_PushError(LE_Failure, e.what(), "LASSRS_SetWKT");
+        return LE_Failure;
+    }
+
+    return LE_None;
+}
+
+LAS_DLL LASErrorEnum LASSRS_AddVLR(LASSRSH hSRS, const LASVLRH hVLR) {
+    
+    VALIDATE_POINTER1(hSRS, "LASSRS_AddVLR", LE_Failure);
+    VALIDATE_POINTER1(hVLR, "LASSRS_AddVLR", LE_Failure);
+
+    try {
+        ((LASSRS*) hSRS)->AddVLR(*((LASVLR*)hVLR));
+    }
+    catch (std::exception const& e) {
+        LASError_PushError(LE_Failure, e.what(), "LASSRS_AddVLR");
+        return LE_Failure;
+    }
+
+
+    return LE_None;
+}
+
+LAS_DLL LASErrorEnum LASSRS_ResetVLRs(LASSRSH hSRS) {
+    
+    VALIDATE_POINTER1(hSRS, "LASSRS_ResetVLRs", LE_Failure);
+
+    try {
+        ((LASSRS*) hSRS)->ResetVLRs();
+    }
+    catch (std::exception const& e) {
+        LASError_PushError(LE_Failure, e.what(), "LASSRS_ResetVLRs");
+        return LE_Failure;
+    }
+
+
+    return LE_None;
+}
+
 LAS_C_END
 

src/lassrs.cpp

@@ -114 +114 @@
     for (i = vlrs.begin(); i != vlrs.end(); ++i)
     {
-        //GTIFF_GEOKEYDIRECTORY == 34735
-        if (uid == (*i).GetUserId(true).c_str() && 34735 == (*i).GetRecordId()) {
+        if (IsGeoVLR(*i)) {
             m_vlrs.push_back(*i);
         }
-        
-        // GTIFF_DOUBLEPARAMS == 34736
-        if (uid == (*i).GetUserId(true).c_str() && 34736 == (*i).GetRecordId()) {
-            m_vlrs.push_back(*i);
-        }
-        
-        // GTIFF_ASCIIPARAMS == 34737
-        if (uid == (*i).GetUserId(true).c_str() && 34737 == (*i).GetRecordId()) {
-            m_vlrs.push_back(*i);
-        }
-    }
+        // //GTIFF_GEOKEYDIRECTORY == 34735
+        // if (uid == (*i).GetUserId(true).c_str() && 34735 == (*i).GetRecordId()) {
+        //     m_vlrs.push_back(*i);
+        // }
+        // 
+        // // GTIFF_DOUBLEPARAMS == 34736
+        // if (uid == (*i).GetUserId(true).c_str() && 34736 == (*i).GetRecordId()) {
+        //     m_vlrs.push_back(*i);
+        // }
+        // 
+        // // GTIFF_ASCIIPARAMS == 34737
+        // if (uid == (*i).GetUserId(true).c_str() && 34737 == (*i).GetRecordId()) {
+        //     m_vlrs.push_back(*i);
+        // }
+    }
+}
+
+void LASSRS::AddVLR(const LASVLR& vlr) 
+{
+    if (IsGeoVLR(vlr)) {
+        m_vlrs.push_back(vlr);
+    }
+}
+bool LASSRS::IsGeoVLR(const LASVLR& vlr) const
+{
+    std::string const uid("LASF_Projection");
+    if (uid == vlr.GetUserId(true).c_str() && 34735 == vlr.GetRecordId()) {
+        return true;
+    }
+    
+    // GTIFF_DOUBLEPARAMS == 34736
+    if (uid == vlr.GetUserId(true).c_str() && 34736 == vlr.GetRecordId()) {
+        return true;
+    }
+    
+    // GTIFF_ASCIIPARAMS == 34737
+    if (uid == vlr.GetUserId(true).c_str() && 34737 == vlr.GetRecordId()) {
+        return true;
+    }
+    return false;
 }
 
@@ -376 +404 @@
     {
         delete poSRS;
-        throw std::invalid_argument("could not import proj4 into OSRSpatialReference GetProj4");
-        return FALSE;
+        return std::string("");
     }