Integrate hexer code into PDAL (#2073)

* include hexer source tree in PDAL (now relicensed as BSD) #2001

* Remove hexbin plugin.
Add hexbin test.

* Fix app test.

* Add faux plugin to make plugin kernel test work.

* Remove stuff from hexer that was necessary when it was its own package.

* Revert version info

Close #2001

CMakeLists.txt

@@ -35,7 +35,7 @@ GET_OS_INFO()
 SET_INSTALL_DIRS()
 
 set(PDAL_API_VERSION "6")
-set(PDAL_BUILD_VERSION "7.0.1")
+set(PDAL_BUILD_VERSION "7.0.2")
 
 # Name of C++ library
 

cmake/examples/hobu-config.sh

@@ -3,7 +3,6 @@ USR="/usr"
 TIFF_HOME=$USR_LOCAL
 LIBXML2_HOME=/usr/local/Cellar/libxml2/2.9.4/
 WEBSOCKETPP_HOME=/Users/hobu/dev/git/websocketpp
-HEXER_HOME="/usr/local"
 SQLITE_HOME="/usr/local/opt/sqlite"
 SO_EXT=dylib
 #CC=/usr/local/bin/gcc-5
@@ -29,7 +28,6 @@ CC=$CC CXX=$CXX cmake   -G "$CONFIG"  \
         -DBUILD_PLUGIN_SQLITE=ON \
         -DBUILD_PLUGIN_PGPOINTCLOUD=ON \
         -DBUILD_OCI_TESTS=ON \
-        -DBUILD_PLUGIN_HEXBIN=ON \
         -DBUILD_PLUGIN_NITF=ON \
         -DBUILD_PLUGIN_PYTHON=ON \
         -DBUILD_PLUGIN_MRSID=ON \
@@ -38,16 +36,14 @@ CC=$CC CXX=$CXX cmake   -G "$CONFIG"  \
         -DBUILD_PLUGIN_ICEBRIDGE=ON \
         -DBUILD_PLUGIN_PCL=ON \
         -DBUILD_PLUGIN_GREYHOUND=ON \
-        -DBUILD_PLUGIN_RDBLIB=ON \
+        -DBUILD_PLUGIN_RDBLIB=OFF \
         -DBUILD_PLUGIN_OPENSCENEGRAPH=OFF \
         -DWITH_LAZPERF=ON \
         -DWITH_LASZIP=ON \
         -DWITH_EXAMPLES=ON \
         -Drdb_DIR=/Users/hobu/dev/release/riegl/rdblib-2.1.5-x86_64-darwin/interface/cpp \
         -DMRSID_INCLUDE_DIR=/Users/hobu/dev/release/mrsid/Lidar_DSDK/include \
         -DMRSID_LIBRARY=/Users/hobu/dev/release/mrsid/Lidar_DSDK/lib/liblti_lidar_dsdk.dylib \
-        -DHEXER_INCLUDE_DIR=${HEXER_HOME}/include \
-        -DHEXER_LIBRARY=${HEXER_HOME}/lib/libhexer.${SO_EXT} \
         -DLIBXML2_INCLUDE_DIR=${LIBXML2_HOME}/include/libxml2 \
         -DLIBXML2_LIBRARIES=${LIBXML2_HOME}/lib/libxml2.${SO_EXT} \
         -DLazperf_DIR=${LAZPERF_HOME}/ \

plugins/hexbin/filters/HexBin.cpp → filters/HexBinFilter.cpp

@@ -32,9 +32,9 @@
 * OF SUCH DAMAGE.
 ****************************************************************************/
 
-#include "HexBin.hpp"
+#include "HexBinFilter.hpp"
 
-#include <hexer/HexIter.hpp>
+#include "private/hexer/HexIter.hpp"
 #include <pdal/Polygon.hpp>
 #include <pdal/StageFactory.hpp>
 
@@ -48,7 +48,7 @@ static PluginInfo const s_info = PluginInfo(
     "Tessellate the point's X/Y domain and determine point density and/or point boundary.",
     "http://pdal.io/stages/filters.hexbin.html" );
 
-CREATE_SHARED_STAGE(HexBin, s_info)
+CREATE_STATIC_STAGE(HexBin, s_info)
 
 void HexBin::addArgs(ProgramArgs& args)
 {
@@ -108,7 +108,6 @@ void HexBin::done(PointTableRef table)
         m_metadata.add("boundary", "MULTIPOLYGON EMPTY",
             "Empty polygon -- unable to compute boundary");
         return;
-
     }
 
 

plugins/hexbin/filters/HexBin.hpp → filters/HexBinFilter.hpp

@@ -37,9 +37,10 @@
 #include <pdal/Filter.hpp>
 #include <pdal/util/ProgramArgs.hpp>
 
-#include <hexer/Mathpair.hpp>
-#include <hexer/HexGrid.hpp>
-#include <hexer/Processor.hpp>
+
+#include "private/hexer/Mathpair.hpp"
+#include "private/hexer/HexGrid.hpp"
+#include "private/hexer/Processor.hpp"
 
 namespace pdal
 {