From dd63393e370fec084b0288df5231b87f80fbe5b3 Mon Sep 17 00:00:00 2001 From: womeara Date: Tue, 10 Feb 2015 12:20:13 -0500 Subject: [PATCH] Configured GeoWave drivers to run as plugins. --- CMakeLists.txt | 7 +-- cmake/GeoWave.cmake | 17 ------- cmake/JNI.cmake | 20 -------- cmake/boost.cmake | 2 +- cmake/geowave.cmake | 17 +++++++ cmake/{Jace.cmake => jace.cmake} | 11 ++--- cmake/jni.cmake | 19 ++++++++ cmake/modules/FindGeoWave.cmake | 8 ++-- include/pdal/Drivers.hpp | 2 - io/CMakeLists.txt | 1 - io/geowave/CMakeLists.txt | 35 -------------- plugins/CMakeLists.txt | 4 ++ plugins/geowave/CMakeLists.txt | 47 +++++++++++++++++++ .../geowave/io}/GeoWaveReader.cpp | 11 +++-- .../geowave/io}/GeoWaveReader.hpp | 4 +- .../geowave/io}/GeoWaveWriter.cpp | 12 +++-- .../geowave/io}/GeoWaveWriter.hpp | 4 +- plugins/pcl/CMakeLists.txt | 2 +- src/CMakeLists.txt | 8 ---- src/StageFactory.cpp | 4 -- 20 files changed, 121 insertions(+), 114 deletions(-) delete mode 100644 cmake/GeoWave.cmake delete mode 100644 cmake/JNI.cmake create mode 100644 cmake/geowave.cmake rename cmake/{Jace.cmake => jace.cmake} (62%) create mode 100644 cmake/jni.cmake delete mode 100644 io/geowave/CMakeLists.txt create mode 100644 plugins/geowave/CMakeLists.txt rename {io/geowave => plugins/geowave/io}/GeoWaveReader.cpp (97%) rename {io/geowave => plugins/geowave/io}/GeoWaveReader.hpp (95%) rename {io/geowave => plugins/geowave/io}/GeoWaveWriter.cpp (96%) rename {io/geowave => plugins/geowave/io}/GeoWaveWriter.hpp (95%) diff --git a/CMakeLists.txt b/CMakeLists.txt index cd7658ce2b..39e65c4a78 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -106,6 +106,10 @@ option(BUILD_PLUGIN_CPD "Choose if Coherent Point Drift kernel is built" FALSE) add_feature_info("CPD plugin" BUILD_PLUGIN_CPD "run Coherent Point Drift on two datasets") +option(BUILD_PLUGIN_GEOWAVE "Choose if GeoWave support should be built" FALSE) +add_feature_info("GeoWave plugin" BUILD_PLUGIN_GEOWAVE + "Read and Write data using GeoWave") + option(BUILD_PLUGIN_GREYHOUND "Choose if Greyhound support should be built" FALSE) add_feature_info("Greyhound plugin" BUILD_PLUGIN_GREYHOUND "read points from a Greyhound server") @@ -196,9 +200,6 @@ include(${PDAL_CMAKE_DIR}/geos.cmake) # Optional include(${PDAL_CMAKE_DIR}/geotiff.cmake) # Optional include(${PDAL_CMAKE_DIR}/lazperf.cmake) # Optional include(${PDAL_CMAKE_DIR}/laszip.cmake) # Optional -include(${PDAL_CMAKE_DIR}/JNI.cmake) # Optional -include(${PDAL_CMAKE_DIR}/Jace.cmake) # Optional -include(${PDAL_CMAKE_DIR}/GeoWave.cmake) # Optional include(${PDAL_CMAKE_DIR}/threads.cmake) include(${PDAL_CMAKE_DIR}/zlib.cmake) diff --git a/cmake/GeoWave.cmake b/cmake/GeoWave.cmake deleted file mode 100644 index 966745f7fd..0000000000 --- a/cmake/GeoWave.cmake +++ /dev/null @@ -1,17 +0,0 @@ -# -# GeoWave support -# - -# GeoWave support - optional, default=OFF -option(WITH_GeoWave "Choose if GeoWave support should be built" FALSE) -if(WITH_GeoWave) - find_package(GeoWave 0.8.3) - if(GEOWAVE_FOUND) - mark_as_advanced(CLEAR GeoWave_RUNTIME_JAR) - add_definitions(-DGEOWAVE_RUNTIME_JAR=${GeoWave_RUNTIME_JAR}) - set(PDAL_HAVE_GeoWave 1) - else() - set(GeoWave_RUNTIME_JAR "") - set(WITH_GeoWave FALSE) - endif() -endif() diff --git a/cmake/JNI.cmake b/cmake/JNI.cmake deleted file mode 100644 index 0f01ddbf4a..0000000000 --- a/cmake/JNI.cmake +++ /dev/null @@ -1,20 +0,0 @@ -# -# JNI support -# - -# JNI support - optional, default=OFF -option(WITH_JNI "Choose if JNI support should be built" FALSE) -if(WITH_JNI) - find_package(JNI) - if(JNI_FOUND) - set(CMAKE_REQUIRED_LIBRARIES "${JNI_LIBRARIES}") - include_directories(${JNI_INCLUDE_DIRS}) - mark_as_advanced(CLEAR JNI_INCLUDE_DIRS) - mark_as_advanced(CLEAR JNI_LIBRARIES) - add_definitions(-DJAVA_EXECUTABLE_PATH=${Java_JAVA_EXECUTABLE}) - set(PDAL_HAVE_JNI 1) - else() - set(JNI_LIBRARIES "") - set(WITH_JNI FALSE) - endif() -endif() diff --git a/cmake/boost.cmake b/cmake/boost.cmake index e45477f02e..2a6add0b8b 100644 --- a/cmake/boost.cmake +++ b/cmake/boost.cmake @@ -13,7 +13,7 @@ if(WIN32) endif(MSVC) endif(WIN32) -find_package(Boost 1.53 REQUIRED COMPONENTS program_options iostreams filesystem system) +find_package(Boost 1.53 REQUIRED COMPONENTS program_options iostreams filesystem system thread) set_package_properties(Boost PROPERTIES TYPE REQUIRED PURPOSE "Boost provides fundamental functionality for PDAL") if(Boost_FOUND) diff --git a/cmake/geowave.cmake b/cmake/geowave.cmake new file mode 100644 index 0000000000..a9cec72d77 --- /dev/null +++ b/cmake/geowave.cmake @@ -0,0 +1,17 @@ +# +# GeoWave support +# + +# GeoWave support - optional, default=OFF +option(BUILD_PLUGIN_GEOWAVE "Choose if GeoWave support should be built" FALSE) +if(BUILD_PLUGIN_GEOWAVE) + find_package(GeoWave 0.8.3) + if(GEOWAVE_FOUND) + mark_as_advanced(CLEAR GeoWave_RUNTIME_JAR) + add_definitions(-DGEOWAVE_RUNTIME_JAR=${GEOWAVE_RUNTIME_JAR}) + set(PDAL_HAVE_GEOWAVE 1) + else() + set(GEOWAVE_RUNTIME_JAR "") + set(BUILD_PLUGIN_GEOWAVE FALSE) + endif() +endif() diff --git a/cmake/Jace.cmake b/cmake/jace.cmake similarity index 62% rename from cmake/Jace.cmake rename to cmake/jace.cmake index cd2514776c..62ed14f51a 100644 --- a/cmake/Jace.cmake +++ b/cmake/jace.cmake @@ -3,20 +3,19 @@ # # Jace support - optional, default=OFF -option(WITH_JACE "Choose if JACE support should be built" FALSE) -if(WITH_JACE) +if(BUILD_PLUGIN_GEOWAVE) find_package(Jace) if(JACE_FOUND) set(CMAKE_REQUIRED_LIBRARIES "${JACE_LIBRARY}") include_directories(${JACE_INCLUDE_DIR}) mark_as_advanced(CLEAR JACE_INCLUDE_DIR) mark_as_advanced(CLEAR JACE_LIBRARY) - mark_as_advanced(CLEAR JACE_RUNTIME_JAR) - add_definitions(-DJACE_RUNTIME_JAR=${JACE_RUNTIME_JAR}) + mark_as_advanced(CLEAR JACE_RUNTIME_JAR) + add_definitions(-DJACE_RUNTIME_JAR=${JACE_RUNTIME_JAR}) set(PDAL_HAVE_JACE 1) else() set(JACE_LIBRARY "") - set(JACE_RUNTIME "") - set(WITH_JACE FALSE) + set(JACE_RUNTIME "") + set(BUILD_PLUGIN_GEOWAVE FALSE) endif() endif() diff --git a/cmake/jni.cmake b/cmake/jni.cmake new file mode 100644 index 0000000000..f3a89aaca6 --- /dev/null +++ b/cmake/jni.cmake @@ -0,0 +1,19 @@ +# +# JNI support +# + +# JNI support - optional, default=OFF +if(BUILD_PLUGIN_GEOWAVE) + find_package(JNI) + if(JNI_FOUND) + set(CMAKE_REQUIRED_LIBRARIES "${JNI_LIBRARIES}") + include_directories(${JNI_INCLUDE_DIRS}) + mark_as_advanced(CLEAR JNI_INCLUDE_DIRS) + mark_as_advanced(CLEAR JNI_LIBRARIES) + add_definitions(-DJAVA_EXECUTABLE_PATH=${Java_JAVA_EXECUTABLE}) + set(PDAL_HAVE_JNI 1) + else() + set(JNI_LIBRARIES "") + set(BUILD_PLUGIN_GEOWAVE FALSE) + endif() +endif() diff --git a/cmake/modules/FindGeoWave.cmake b/cmake/modules/FindGeoWave.cmake index 579572d0dc..7440eef1de 100644 --- a/cmake/modules/FindGeoWave.cmake +++ b/cmake/modules/FindGeoWave.cmake @@ -9,12 +9,12 @@ ############################################################################### MESSAGE(STATUS "Searching for GeoWave") -IF(GeoWave_RUNTIME_JAR) +IF(GEOWAVE_RUNTIME_JAR) # Already in cache, be silent - SET(GeoWave_FIND_QUIETLY TRUE) + SET(GEOWAVE_FIND_QUIETLY TRUE) ENDIF() -FIND_FILE(GeoWave_RUNTIME_JAR +FIND_FILE(GEOWAVE_RUNTIME_JAR geowave-deploy-${GeoWave_FIND_VERSION}-accumulo-singlejar.jar PATHS /usr/bin @@ -24,4 +24,4 @@ FIND_FILE(GeoWave_RUNTIME_JAR # Handle the QUIETLY and REQUIRED arguments and set GeoWave_FOUND to TRUE # if all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(GeoWave DEFAULT_MSG GeoWave_RUNTIME_JAR) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(GeoWave DEFAULT_MSG GEOWAVE_RUNTIME_JAR) diff --git a/include/pdal/Drivers.hpp b/include/pdal/Drivers.hpp index cf0e208260..ecbf631a5d 100644 --- a/include/pdal/Drivers.hpp +++ b/include/pdal/Drivers.hpp @@ -52,5 +52,3 @@ #include #include -#include -#include diff --git a/io/CMakeLists.txt b/io/CMakeLists.txt index e58f469374..36a8626216 100644 --- a/io/CMakeLists.txt +++ b/io/CMakeLists.txt @@ -5,6 +5,5 @@ add_subdirectory(qfit) add_subdirectory(sbet) add_subdirectory(text) add_subdirectory(terrasolid) -add_subdirectory(geowave) set(PDAL_TARGET_OBJECTS ${PDAL_TARGET_OBJECTS} PARENT_SCOPE) diff --git a/io/geowave/CMakeLists.txt b/io/geowave/CMakeLists.txt deleted file mode 100644 index 4d07f2f001..0000000000 --- a/io/geowave/CMakeLists.txt +++ /dev/null @@ -1,35 +0,0 @@ -# -# GeoWave driver CMake configuration -# - -set(objs "") - -# -# GeoWave Reader -# -set(srcs - GeoWaveReader.cpp -) - -set(incs - GeoWaveReader.hpp -) - -PDAL_ADD_DRIVER(reader GeoWave "${srcs}" "${incs}" reader_objs) -set(objs ${objs} ${reader_objs}) - -# -# GeoWave Writer -# -set(srcs - GeoWaveWriter.cpp -) - -set(incs - GeoWaveWriter.hpp -) - -PDAL_ADD_DRIVER(writer GeoWave "${srcs}" "${incs}" writer_objs) -set(objs ${objs} ${writer_objs}) - -set(PDAL_TARGET_OBJECTS ${PDAL_TARGET_OBJECTS} ${objs} PARENT_SCOPE) diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 40392b638c..1c270c1b42 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -6,6 +6,10 @@ if(BUILD_PLUGIN_CPD) add_subdirectory(cpd) endif(BUILD_PLUGIN_CPD) +if(BUILD_PLUGIN_GEOWAVE) + add_subdirectory(geowave) +endif(BUILD_PLUGIN_GEOWAVE) + if(BUILD_PLUGIN_GREYHOUND) add_subdirectory(greyhound) endif() diff --git a/plugins/geowave/CMakeLists.txt b/plugins/geowave/CMakeLists.txt new file mode 100644 index 0000000000..9dae78ed98 --- /dev/null +++ b/plugins/geowave/CMakeLists.txt @@ -0,0 +1,47 @@ +# +# GeoWave driver CMake configuration +# + +include(${PDAL_CMAKE_DIR}/jni.cmake) +include(${PDAL_CMAKE_DIR}/jace.cmake) +include(${PDAL_CMAKE_DIR}/geowave.cmake) + +set(GEOWAVE_LIBRARIES "") +set(GEOWAVE_LIBRARIES ${GEOWAVE_LIBRARIES} ${Boost_LIBRARIES}) +set(GEOWAVE_LIBRARIES ${GEOWAVE_LIBRARIES} ${JNI_LIBRARIES}) +set(GEOWAVE_LIBRARIES ${GEOWAVE_LIBRARIES} ${JACE_LIBRARY}) +set(GEOWAVE_LIBRARIES ${GEOWAVE_LIBRARIES} ${JAVA_AWT_LIBRARY}) +set(GEOWAVE_LIBRARIES ${GEOWAVE_LIBRARIES} ${JAVA_JVM_LIBRARY}) + +set(objs "") + +# +# GeoWave Reader +# +set(srcs + io/GeoWaveReader.cpp +) + +set(incs + io/GeoWaveReader.hpp +) + +PDAL_ADD_PLUGIN(reader_libname reader geowave + FILES "${srcs}" "${incs}" + LINK_WITH ${GEOWAVE_LIBRARIES}) + +# +# GeoWave Writer +# +set(srcs + io/GeoWaveWriter.cpp +) + +set(incs + io/GeoWaveWriter.hpp +) + +PDAL_ADD_PLUGIN(writer_libname writer geowave + FILES "${srcs}" "${incs}" + LINK_WITH ${GEOWAVE_LIBRARIES}) + diff --git a/io/geowave/GeoWaveReader.cpp b/plugins/geowave/io/GeoWaveReader.cpp similarity index 97% rename from io/geowave/GeoWaveReader.cpp rename to plugins/geowave/io/GeoWaveReader.cpp index 7fbea62977..0409791f80 100644 --- a/io/geowave/GeoWaveReader.cpp +++ b/plugins/geowave/io/GeoWaveReader.cpp @@ -127,6 +127,7 @@ using jace::proxy::mil::nga::giat::geowave::accumulo::AccumuloDataStore; #include "jace/proxy/mil/nga/giat/geowave/accumulo/metadata/AccumuloAdapterStore.h" using jace::proxy::mil::nga::giat::geowave::accumulo::metadata::AccumuloAdapterStore; +CREATE_READER_PLUGIN(geowave, pdal::GeoWaveReader) #define STRINGIFY(x) #x #define TOSTRING(x) STRINGIFY(x) @@ -140,12 +141,12 @@ namespace pdal Option zookeeperUrl("zookeeperUrl", "", "The comma-delimited URLs for all zookeeper servers, this will be directly used to instantiate a ZookeeperInstance"); Option instanceName("instanceName", "", "The zookeeper instance name, this will be directly used to instantiate a ZookeeperInstance"); - Option username("username", "", "The username for an account to establish an Accumulo connector"); + Option username("username", "", "The username for the account to establish an Accumulo connector"); Option password("password", "", "The password for the account to establish an Accumulo connector"); - Option tableNamespace("tableNamespace", "", "The table name to be used when querying GeoWave"); - Option featureTypeName("featureTypeName", "", "The feature type name to be used when querying GeoWave"); - Option dataAdapter("dataAdapter", "FeatureCollectionDataAdapter", "FeatureCollectionDataAdapter stores multiple points per accumulo entry. FeatureDataAdapter stores a single point per accumulo entry."); - Option pointsPerEntry("pointsPerEntry", 5000u, "Sets the maximum number of points per accumulo entry when using FeatureCollectionDataAdapter."); + Option tableNamespace("tableNamespace", "", "The table name to be used when interacting with GeoWave"); + Option featureTypeName("featureTypeName", "", "The feature type name to be used when interacting with GeoWave"); + Option dataAdapter("dataAdapter", "FeatureCollectionDataAdapter", "FeatureCollectionDataAdapter stores multiple points per Accumulo entry. FeatureDataAdapter stores a single point per Accumulo entry."); + Option pointsPerEntry("pointsPerEntry", 5000u, "Sets the maximum number of points per Accumulo entry when using FeatureCollectionDataAdapter."); Option bounds("bounds", "", "The extent of the bounding rectangle to use to query points, expressed as a string, eg: ([xmin, xmax], [ymin, ymax], [zmin, zmax])"); options.add(zookeeperUrl); diff --git a/io/geowave/GeoWaveReader.hpp b/plugins/geowave/io/GeoWaveReader.hpp similarity index 95% rename from io/geowave/GeoWaveReader.hpp rename to plugins/geowave/io/GeoWaveReader.hpp index eb26cfc424..ca661295bb 100644 --- a/io/geowave/GeoWaveReader.hpp +++ b/plugins/geowave/io/GeoWaveReader.hpp @@ -35,6 +35,7 @@ #pragma once #include +#include #include #ifdef PDAL_HAVE_GEOS @@ -50,8 +51,9 @@ namespace pdal class PDAL_DLL GeoWaveReader : public Reader { public: - SET_STAGE_NAME("readers.geowave", "Geowave Reader") + SET_STAGE_NAME("readers.geowave", "GeoWave Reader") SET_STAGE_LINK("http://pdal.io/stages/drivers.geowave.reader.html") + SET_PLUGIN_VERSION("1.0.0") static Options getDefaultOptions(); static Dimension::IdList getDefaultDimensions(); diff --git a/io/geowave/GeoWaveWriter.cpp b/plugins/geowave/io/GeoWaveWriter.cpp similarity index 96% rename from io/geowave/GeoWaveWriter.cpp rename to plugins/geowave/io/GeoWaveWriter.cpp index 2e0a5f12ba..064836cb4f 100644 --- a/io/geowave/GeoWaveWriter.cpp +++ b/plugins/geowave/io/GeoWaveWriter.cpp @@ -133,6 +133,8 @@ using jace::proxy::mil::nga::giat::geowave::accumulo::AccumuloDataStore; #include "jace/proxy/mil/nga/giat/geowave/accumulo/AccumuloIndexWriter.h" using jace::proxy::mil::nga::giat::geowave::accumulo::AccumuloIndexWriter; +CREATE_WRITER_PLUGIN(geowave, pdal::GeoWaveWriter) + #define STRINGIFY(x) #x #define TOSTRING(x) STRINGIFY(x) @@ -145,12 +147,12 @@ namespace pdal Option zookeeperUrl("zookeeperUrl", "", "The comma-delimited URLs for all zookeeper servers, this will be directly used to instantiate a ZookeeperInstance."); Option instanceName("instanceName", "", "The zookeeper instance name, this will be directly used to instantiate a ZookeeperInstance."); - Option username("username", "", "The username for an account to establish an Accumulo connector."); + Option username("username", "", "The username for the account to establish an Accumulo connector."); Option password("password", "", "The password for the account to establish an Accumulo connector."); - Option tableNamespace("tableNamespace", "", "The table name to be used when querying GeoWave."); - Option featureTypeName("featureTypeName", "PDAL_Point", "The feature type name to be used when querying GeoWave."); - Option dataAdapter("dataAdapter", "FeatureCollectionDataAdapter", "FeatureCollectionDataAdapter stores multiple points per accumulo entry. FeatureDataAdapter stores a single point per accumulo entry."); - Option pointsPerEntry("pointsPerEntry", 5000u, "Sets the maximum number of points per accumulo entry when using FeatureCollectionDataAdapter."); + Option tableNamespace("tableNamespace", "", "The table name to be used when interacting with GeoWave."); + Option featureTypeName("featureTypeName", "PDAL_Point", "The feature type name to be used when interacting with GeoWave."); + Option dataAdapter("dataAdapter", "FeatureCollectionDataAdapter", "FeatureCollectionDataAdapter stores multiple points per Accumulo entry. FeatureDataAdapter stores a single point per Accumulo entry."); + Option pointsPerEntry("pointsPerEntry", 5000u, "Sets the maximum number of points per Accumulo entry when using FeatureCollectionDataAdapter."); options.add(zookeeperUrl); options.add(instanceName); diff --git a/io/geowave/GeoWaveWriter.hpp b/plugins/geowave/io/GeoWaveWriter.hpp similarity index 95% rename from io/geowave/GeoWaveWriter.hpp rename to plugins/geowave/io/GeoWaveWriter.hpp index 7c689c56a7..74e2e2c860 100644 --- a/io/geowave/GeoWaveWriter.hpp +++ b/plugins/geowave/io/GeoWaveWriter.hpp @@ -35,6 +35,7 @@ #pragma once #include +#include #include #include @@ -45,8 +46,9 @@ namespace pdal class PDAL_DLL GeoWaveWriter : public Writer { public: - SET_STAGE_NAME("writers.geowave", "Geowave Writer") + SET_STAGE_NAME("writers.geowave", "GeoWave Writer") SET_STAGE_LINK("http://pdal.io/stages/drivers.geowave.writer.html") + SET_PLUGIN_VERSION("1.0.0") static Options getDefaultOptions(); diff --git a/plugins/pcl/CMakeLists.txt b/plugins/pcl/CMakeLists.txt index 4e0d7543ca..a0df443c24 100644 --- a/plugins/pcl/CMakeLists.txt +++ b/plugins/pcl/CMakeLists.txt @@ -37,7 +37,7 @@ if (NOT WIN32) endif() # PCL's configuration clobbers Boost find_package - do it again -find_package(Boost QUIET 1.52 COMPONENTS program_options iostreams filesystem system) +find_package(Boost QUIET 1.52 COMPONENTS program_options iostreams filesystem system thread) if (PCL_VISUALIZATION_FOUND) # diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7308a17a10..2fc1f188ac 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -199,14 +199,6 @@ if (WITH_LASZIP) target_link_libraries(${PDAL_LIB_NAME} ${LASZIP_LIBRARY}) endif() -if (WITH_JNI) - target_link_libraries(${PDAL_LIB_NAME} ${JNI_LIBRARIES}) -endif() - -if (WITH_JACE) - target_link_libraries(${PDAL_LIB_NAME} ${JACE_LIBRARY}) -endif() - if (PDAL_HAVE_PYTHON) target_link_libraries(${PDAL_LIB_NAME} ${PYTHON_LIBRARY}) endif() diff --git a/src/StageFactory.cpp b/src/StageFactory.cpp index 38a3df5234..626a2129a0 100644 --- a/src/StageFactory.cpp +++ b/src/StageFactory.cpp @@ -68,7 +68,6 @@ MAKE_READER_CREATOR(BufferReader, pdal::BufferReader) MAKE_READER_CREATOR(QfitReader, pdal::QfitReader) MAKE_READER_CREATOR(SbetReader, pdal::SbetReader) MAKE_READER_CREATOR(TerrasolidReader, pdal::TerrasolidReader) -MAKE_READER_CREATOR(GeoWaveReader, pdal::GeoWaveReader) // // define the functions to create the filters @@ -94,7 +93,6 @@ MAKE_WRITER_CREATOR(BpfWriter, pdal::BpfWriter) MAKE_WRITER_CREATOR(LasWriter, pdal::LasWriter) MAKE_WRITER_CREATOR(SbetWriter, pdal::SbetWriter) MAKE_WRITER_CREATOR(TextWriter, pdal::TextWriter) -MAKE_WRITER_CREATOR(GeoWaveWriter, pdal::GeoWaveWriter) StageFactory::StageFactory() { @@ -314,7 +312,6 @@ void StageFactory::registerKnownReaders() REGISTER_READER(TerrasolidReader, pdal::TerrasolidReader); REGISTER_READER(BpfReader, pdal::BpfReader); REGISTER_READER(SbetReader, pdal::SbetReader); - REGISTER_READER(GeoWaveReader, pdal::GeoWaveReader); } @@ -342,7 +339,6 @@ void StageFactory::registerKnownWriters() REGISTER_WRITER(LasWriter, pdal::LasWriter); REGISTER_WRITER(SbetWriter, pdal::SbetWriter); REGISTER_WRITER(TextWriter, pdal::TextWriter); - REGISTER_WRITER(GeoWaveWriter, pdal::GeoWaveWriter); } void StageFactory::loadPlugins()