Changeset 654:39a2acc6caa2

Timestamp:

05/16/08 22:24:46 (2 years ago)

Author:

Howard Butler <hobu.inc@…>

Branch:

default

Convert:

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

Message:

support getting the proj4 string from the header and use it to report the spatial reference in the apps header summary

Files:

• apps/lascommon.c (modified) (4 diffs)
• include/liblas/capi/liblas.h (modified) (1 diff)
• include/liblas/detail/reader.hpp (modified) (1 diff)
• include/liblas/detail/reader10.hpp (modified) (1 diff)
• include/liblas/detail/reader11.hpp (modified) (1 diff)
• include/liblas/lasheader.hpp (modified) (2 diffs)
• src/detail/reader10.cpp (modified) (2 diffs)
• src/detail/reader11.cpp (modified) (2 diffs)
• src/las_c_api.cpp (modified) (1 diff)
• src/lasheader.cpp (modified) (5 diffs)
• src/lasreader.cpp (modified) (1 diff)

apps/lascommon.c

@@ -338 +338 @@
     char *pszSystemId = NULL;
     char *pszSoftwareId = NULL;
+    char *pszProj4 = NULL;
 
     pszSignature = LASHeader_GetFileSignature(header);
@@ -343 +344 @@
     pszSystemId = LASHeader_GetSystemId(header);
     pszSoftwareId = LASHeader_GetSoftwareId(header);
-
+    pszProj4 = LASHeader_GetProj4(header);
+    
     fprintf(stderr, "\n---------------------------------------------------------\n");
     fprintf(stderr, "  Header Summary\n");
@@ -422 +424 @@
                     LASHeader_GetMaxY(header), 
                     LASHeader_GetMaxZ(header));
+    
+    fprintf(stderr, " Spatial Reference           %s\n",
+                    pszProj4);
 
     free(pszSignature);
@@ -427 +432 @@
     free(pszSystemId);
     free(pszSoftwareId);
-    
+    free(pszProj4);
 }
 

include/liblas/capi/liblas.h

@@ -743 +743 @@
 LAS_DLL LASError LASHeader_SetMax(LASHeaderH hHeader, double x, double y, double z);
 
+/** Returns the proj.4 string describing the spatial reference of the 
+ *  header if it is available
+ *  @param hHeader LASHeaderH instance
+ *  @return the proj.4 string or NULL if none is available.  The caller
+ *  owns the string.
+*/
+LAS_DLL char* LASHeader_GetProj4(LASHeaderH hHeader);
+
+/** Sets the proj4 stirng describing the spatial reference of the header.
+ *  @param hHeader LASHeaderH instance
+ *  @param value the proj4 string to set for the header
+ *  @return LASError enum
+*/
+LAS_DLL LASError LASHeader_SetProj4(LASHeaderH hHeader, const char* value);
+
 /****************************************************************************/
 /* Writer Operations                                                        */

include/liblas/detail/reader.hpp

@@ -65 +65 @@
     virtual bool ReadPointAt(std::size_t n, PointRecord& record, double& time) = 0;
     virtual bool ReadVLR(LASHeader& header) = 0;
+    virtual bool ReadGeoreference(LASHeader& header) = 0; 
 
     virtual std::istream& GetStream() = 0;

include/liblas/detail/reader10.hpp

@@ -59 +59 @@
     std::size_t GetVersion() const;
     bool ReadHeader(LASHeader& header);
-    bool ReadGeoreference(LASHeader const& header); // TODO: Under construction
     bool ReadNextPoint(PointRecord& record);
     bool ReadNextPoint(PointRecord& record, double& time);
     bool ReadPointAt(std::size_t n, PointRecord& record);
     bool ReadPointAt(std::size_t n, PointRecord& record, double& time);
+
     bool ReadVLR(LASHeader& header);
+    bool ReadGeoreference(LASHeader& header); 
 
     std::istream& GetStream();

