Delete SRS VLRs from lists before adding new ones.

filters/reprojection/ReprojectionFilter.cpp

@@ -94,7 +94,6 @@ void ReprojectionFilter::processOptions(const Options& options)
         try
         {
             m_inSRS = options.getValueOrThrow<pdal::SpatialReference>("in_srs");
-std::cerr << "Read SRS = " << m_inSRS << "!\n";
             m_inferInputSRS = false;
         }
         catch (std::invalid_argument)
@@ -143,6 +142,8 @@ void ReprojectionFilter::createTransform(PointView *view)
         }
     }
 
+    if (m_in_ref_ptr)
+        OSRDestroySpatialReference(m_in_ref_ptr);
     m_in_ref_ptr = OSRNewSpatialReference(0);
 
     int result =
@@ -157,6 +158,8 @@ void ReprojectionFilter::createTransform(PointView *view)
             "in the source file.";
         throw pdal_error(oss.str());
     }
+    if (m_transform_ptr)
+        OCTDestroyCoordinateTransformation(m_transform_ptr);
     m_transform_ptr = OCTNewCoordinateTransformation(m_in_ref_ptr,
         m_out_ref_ptr);
     if (!m_transform_ptr)

include/pdal/util/Algorithm.hpp

@@ -39,11 +39,36 @@
 namespace pdal
 {
 
+namespace Utils
+{
+
 template<typename CONTAINER, typename VALUE>
 bool contains(const CONTAINER& cont, const VALUE& val)
 {
     return std::find(cont.begin(), cont.end(), val) != cont.end();
 }
 
+
+template<typename KEY, typename VALUE>
+bool contains(const std::map<KEY, VALUE>& c, const KEY& v)
+{
+    return c.find(v) != c.end();
+}
+
+
+template<typename TYPE, typename VALUE>
+void remove(std::vector<TYPE>& v, const VALUE& val)
+{
+    v.erase(std::remove(v.begin(), v.end(), val), v.end());
+}
+
+
+template<typename TYPE, typename PREDICATE>
+void remove_if(std::vector<TYPE>& v, PREDICATE p)
+{
+    v.erase(std::remove_if(v.begin(), v.end(), p), v.end());
+}
+
+} // namespace Utils
 } // namespace pdal
 

include/pdal/util/Utils.hpp

@@ -292,14 +292,6 @@ namespace Utils
     std::string typeidName()
         { return Utils::demangle(typeid(T).name()); }
 
-    template<typename KEY, typename VALUE>
-    bool contains(const std::map<KEY, VALUE>& c, const KEY& v)
-        { return c.find(v) != c.end(); }
-
-    template<typename COLLECTION, typename VALUE>
-    bool contains(const COLLECTION& c, const VALUE& v)
-        { return (std::find(c.begin(), c.end(), v) != c.end()); }
-
     struct RedirectStream
     {
         std::ofstream *m_out;

io/las/LasError.hpp

@@ -35,7 +35,7 @@
 
 #include <vector>
 
-#include <pdal/util/Utils.hpp>
+#include <pdal/util/Algorithm.hpp>
 #include <pdal/Log.hpp>
 
 namespace pdal
@@ -59,8 +59,9 @@ class LasError
         if (!Utils::contains(warned, returnNum))
         {
             warned.push_back(returnNum);
-            m_log->get(LogLevel::Warning) << m_filename << ": Found invalid value of '" <<
-                returnNum << "' for point's return number.\n";
+            m_log->get(LogLevel::Warning) << m_filename <<
+                ": Found invalid value of '" << returnNum <<
+                "' for point's return number.\n";
         }
     }
 

io/las/LasWriter.cpp

@@ -41,6 +41,7 @@
 #include <pdal/Compression.hpp>
 #include <pdal/PDALUtils.hpp>
 #include <pdal/PointView.hpp>
+#include <pdal/util/Algorithm.hpp>
 #include <pdal/util/Inserter.hpp>
 #include <pdal/util/OStream.hpp>
 #include <pdal/util/Utils.hpp>
