Add .vpz (zipped VPC) support

CMakeLists.txt

@@ -11,6 +11,7 @@ set (PEDANTIC TRUE CACHE BOOL "Determines if we should compile in pedantic mode.
 find_package(PDAL REQUIRED)
 find_package(GDAL REQUIRED)
 find_package(Threads REQUIRED)
+find_package(libzip REQUIRED)
 
 add_executable(pdal_wrench
     src/main.cpp
@@ -55,6 +56,7 @@ target_link_libraries(pdal_wrench
         ${PDAL_LIBRARIES}
         ${GDAL_LIBRARY}
         ${CMAKE_THREAD_LIBS_INIT}
+        libzip::zip
 )
 
 install(TARGETS pdal_wrench DESTINATION bin)

environment.yml

@@ -8,4 +8,5 @@ dependencies:
   - ninja
   - cmake
   - pdal
+  - libzip
 

src/alg.cpp

@@ -39,7 +39,7 @@ bool runAlg(std::vector<std::string> args, Alg &alg)
 
     if (alg.hasSingleInput)
     {
-        if (ends_with(alg.inputFile, ".vpc"))
+        if (isVpcFilename(alg.inputFile))
         {
             VirtualPointCloud vpc;
             if (!vpc.read(alg.inputFile))
@@ -184,4 +184,4 @@ fs::path fileStem(const std::string &filename)
     }
 
     return inputBasename;
-}
+}

src/boundary.cpp

@@ -111,7 +111,7 @@ static std::unique_ptr<PipelineManager> pipeline(ParallelJobInfo *tile, double r
 
 void Boundary::preparePipelines(std::vector<std::unique_ptr<PipelineManager>>& pipelines)
 {
-    if (ends_with(inputFile, ".vpc"))
+    if (isVpcFilename(inputFile))
     {
         // VPC handling
         VirtualPointCloud vpc;

src/classify_ground.cpp

@@ -61,7 +61,7 @@ bool ClassifyGround::checkArgs()
         }
     }
 
-    if ( ends_with(outputFile, ".vpc") && outputFormatVpc == "copc" )
+    if ( isVpcFilename(outputFile) && outputFormatVpc == "copc" )
     {
         isStreaming = false;
     }
@@ -120,7 +120,7 @@ void ClassifyGround::preparePipelines(std::vector<std::unique_ptr<PipelineManage
     filterOptions.add(pdal::Option("window", windowSize));
 
 
-    if (ends_with(inputFile, ".vpc"))
+    if (isVpcFilename(inputFile))
     {
         // for /tmp/hello.vpc we will use /tmp/hello dir for all results
         fs::path outputParentDir = fs::path(outputFile).parent_path();
@@ -160,4 +160,4 @@ void ClassifyGround::finalize(std::vector<std::unique_ptr<PipelineManager>>&)
         return;
 
     buildOutput(outputFile, tileOutputFiles);
-}
+}

src/clip.cpp

@@ -60,7 +60,7 @@ bool Clip::checkArgs()
         }
     }
 
-    if ( ends_with(outputFile, ".vpc") && outputFormatVpc == "copc" )
+    if ( isVpcFilename(outputFile) && outputFormatVpc == "copc" )
     {
         isStreaming = false;
     }
