update pdal_wrench to 1.1

alexbruy · nyalldawson · commit c9da9b7680ad · 2023-10-25T07:43:00.000+10:00
diff --git a/external/pdal_wrench/alg.hpp b/external/pdal_wrench/alg.hpp
@@ -206,6 +206,7 @@ struct Merge : public Alg
     // parameters from the user
     std::string outputFile;
     std::vector<std::string> inputFiles;
+    std::string inputFileList;
 
     // args - initialized in addArgs()
     pdal::Arg* argOutput = nullptr;
diff --git a/external/pdal_wrench/merge.cpp b/external/pdal_wrench/merge.cpp
@@ -11,6 +11,7 @@
  ****************************************************************************/
 
 #include <iostream>
+#include <fstream>
 #include <filesystem>
 #include <thread>
 
@@ -36,6 +37,8 @@ void Merge::addArgs()
     argOutput = &programArgs.add("output,o", "Output virtual point cloud file", outputFile);
     // we set hasSingleInput=false so the default "input,i" argument is not added
     programArgs.add("files", "input files", inputFiles).setPositional();
+    programArgs.add("input-file-list", "Read input files from a text file", inputFileList);
+
 }
 
 bool Merge::checkArgs()
@@ -108,6 +111,22 @@ static std::unique_ptr<PipelineManager> pipeline(ParallelJobInfo *tile)
 void Merge::preparePipelines(std::vector<std::unique_ptr<PipelineManager>>& pipelines)
 {
     ParallelJobInfo tile(ParallelJobInfo::Single, BOX2D(), filterExpression, filterBounds);
+    if (!inputFileList.empty())
+    {
+        std::ifstream inputFile(inputFileList);
+        std::string line;
+        if(!inputFile)
+        {
+            std::cerr << "failed to open input file list: " << inputFileList << std::endl;
+            return;
+        }
+
+        while (std::getline(inputFile, line))
+        {
+            inputFiles.push_back(line);
+        }
+    }
+
     tile.inputFilenames = inputFiles;
     tile.outputFilename = outputFile;
 
@@ -120,5 +139,4 @@ void Merge::preparePipelines(std::vector<std::unique_ptr<PipelineManager>>& pipe
         QuickInfo qi = getQuickInfo(f);
         totalPoints += qi.m_pointCount;
     }
-
 }
diff --git a/external/pdal_wrench/tile/tile.cpp b/external/pdal_wrench/tile/tile.cpp
@@ -124,6 +124,7 @@ struct BaseInfo
         int max_threads;
         std::string outputFormat;   // las or laz (for now)
         bool buildVpc = false;
+        std::string inputFileList; // file list with input files
     } opts;
 
     pdal::BOX3D trueBounds;
@@ -434,6 +435,7 @@ void addArgs(pdal::ProgramArgs& programArgs, BaseInfo::Options& options, pdal::A
 {
     programArgs.add("output,o", "Output directory/filename", options.outputDir);
     programArgs.add("files,i", "Input files/directory", options.inputFiles).setPositional();
+    programArgs.add("input-file-list", "Read input files from a text file", options.inputFileList);
     programArgs.add("length,l", "Tile length", options.tileLength, 1000.);
     tempArg = &(programArgs.add("temp_dir", "Temp directory", options.tempDir));
     programArgs.add("output-format", "Output format (las/laz)", options.outputFormat);
@@ -461,7 +463,7 @@ bool handleOptions(pdal::StringList& arglist, BaseInfo::Options& options)
     addArgs(programArgs, options, tempArg, threadsArg);
     try
     {
-        programArgs.parse(arglist);
+        programArgs.parseSimple(arglist);
     }
     catch (const pdal::arg_error& err)
     {
@@ -498,6 +500,22 @@ bool handleOptions(pdal::StringList& arglist, BaseInfo::Options& options)
             throw FatalError("Unknown output format: " + options.outputFormat);
     }
 
+    if (!options.inputFileList.empty())
+    {
+        std::ifstream inputFile(options.inputFileList);
+        std::string line;
+        if(!inputFile)
+        {
+            throw FatalError("Failed to open input file list: " + options.inputFileList);
+        }
+
+        while (std::getline(inputFile, line))
+        {
+            options.inputFiles.push_back(line);
+        }
+    }
+
+
     return true;
 }
 
diff --git a/external/pdal_wrench/vpc.cpp b/external/pdal_wrench/vpc.cpp
@@ -11,6 +11,7 @@
  ****************************************************************************/
 
 #include <iostream>
+#include <fstream>
 #include <filesystem>
 #include <thread>
 namespace fs = std::filesystem;
@@ -25,7 +26,6 @@ namespace fs = std::filesystem;
 #include "nlohmann/json.hpp"
 
 
-
 using json = nlohmann::json;
 
 using namespace pdal;
@@ -368,8 +368,18 @@ std::string dateTimeStringFromYearAndDay(int year, int dayOfYear)
 {
     bool leapYear = isLeapYear(year);
 
-    if (year < 0) return "";  // Year is negative
-    if ((dayOfYear < 1) || (dayOfYear > (leapYear ? 366 : 365))) return ""; // Day of year is out of range
+    if (year < 0)  // Year is negative
+    {
+        std::cerr << "Warning: year(" << year <<
+            ") is not valid. Defualting to 1970." << std::endl;
+        year = 1970;
+    }
+    if ((dayOfYear < 1) || (dayOfYear > (leapYear ? 366 : 365)))
+    {
+        std::cerr << "Warning: DayOfYear(" << year <<
+            ") is out of range. Defualting to 1." << std::endl;
+        dayOfYear = 1;
+    }
 
     // Figure out month and day of month, from day of year.
     int daysInMonth[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
@@ -395,16 +405,20 @@ std::string dateTimeStringFromYearAndDay(int year, int dayOfYear)
 void buildVpc(std::vector<std::string> args)
 {
     std::string outputFile;
+    std::string inputFileList;
     std::vector<std::string> inputFiles;
     bool boundaries = false;
     bool stats = false;
     bool overview = false;
     int max_threads = -1;
     bool verbose = false;
+    bool help = false;
 
     ProgramArgs programArgs;
+    programArgs.add("help,h", "Output command help.", help);
     programArgs.add("output,o", "Output virtual point cloud file", outputFile);
     programArgs.add("files,f", "input files", inputFiles).setPositional();
+    programArgs.add("input-file-list", "Read input files from a txt file, one file per line.", inputFileList);
     programArgs.add("boundary", "Calculate boundary polygons from data", boundaries);
     programArgs.add("stats", "Calculate statistics from data", stats);
     programArgs.add("overview", "Create overview point cloud from source data", overview);
@@ -422,6 +436,32 @@ void buildVpc(std::vector<std::string> args)
         return;
     }
 
+    if (help)
+    {
+
+        std::cout << "usage: pdal_wrench build_vpc [<args>]" << std::endl;
+        programArgs.dump(std::cerr, 2, Utils::screenWidth());
+        return;
+    }
+
+    if (!inputFileList.empty())
+    {
+        std::ifstream inputFile(inputFileList);
+        std::string line;
+
+        if(!inputFile)
+        {
+            std::cerr << "failed to open input file list: " << inputFileList << std::endl;
+            return;
+        }
+
+        while (std::getline(inputFile, line))
+        {
+            inputFiles.push_back(line);
+        }
+
+    }
+
 //    std::cout << "input " << inputFiles.size() << std::endl;
 //    std::cout << "output " << outputFile << std::endl;
 