@@ -416,6 +417,13 @@ void LasWriter::setVlrsFromMetadata(MetadataNode& forward)
 /// \param  srs - Active spatial reference.
 void LasWriter::setVlrsFromSpatialRef()
 {
+    // Delete any existing spatial ref VLRs.
+    deleteVlr(TRANSFORM_USER_ID, GEOTIFF_DIRECTORY_RECORD_ID);
+    deleteVlr(TRANSFORM_USER_ID, GEOTIFF_DOUBLES_RECORD_ID);
+    deleteVlr(TRANSFORM_USER_ID, GEOTIFF_ASCII_RECORD_ID);
+    deleteVlr(TRANSFORM_USER_ID, WKT_RECORD_ID);
+    deleteVlr(LIBLAS_USER_ID, WKT_RECORD_ID);
+
     VlrList vlrs;
 
 #ifdef PDAL_HAVE_LIBGEOTIFF
@@ -522,6 +530,19 @@ void LasWriter::addVlr(const std::string& userId, uint16_t recordId,
     }
 }
 
+/// Delete a VLR from the vlr list.
+///
+void LasWriter::deleteVlr(const std::string& userId, uint16_t recordId)
+{
+    auto matches = [&userId, recordId](const VariableLengthRecord& vlr)
+    {
+        return vlr.matches(userId, recordId);
+    };
+
+    Utils::remove_if(m_vlrs, matches);
+    Utils::remove_if(m_eVlrs, matches);
+}
+
 
 template <typename T>
 void LasWriter::handleHeaderForward(const std::string& s, T& headerVal,

io/las/LasWriter.hpp

@@ -152,6 +152,7 @@ class PDAL_DLL LasWriter : public FlexWriter
     void openCompression();
     void addVlr(const std::string& userId, uint16_t recordId,
         const std::string& description, std::vector<uint8_t>& data);
+    void deleteVlr(const std::string& userId, uint16_t recordId);
     bool addGeotiffVlr(GeotiffSupport& geotiff, uint16_t recordId,
         const std::string& description);
     bool addWktVlr();

io/text/TextWriter.cpp

@@ -42,8 +42,6 @@
 #include <iostream>
 #include <map>
 
-#include <boost/algorithm/string.hpp>
-#include <boost/algorithm/string/erase.hpp>
 #include <boost/tokenizer.hpp>
 
 namespace pdal
@@ -100,7 +98,7 @@ void TextWriter::processOptions(const Options& ops)
         throw pdal_error(out.str());
     }
     m_outputType = ops.getValueOrDefault<std::string>("format", "csv");
-    boost::to_upper(m_outputType);
+    m_outputType = Utils::toupper(m_outputType);
     m_callback = ops.getValueOrDefault<std::string>("jscallback", "");
     m_writeAllDims = ops.getValueOrDefault<bool>("keep_unspecified", true);
     m_dimOrder = ops.getValueOrDefault<std::string>("order", "");
@@ -143,7 +141,7 @@ void TextWriter::ready(PointTableRef table)
     {
         Dimension::IdList all = table.layout()->dims();
         for (auto di = all.begin(); di != all.end(); ++di)
-            if (!contains(m_dims, *di))
+            if (!Utils::contains(m_dims, *di))
                 m_dims.push_back(*di);
     }
 

plugins/pgpointcloud/test/PgpointcloudWriterTest.cpp

@@ -36,6 +36,7 @@
 
 #include <pdal/Writer.hpp>
 #include <pdal/StageFactory.hpp>
+#include <pdal/util/Algorithm.hpp>
 
 #include "Support.hpp"
 #include "Pgtest-Support.hpp"

src/PointLayout.cpp

@@ -33,7 +33,7 @@
 ****************************************************************************/
 
 #include <pdal/PointLayout.hpp>
-#include <pdal/util/Utils.hpp>
+#include <pdal/util/Algorithm.hpp>
 
 namespace pdal
 {