@@ -162,7 +162,7 @@ void Clip::preparePipelines(std::vector<std::unique_ptr<PipelineManager>>& pipel
     if (!loadPolygons(polygonFile, crop_opts, bbox))
         return;
 
-    if (ends_with(inputFile, ".vpc"))
+    if (isVpcFilename(inputFile))
     {
         // for /tmp/hello.vpc we will use /tmp/hello dir for all results
         fs::path outputParentDir = fs::path(outputFile).parent_path();

src/compare.cpp

@@ -45,12 +45,12 @@ void ComparePointClouds::addArgs()
 bool ComparePointClouds::checkArgs() 
 {
 
-  if (ends_with(inputFile, ".vpc")) {
+  if (isVpcFilename(inputFile)) {
     std::cerr << "input cannot be a VPC file" << std::endl;
     return false;
   }
 
-  if (ends_with(comparedInputFile, ".vpc")) {
+  if (isVpcFilename(comparedInputFile)) {
     std::cerr << "compared input cannot be a VPC file" << std::endl;
     return false;
   }

src/density.cpp

@@ -156,7 +156,7 @@ std::unique_ptr<PipelineManager> Density::pipeline(ParallelJobInfo *tile) const
 
 void Density::preparePipelines(std::vector<std::unique_ptr<PipelineManager>>& pipelines)
 {
-    if (ends_with(inputFile, ".vpc"))
+    if (isVpcFilename(inputFile))
     {
         // using spatial processing
 

src/filter_noise.cpp

@@ -65,7 +65,7 @@ bool FilterNoise::checkArgs()
         }
     }
 
-    if ( ends_with(outputFile, ".vpc") && outputFormatVpc == "copc" )
+    if ( isVpcFilename(outputFile) && outputFormatVpc == "copc" )
     {
         isStreaming = false;
     }
@@ -163,7 +163,7 @@ void FilterNoise::preparePipelines(std::vector<std::unique_ptr<PipelineManager>>
         noiseFilterOptions.add(pdal::Option("multiplier", statisticalMultiplier));
     }
 
-    if (ends_with(inputFile, ".vpc"))
+    if (isVpcFilename(inputFile))
     {
         // for /tmp/hello.vpc we will use /tmp/hello dir for all results
         fs::path outputParentDir = fs::path(outputFile).parent_path();
@@ -203,4 +203,4 @@ void FilterNoise::finalize(std::vector<std::unique_ptr<PipelineManager>>&)
         return;
 
     buildOutput(outputFile, tileOutputFiles);
-}
+}

src/height_above_ground.cpp

@@ -64,7 +64,7 @@ bool HeightAboveGround::checkArgs()
         }
     }
 
-    if ( ends_with(outputFile, ".vpc") && outputFormatVpc == "copc" )
+    if ( isVpcFilename(outputFile) && outputFormatVpc == "copc" )
     {
         isStreaming = false;
     }
@@ -179,7 +179,7 @@ static std::unique_ptr<PipelineManager> pipeline(ParallelJobInfo *tile, std::str
 
 void HeightAboveGround::preparePipelines(std::vector<std::unique_ptr<PipelineManager>>& pipelines)
 {   
-    if (ends_with(inputFile, ".vpc"))
+    if (isVpcFilename(inputFile))
     {
         // for /tmp/hello.vpc we will use /tmp/hello dir for all results
         fs::path outputParentDir = fs::path(outputFile).parent_path();

src/info.cpp

@@ -103,7 +103,7 @@ static void formatCrsInfo(const std::string &crsWkt, std::string &crs, std::stri
 
 void Info::preparePipelines(std::vector<std::unique_ptr<PipelineManager>>&)
 {
-    if (ends_with(inputFile, ".vpc"))
+    if (isVpcFilename(inputFile))
     {
         VirtualPointCloud vpc;
         if (!vpc.read(inputFile))

src/merge.cpp

@@ -123,6 +123,8 @@ void Merge::preparePipelines(std::vector<std::unique_ptr<PipelineManager>>& pipe
 {
     ParallelJobInfo tile(ParallelJobInfo::Single, BOX2D(), filterExpression, filterBounds);
     std::vector<std::string> inputFilesToProcess;
+    // move any input files to inputFilesToProcess, so they go through processInputFile()
+    std::swap(inputFilesToProcess, inputFiles);
     if (!inputFileList.empty())
     {
         std::ifstream inputFile(inputFileList);
@@ -143,7 +145,7 @@ void Merge::preparePipelines(std::vector<std::unique_ptr<PipelineManager>>& pipe
 
     std::function<void(const std::string& inputFile)> processInputFile;
     processInputFile = [&processInputFile,this](const std::string& inputFile) {
-        if (ends_with(inputFile, ".vpc"))
+        if (isVpcFilename(inputFile))
         {
             VirtualPointCloud vpc;
             if (!vpc.read(inputFile))

src/thin.cpp

@@ -87,7 +87,7 @@ bool Thin::checkArgs()
         }
     }
 
-    if ( ends_with(outputFile, ".vpc") && outputFormatVpc == "copc" )
+    if ( isVpcFilename(outputFile) && outputFormatVpc == "copc" )
     {
         isStreaming = false;
     }
@@ -149,7 +149,7 @@ static std::unique_ptr<PipelineManager> pipeline(ParallelJobInfo *tile, std::str
 
 void Thin::preparePipelines(std::vector<std::unique_ptr<PipelineManager>>& pipelines)
 {
-    if (ends_with(inputFile, ".vpc"))
+    if (isVpcFilename(inputFile))
     {
         // for /tmp/hello.vpc we will use /tmp/hello dir for all results
         fs::path outputParentDir = fs::path(outputFile).parent_path();
@@ -197,7 +197,7 @@ void Thin::finalize(std::vector<std::unique_ptr<PipelineManager>>&)
     for (std::string f : tileOutputFiles)
         args.push_back(f);
 
-    if (ends_with(outputFile, ".vpc"))
+    if (isVpcFilename(outputFile))
     {
         // now build a new output VPC
         buildVpc(args);

src/tile/tile.cpp

@@ -173,7 +173,7 @@ static PointCount createFileInfo(const StringList& input, StringList dimNames,
             std::vector<std::string> dirfiles = directoryList(filename);
             filenames.insert(filenames.end(), dirfiles.begin(), dirfiles.end());
         }
-        else if (ends_with(filename, ".vpc"))
+        else if (isVpcFilename(filename))
         {
             VirtualPointCloud vpc;
             if (!vpc.read(filename))
@@ -474,7 +474,7 @@ bool handleOptions(pdal::StringList& arglist, BaseInfo::Options& options)
         throw FatalError(err.what());
     }
 
-    if (ends_with(options.outputDir, ".vpc"))
+    if (isVpcFilename(options.outputDir))
     {
         options.outputDir = options.outputDir.substr(0, options.outputDir.size()-4);
         options.buildVpc = true;

src/to_raster.cpp

@@ -180,7 +180,7 @@ static std::unique_ptr<PipelineManager> pipeline(ParallelJobInfo *tile, double r
 
 void ToRaster::preparePipelines(std::vector<std::unique_ptr<PipelineManager>>& pipelines)
 {
-    if (ends_with(inputFile, ".vpc"))
+    if (isVpcFilename(inputFile))
     {
         // using spatial processing
 

src/to_raster_tin.cpp

@@ -194,7 +194,7 @@ std::unique_ptr<PipelineManager> pipeline(ParallelJobInfo *tile, double resoluti
 
 void ToRasterTin::preparePipelines(std::vector<std::unique_ptr<PipelineManager>>& pipelines)
 {
-    if (ends_with(inputFile, ".vpc"))
+    if (isVpcFilename(inputFile))
     {
         // using spatial processing
 

src/to_vector.cpp

@@ -93,7 +93,7 @@ static std::unique_ptr<PipelineManager> pipeline(ParallelJobInfo *tile, const st
 
 void ToVector::preparePipelines(std::vector<std::unique_ptr<PipelineManager>>& pipelines)
 {
-    if (ends_with(inputFile, ".vpc"))
+    if (isVpcFilename(inputFile))
     {
         // for /tmp/hello.vpc we will use /tmp/hello dir for all results
         fs::path outputParentDir = fs::path(outputFile).parent_path();
@@ -134,7 +134,7 @@ void ToVector::finalize(std::vector<std::unique_ptr<PipelineManager>>&)
     if (tileOutputFiles.empty())
         return;
 
-    if (ends_with(inputFile, ".vpc"))
+    if (isVpcFilename(inputFile))
     {
         // for /tmp/hello.vpc we will use /tmp/hello dir for all results
         fs::path outputParentDir = fs::path(outputFile).parent_path();

src/translate.cpp

@@ -63,7 +63,7 @@ bool Translate::checkArgs()
         }
     }
 
-    if ( ends_with(outputFile, ".vpc") && outputFormatVpc == "copc" )
+    if ( isVpcFilename(outputFile) && outputFormatVpc == "copc" )
     {
         isStreaming = false;
     }
@@ -164,7 +164,7 @@ static std::unique_ptr<PipelineManager> pipeline(ParallelJobInfo *tile, std::str
 
 void Translate::preparePipelines(std::vector<std::unique_ptr<PipelineManager>>& pipelines)
 {
-    if (ends_with(inputFile, ".vpc"))
+    if (isVpcFilename(inputFile))
     {
         // for /tmp/hello.vpc we will use /tmp/hello dir for all results
         fs::path outputParentDir = fs::path(outputFile).parent_path();

src/utils.cpp

@@ -335,7 +335,7 @@ void buildOutput(std::string outputFile, std::vector<std::string> &tileOutputFil
     for (std::string f : tileOutputFiles)
         args.push_back(f);
 
-    if (ends_with(outputFile, ".vpc"))
+    if (isVpcFilename(outputFile))
     {
         // now build a new output VPC
         buildVpc(args);
@@ -368,7 +368,7 @@ std::string tileOutputFileName(const std::string &outputFile, const std::string
 
     // output is not a VPC, it will be merged later into a single file,
     // use las to avoid zipping the file, it will be removed after merging
-    if (!ends_with(outputFile, ".vpc"))
+    if (!isVpcFilename(outputFile))
     {
         return fullFileNameWithoutExt + ".las";
     }
@@ -383,4 +383,4 @@ std::string tileOutputFileName(const std::string &outputFile, const std::string
     }
 
     return fullFileNameWithoutExt + "." + ext;
-}
+}

src/utils.hpp

@@ -246,6 +246,11 @@ inline bool ends_with(std::string const & value, std::string const & ending)
     return std::equal(ending.rbegin(), ending.rend(), value.rbegin());
 }
 
+inline bool isVpcFilename(const std::string& filename)
+{
+    return ends_with(filename, ".vpc") || ends_with(filename, ".vpz");
+}
+
 
 inline std::string join_strings(const std::vector<std::string>& list, char delimiter)
 {