support a_srs for written output

bu/Processor.cpp

@@ -458,6 +458,10 @@ void Processor::writeEptFile(const std::string& filename, pdal::PointTableRef ta
     wopts.add("scale_x", m_b.scale[0]);
     wopts.add("scale_y", m_b.scale[1]);
     wopts.add("scale_z", m_b.scale[2]);
+    if (m_b.opts.a_srs.size())
+        wopts.add("a_srs", m_b.opts.a_srs);
+    if (m_b.opts.metadata)
+        wopts.add("pdal_metadata", m_b.opts.metadata);
     w->setOptions(wopts);
     w->setInput(*prev);
     // Set dataformat ID based on time/rgb, but for now accept the default.

ci/linux/cmake.sh

@@ -2,9 +2,16 @@
 
 export PKG_CONFIG_PATH=$CONDA_PREFIX/lib64/pkgconfig
 
-LDFLAGS="$LDFLAGS -Wl,-rpath-link,$CONDA_PREFIX/lib" cmake .. \
-      -G Ninja \
-      -DCMAKE_LIBRARY_PATH:FILEPATH="$CONDA_PREFIX/lib" \
-      -DCMAKE_INCLUDE_PATH:FILEPATH="$CONDA_PREFIX/include" \
+git clone https://github.com/hobu/laz-perf.git laz-perf && cd laz-perf && \
+    mkdir build && cd build && \
+    cmake -G Ninja .. -DWITH_TESTS=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo  -Dgtest_force_shared_crt=ON -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX && \
+    ninja install && \
+    cd ../..
+
+pwd
+
+
+LDFLAGS="$LDFLAGS -Wl,-rpath-link,$CONDA_PREFIX/lib" cmake -G Ninja \
       -DCMAKE_BUILD_TYPE=Debug \
-      -DCMAKE_INSTALL_PREFIX=${CONDA_PREFIX}
+      -DCMAKE_INSTALL_PREFIX=${CONDA_PREFIX} \
+      ..

ci/osx/cmake.sh

@@ -1,9 +1,15 @@
 #!/bin/bash
 
-cmake .. \
-      -G Ninja \
+
+
+git clone https://github.com/hobu/laz-perf.git laz-perf && cd laz-perf && \
+    mkdir build && cd build && \
+    cmake -G Ninja .. -DWITH_TESTS=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo  -Dgtest_force_shared_crt=ON -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX && \
+    ninja install && \
+    cd ../..
+
+cmake -G Ninja \
       -DCMAKE_BUILD_TYPE=Debug \
-      -DCMAKE_LIBRARY_PATH:FILEPATH="$CONDA_PREFIX/lib" \
-      -DCMAKE_INCLUDE_PATH:FILEPATH="$CONDA_PREFIX/include" \
       -DCMAKE_FIND_FRAMEWORK="NEVER" \
-      -DCMAKE_INSTALL_PREFIX=${CONDA_PREFIX}
+      -DCMAKE_INSTALL_PREFIX=${CONDA_PREFIX} \
+      ..

ci/win/cmake.sh

@@ -1,14 +1,21 @@
 #!/bin/bash
 
-pwd
 where cl.exe
 export CC=cl.exe
 export CXX=cl.exe
-cmake .. -G "Ninja" \
+
+
+git clone https://github.com/hobu/laz-perf.git laz-perf && cd laz-perf && \
+    mkdir build && cd build && \
+    cmake -G Ninja .. -DWITH_TESTS=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo  -Dgtest_force_shared_crt=ON -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX/Library && \
+    ninja install && \
+    cd ../..
+
+cmake -G "Ninja" \
     -DCMAKE_BUILD_TYPE=RelWithDebInfo \
     -DCMAKE_INSTALL_PREFIX="$CONDA_PREFIX" \
     -DWITH_TESTS=ON \
     -DCMAKE_VERBOSE_MAKEFILE=OFF \
-    -DCMAKE_LIBRARY_PATH:FILEPATH="$CONDA_PREFIX/Library/lib" \
-    -DCMAKE_INCLUDE_PATH:FILEPATH="$CONDA_PREFIX/Library/include" \
-    -DOPENSSL_ROOT_DIR="$CONDA_PREFIX/Library"
+    -DOPENSSL_ROOT_DIR="$CONDA_PREFIX/Library" \
+    -DCMAKE_PREFIX_PATH="$CONDA_PREFIX/Library" \
+    ..

untwine/Common.hpp

@@ -34,6 +34,8 @@ struct Options
     int progressFd;
     StringList dimNames;
     bool stats;
+    std::string a_srs;
+    bool metadata;
 };
 
 struct BaseInfo

untwine/Untwine.cpp

@@ -36,7 +36,7 @@ void addArgs(pdal::ProgramArgs& programArgs, Options& options, pdal::Arg * &temp
     programArgs.add("files,i", "Input files/directory", options.inputFiles);
     programArgs.add("output_dir,o", "Output directory/filename for single-file output",
         options.outputName);
-    programArgs.add("single_file", "Create a single output file", options.singleFile);
+    programArgs.add("single_file,s", "Create a single output file", options.singleFile);
     tempArg = &(programArgs.add("temp_dir", "Temp directory", options.tempDir));
     programArgs.add("clean_temp_dir", "Remove files from the temp directory",
         options.cleanTempDir, true);
@@ -51,6 +51,10 @@ void addArgs(pdal::ProgramArgs& programArgs, Options& options, pdal::Arg * &temp
         "loaded.", options.dimNames);
     programArgs.add("stats", "Generate statistics for dimensions in the manner of Entwine.",
         options.stats);
+    programArgs.add("a_srs", "Assign output SRS",
+        options.a_srs, "");
+    programArgs.add("metadata", "Write PDAL metadata to VLR output",
+        options.metadata, false);
 }
 
 bool handleOptions(pdal::StringList& arglist, Options& options)