Changeset 639:a819cae56a57

Timestamp:

05/12/08 18:43:41 (2 years ago)

Author:

Howard Butler <hobu.inc@…>

Branch:

default

Convert:

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

Message:

start in on converting las2ogr to use the C API

Location:

apps

Files:

• Makefile.am (modified) (1 diff)
• las2ogr.cpp (modified) (3 diffs)

apps/Makefile.am

@@ -7 +7 @@
 txt2las_SOURCES = txt2las.c
 
-if GDAL_IS_CONFIG
-las2ogr_SOURCES = las2ogr.cpp
-bin_PROGRAMS = lasinfo las2las lasmerge las2txt txt2las las2ogr
-else
+#if GDAL_IS_CONFIG
+#las2ogr_SOURCES = las2ogr.cpp
+#bin_PROGRAMS = lasinfo las2las lasmerge las2txt txt2las las2ogr
+#else
 bin_PROGRAMS = lasinfo las2las lasmerge las2txt txt2las
 
-endif
+#endif
 
 LDADD = ../src/liblas.la

apps/las2ogr.cpp

@@ -19 +19 @@
 #include <liblas/cstdint.hpp>
 // ogr
-#include <ogrsf_frmts.h>
-#include <ogr_p.h>
+#include <ogr_api.h>
+// #include <ogrsf_frmts.h>
+// #include <ogr_p.h>
 //std
 #include <cassert>
@@ -95 +96 @@
 };
 
-void create_layer_def(OGRLayer& lyr)
-{
+OGRFieldDefnH create_field(const char* name, OGRFieldType type, int width, int precision ) {
+
+    OGRFieldDefnH fld;
+    fld= OGR_Fld_Create(name, type);
+    OGR_Fld_SetWidth(fld, width);
+    OGR_Fld_SetPrecision(fld, precision);
+
+    return fld;
+    
+}
+void create_layer_def(OGRLayerH lyr)
+{
+    OGRErr err;
     std::string fldname("return_num");
-    OGRFieldDefn fld(fldname.c_str(), OFTReal);
-    fld.SetWidth(1);
-    fld.SetPrecision(0);
-    if (OGRERR_NONE != lyr.CreateField(&fld))
-    {
-        throw std::runtime_error(fldname + " field cration failed");
-    }
-
-    fldname = "angle";
-    fld.Set(fldname.c_str(), OFTReal, 3, 0);
-    if (OGRERR_NONE != lyr.CreateField(&fld))
-    {
-        throw std::runtime_error(fldname + " field cration failed");
-    }
-
-    fldname = "intensity";
-    fld.Set(fldname.c_str(), OFTReal, 3, 0);
-    if (OGRERR_NONE != lyr.CreateField(&fld))
-    {
-        throw std::runtime_error(fldname + " field cration failed");
-    }
-
-    fldname = "asprsclass";
-    fld.Set(fldname.c_str(), OFTReal, 3, 0);
-    if (OGRERR_NONE != lyr.CreateField(&fld))
-    {
-        throw std::runtime_error(fldname + " field cration failed");
-    }
-
-    fldname = "return_tot";
-    fld.Set(fldname.c_str(), OFTReal, 3, 0);
-    if (OGRERR_NONE != lyr.CreateField(&fld))
-    {
-        throw std::runtime_error(fldname + " field cration failed");
-    }
-
-    fldname = "gps_time";
-    fld.Set(fldname.c_str(), OFTReal, 13, 6);
-    if (OGRERR_NONE != lyr.CreateField(&fld))
-    {
-        throw std::runtime_error(fldname + " field cration failed");
-    }
+    
+    OGRFieldDefnH fld;
+    
+    fld = create_field("return_num", OFTInteger, 10, 0);
+    err = OGR_L_CreateField(lyr, fld, 0);
+    if (OGRERR_NONE != err)
+    {
+        throw std::runtime_error("return_num field creation failed");
+    }
+    
+    OGR_Fld_Destroy(fld);
+
+    fld = create_field("angle", OFTInteger, 10, 0);
+    err = OGR_L_CreateField(lyr, fld, 0);
+    if (OGRERR_NONE != err)
+    {
+        throw std::runtime_error("angle field cration failed");
+    }
+    
+    OGR_Fld_Destroy(fld);
+    
+    fld = create_field("intensity", OFTInteger, 10, 0);
+    err = OGR_L_CreateField(lyr, fld, 0);
+    if (OGRERR_NONE != err)
+    {
+        throw std::runtime_error("intensity field cration failed");
+    }
+    
+    OGR_Fld_Destroy(fld);
+
+    fld = create_field("asprsclass", OFTInteger, 10, 0);
+    err = OGR_L_CreateField(lyr, fld, 0);
+    if (OGRERR_NONE != err)
+    {
+        throw std::runtime_error("asprsclass field creation failed");
+    }
+    
+    OGR_Fld_Destroy(fld);
+
+    fld = create_field("return_tot", OFTInteger, 10, 0);
+    err = OGR_L_CreateField(lyr, fld, 0);
+    if (OGRERR_NONE != err)
+    {
+        throw std::runtime_error("return_tot field creation failed");
+    }
+    
+    OGR_Fld_Destroy(fld);
+
+    fld = create_field("gpstime", OFTReal, 10, 0);
+    err = OGR_L_CreateField(lyr, fld, 0);
+    if (OGRERR_NONE != err)
+    {
+        throw std::runtime_error("gpstime field cration failed");
+    }
+    
+    OGR_Fld_Destroy(fld);
+
 }
 
 void report_ogr_formats()
 {
-    OGRSFDriverRegistrar* r = 0;
-    r = OGRSFDriverRegistrar::GetRegistrar();
 
     std::cout << "Supported target formats:";
 
-    for (int i = 0; i < r->GetDriverCount(); ++i)
-    {
-        OGRSFDriver* drv = r->GetDriver(i);
+    for (int i = 0; i < OGRGetDriverCount(); ++i)
+    {
+        OGRSFDriverH drv = OGRGetDriver(i);
         assert(0 != drv);
 
-        if (drv->TestCapability(ODrCCreateDataSource))
-        {
-            std::cout << "\n - " << drv->GetName();
+        if (OGR_Dr_TestCapability(drv,"ODrCCreateDataSource"))
+        {
+            std::cout << "\n - " << OGR_Dr_GetName(drv);
         }
     }
@@ -218 +243 @@
         }
 
-        OGRLayer* lyr = 0;
-        lyr = ds->CreateLayer(lyrname.c_str(), 0, wkbPoint25D, 0);
+        OGRLayerH lyr = 0;
+        lyr = OGR_DS_CreateLayer(ds, lyrname.c_str(), 0, wkbPoint25D, 0);
         if (0 == lyr)
         {