allow BOX2D or BOX3D for writers.gdal bounds

PDAL · Jan 31, 2017 · f703656 · f703656
1 parent 5edf404
commit f703656
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/io/GDALWriter.cpp b/io/GDALWriter.cpp
@@ -129,7 +129,7 @@ void GDALWriter::prepared(PointTableRef table)
 
 void GDALWriter::readyTable(PointTableRef table)
 {
-    if (m_bounds.empty() && !table.supportsView())
+    if (m_bounds.to2d().empty() && !table.supportsView())
         throw pdal_error(getName() + ": 'bounds' option required in "
             "streaming mode.");
 }
@@ -140,8 +140,8 @@ void GDALWriter::readyFile(const std::string& filename,
 {
     m_outputFilename = filename;
     m_srs = srs;
-    if (m_bounds.valid())
-        createGrid(m_bounds);
+    if (m_bounds.to2d().valid())
+        createGrid(m_bounds.to2d());
 }
 
 
@@ -176,8 +176,8 @@ void GDALWriter::expandGrid(BOX2D bounds)
 void GDALWriter::writeView(const PointViewPtr view)
 {
     BOX2D bounds;
-    if (m_bounds.valid())
-        bounds = m_bounds;
+    if (m_bounds.to2d().valid())
+        bounds = m_bounds.to2d();
     else
         view->calculateBounds(bounds);
 

diff --git a/io/GDALWriter.hpp b/io/GDALWriter.hpp
@@ -73,7 +73,7 @@ class PDAL_DLL GDALWriter : public FlexWriter
     std::string m_outputFilename;
     std::string m_drivername;
     SpatialReference m_srs;
-    BOX2D m_bounds;
+    Bounds m_bounds;
     BOX2D m_curBounds;
     double m_edgeLength;
     Arg *m_radiusArg;