include/liblas/detail/reader11.hpp

@@ -63 +63 @@
     bool ReadPointAt(std::size_t n, PointRecord& record);
     bool ReadPointAt(std::size_t n, PointRecord& record, double& time);
+
+    bool ReadGeoreference(LASHeader& header); 
     bool ReadVLR(LASHeader& header);
 

include/liblas/lasheader.hpp

@@ -292 +292 @@
     void SetMin(double x, double y, double z);
 
+    /// Adds a variable length record to the header
     void AddVLR(LASVLR const& v);
+    
+    /// Returns a VLR 
     LASVLR const& GetVLR(uint32_t index) const;
+
+    /// Removes a VLR from the the header
     void DeleteVLR(uint32_t index);
+    
+    /// Fetch the Georeference as a proj.4 string
+    std::string GetProj4() const;
+    
+    /// Set the Georeference as a proj.4 string
+    void SetProj4(std::string const& v);
     
 private:
@@ -349 +360 @@
     PointExtents m_extents;
     std::vector<LASVLR> m_vlrs;
+    std::string m_proj4;
 };
 

src/detail/reader10.cpp

@@ -244 +244 @@
     // TODO: Under construction
     //       Testing reading of VLRecords with GeoKeys
-    ReadGeoreference(header);
     return true;
 }
-bool ReaderImpl::ReadGeoreference(LASHeader const& header)
+bool ReaderImpl::ReadGeoreference(LASHeader& header)
 {
 #ifndef HAVE_LIBGEOTIFF
@@ -284 +283 @@
     }
 
-    GTIF *gtif = GTIFNewSimpleTags( st );
-    GTIFDefn defn;
-    if (GTIFGetDefn(gtif, &defn)) 
-    {
-         printf( "char PROJ.4 Definition: %s\n", GTIFGetProj4Defn(&defn));
-    }
-    GTIFFree( gtif );
-    ST_Destroy( st );
-    
-    return true;
+    if (st->key_count) {
+        GTIF *gtif = GTIFNewSimpleTags( st );
+        GTIFDefn defn;
+        if (GTIFGetDefn(gtif, &defn)) 
+        {
+            header.SetProj4(std::string(GTIFGetProj4Defn(&defn)));
+        }
+        GTIFFree( gtif );
+        ST_Destroy( st );
+        return true;
+    } else {
+        return false;
+    }
 #endif /* def HAVE_LIBGEOTIFF */
 }

src/detail/reader11.cpp

@@ -47 +47 @@
 #include <liblas/lasrecordheader.hpp>
 
+
+#ifdef HAVE_LIBGEOTIFF
+#include <geotiff.h>
+#include <geo_simpletags.h>
+#include "geo_normalize.h"
+#include "geo_simpletags.h"
+#include "geovalues.h"
+#endif /* HAVE_LIBGEOTIFF */
+
 // std
 #include <fstream>
@@ -328 +337 @@
 }
 
