[Liblas-commits] r1225 - trunk/apps

[liblas-commits at liblas.org]

Author: mloskot
Date: Thu Apr 16 12:50:25 2009
New Revision: 1225
URL: http://liblas.org/changeset/1225

Log:
apps/las2ogr.cpp: Store classification as string containing all 8 bit flags (i.e. "01011111"), instead of single integer.

Modified:
   trunk/apps/las2ogr.cpp

Modified: trunk/apps/las2ogr.cpp
==============================================================================
--- trunk/apps/las2ogr.cpp	(original)
+++ trunk/apps/las2ogr.cpp	Thu Apr 16 12:50:25 2009
@@ -9,10 +9,15 @@
 // (See accompanying file LICENSE.txt or copy at
 // http://www.opensource.org/licenses/bsd-license.php)
 //
-
 #if defined(_MSC_VER) && defined(USE_VLD)
 #include <vld.h>
 #endif
+
+#ifdef HAVE_GDAL
+// ogr
+#include <ogr_api.h> // Go first, to bring GeoTIFF definitions if any
+#endif
+
 // liblas
 #include <liblas/liblas.hpp>
 #include <liblas/laspoint.hpp>
@@ -27,8 +32,6 @@
 #include <string>
 
 #ifdef HAVE_GDAL
-// ogr
-#include <ogr_api.h>
 
 // Anonymous namespace for local definitions
 namespace { 
@@ -162,7 +165,7 @@
     
     OGR_Fld_Destroy(fld);
 
-    fld = create_field("asprsclass", OFTInteger, 10, 0);
+    fld = create_field("asprsclass", OFTString, 60, 0);
     err = OGR_L_CreateField(lyr, fld, 0);
     if (OGRERR_NONE != err)
     {
@@ -343,7 +346,11 @@
             OGR_F_SetFieldInteger(feat, 0, p.GetReturnNumber());
             OGR_F_SetFieldInteger(feat, 1, p.GetScanAngleRank());
             OGR_F_SetFieldInteger(feat, 2, p.GetIntensity());
-            OGR_F_SetFieldInteger(feat, 3, p.GetClassification());
+
+            std::ostringstream os;
+            os << p.GetClassification();
+            OGR_F_SetFieldString(feat, 3, os.str().c_str());
+
             OGR_F_SetFieldInteger(feat, 4, p.GetNumberOfReturns());
             OGR_F_SetFieldDouble(feat, 5, p.GetTime());