Don't print multiple SRS message if we've overridden the SRS. (#2108)

Close #2107
PDAL · Jul 25, 2018 · 9ab6892 · 9ab6892
1 parent 9693732
commit 9ab6892
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/io/LasWriter.cpp b/io/LasWriter.cpp
@@ -177,7 +177,7 @@ void LasWriter::initialize()
 
 void LasWriter::spatialReferenceChanged(const SpatialReference&)
 {
-    if (++m_srsCnt > 1)
+    if (++m_srsCnt > 1 && m_aSrs.empty())
         log()->get(LogLevel::Error) << getName() <<
             ": Attempting to write '" << m_filename << "' with multiple "
             "point spatial references." << std::endl;

diff --git a/io/LasWriter.hpp b/io/LasWriter.hpp
@@ -139,6 +139,8 @@ class PDAL_DLL LasWriter : public FlexWriter, public Streamable
     virtual void readyTable(PointTableRef table);
     virtual void readyFile(const std::string& filename,
         const SpatialReference& srs);
+    virtual bool srsOverridden() const
+        { return m_aSrs.valid(); }
     virtual void writeView(const PointViewPtr view);
     virtual bool processOne(PointRef& point);
     void spatialReferenceChanged(const SpatialReference& srs);

diff --git a/pdal/FlexWriter.hpp b/pdal/FlexWriter.hpp
@@ -84,15 +84,18 @@ class PDAL_DLL FlexWriter : public Writer
 #define final final
 #endif
 
+    virtual bool srsOverridden() const
+    { return false; }
+
     virtual void ready(PointTableRef table) final
     {
         readyTable(table);
         if (m_hashPos == std::string::npos)
         {
-            if (!table.spatialReferenceUnique())
+            if (!table.spatialReferenceUnique() && !srsOverridden())
                 log()->get(LogLevel::Error) << getName() <<
                     ": Attempting to write '" << m_filename <<
-                    "' with multiple point spatial references.";
+                    "' with multiple point spatial references." << std::endl;
             readyFile(generateFilename(), table.spatialReference());
         }
     }