+bool ReaderImpl::ReadGeoreference(LASHeader& header)
+{
+#ifndef HAVE_LIBGEOTIFF
+    UNREFERENCED_PARAMETER(header);
+    return false;
+#else
+    // TODO: Under construction
+
+    std::string const uid("LASF_Projection");
+    ST_TIFF *st = ST_Create();
+
+    for (uint16_t i = 0; i < header.GetRecordsCount(); ++i)
+    {
+        LASVLR record = header.GetVLR(i);
+        std::vector<uint8_t> data = record.GetData();
+        if (uid == record.GetUserId(true).c_str() && 34735 == record.GetRecordId())
+        {
+            int16_t count = data.size()/sizeof(int16_t);
+            ST_SetKey( st, record.GetRecordId(), count, STT_SHORT, 
+                       &(data[0]) );
+        }
+
+        if (uid == record.GetUserId(true).c_str() && 34736 == record.GetRecordId())
+        {
+            int count = data.size() / sizeof(double);
+            ST_SetKey( st, record.GetRecordId(), count, STT_DOUBLE, 
+                       &(data[0]) );
+        }        
+
+        if (uid == record.GetUserId(true).c_str() && 34737 == record.GetRecordId())
+        {
+            uint8_t count = data.size()/sizeof(uint8_t);
+            ST_SetKey( st, record.GetRecordId(), count, STT_ASCII, 
+                       &(data[0]) );
+        }
+    }
+
+    if (st->key_count) {
+        GTIF *gtif = GTIFNewSimpleTags( st );
+        GTIFDefn defn;
+        if (GTIFGetDefn(gtif, &defn)) 
+        {
+            header.SetProj4(std::string(GTIFGetProj4Defn(&defn)));
+        }
+        GTIFFree( gtif );
+        ST_Destroy( st );
+        return true;
+    } else {
+        return false;
+    }
+#endif /* def HAVE_LIBGEOTIFF */
+}
+
 }}} // namespace liblas::detail::v11

src/las_c_api.cpp

@@ -1141 +1141 @@
     return LE_None;
 }
+
+LAS_DLL char* LASHeader_GetProj4(LASHeaderH hHeader) 
+{
+    VALIDATE_POINTER1(hHeader, "LASHeader_GetProj4", NULL);
+    LASHeader* header = (LASHeader*)hHeader;
+
+    return strdup((header)->GetProj4().c_str());
+    
+}
+LAS_DLL LASErrorEnum LASHeader_SetProj4(LASHeaderH hHeader, const char* value)
+{
+    VALIDATE_POINTER1(hHeader, "LASHeader_SetProj4", LE_Failure);
+    VALIDATE_POINTER1(value, "LASHeader_SetProj4", LE_Failure);
+
+    try {
+         ((LASHeader*) hHeader)->SetProj4(value);
+    }
+    catch (std::exception const& e) {
+        LASError_PushError(LE_Failure, e.what(), "LASHeader_SetProj4");
+        return LE_Failure;
+    }
+
+    return LE_None;
+}
+
+
 LAS_DLL LASWriterH LASWriter_Create(const char* filename, const LASHeaderH hHeader, int mode) {
     VALIDATE_POINTER1(hHeader, "LASWriter_Create", NULL); 

src/lasheader.cpp

@@ -84 +84 @@
     m_scales(other.m_scales),
     m_offsets(other.m_offsets),
-
-    m_extents(other.m_extents)
+    m_extents(other.m_extents),
+    m_proj4(other.m_proj4)
 {
     void* p = 0;
@@ -141 +141 @@
         m_offsets = rhs.m_offsets;
         m_extents = rhs.m_extents;
+        m_proj4 = rhs.m_proj4;
     }
     return *this;
@@ -172 +173 @@
     if (m_offsets != other.m_offsets) return false;
     if (m_extents != other.m_extents) return false;
+    if (m_proj4 != other.m_proj4) return false;
     
     return true;
@@ -507 +509 @@
 }
 
-LASVLR const& LASHeader::GetVLR(uint32_t index) const {
+LASVLR const& LASHeader::GetVLR(uint32_t index) const 
+{
     return m_vlrs[index];
 }
 
-void LASHeader::DeleteVLR(uint32_t index) {
+void LASHeader::DeleteVLR(uint32_t index) 
+{
     
     if (index >= m_vlrs.size())
@@ -520 +524 @@
     
 }
+
+    /// Fetch the Georeference as a proj.4 string
+std::string LASHeader::GetProj4() const 
+{
+    return m_proj4;
+}
+    
+void LASHeader::SetProj4(std::string const& v)
+{
+    m_proj4 = v;
+}
 void LASHeader::Init()
 {

src/lasreader.cpp

@@ -153 +153 @@
         throw std::runtime_error("public vlr header block reading failure");
     
+    m_pimpl->ReadGeoreference(m_header);
+    
 }