can now read slpk as well as from http, created tests for bounding in…

… local and remote files with autzen and small autzen
PDAL · Sep 19, 2018 · c1a6bab · connormanning · Sep 19, 2018 · abellgithub
1 parent 509cf19
commit c1a6bab
Show file tree

Hide file tree

Showing 7 changed files with 379 additions and 234 deletions.
diff --git a/pdal/StageFactory.cpp b/pdal/StageFactory.cpp
@@ -68,10 +68,10 @@ std::string StageFactory::inferReaderDriver(const std::string& filename)
                         search);
             });
 
-    if (filename.find(".slpk") != std::string::npos)
-        ext = ".i3s";
     if (protocol != protocols.end())
         ext = "." + *protocol;
+    else if (filename.find(".slpk") != std::string::npos)
+        ext = ".i3s";
     else
         ext = FileUtils::extension(filename);
     // Strip off '.' and make lowercase.

diff --git a/plugins/i3s/CMakeLists.txt b/plugins/i3s/CMakeLists.txt
@@ -12,14 +12,23 @@ PDAL_ADD_PLUGIN(reader_libname reader i3s
     FILES
       io/i3sReader.cpp
       io/i3sReceiver.cpp
+      io/SlpkExtractor.cpp
     LINK_WITH
         ${PDAL_JSONCPP_LIB_NAME}
         ${WINSOCK_LIBRARY}
 )
+
 target_link_libraries(${reader_libname} PRIVATE
+    ${GDAL_LIBRARY}
+    ${ZLIB_LIBRARY} 
     lepcc
 )
 
+include(${PDAL_CMAKE_DIR}/zlib.cmake)
+if (ZLIB_FOUND)
+    target_compile_definitions(${reader_libname} PRIVATE -DARBITER_ZLIB)
+endif()
+
 target_include_directories(${reader_libname} PRIVATE
     ${PDAL_JSONCPP_INCLUDE_DIR}
     ${PDAL_VENDOR_DIR}