Make SRS handling consistent.

Close #2348
PDAL · Jan 15, 2019 · 2f3588c · 2f3588c
1 parent dfface8
commit 2f3588c
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 18 deletions.
diff --git a/io/TIndexReader.cpp b/io/TIndexReader.cpp
@@ -172,10 +172,7 @@ void TIndexReader::initialize()
         m_out_ref.reset(new gdal::SpatialRef(m_tgtSrsString));
     else
         m_out_ref.reset(new gdal::SpatialRef(m_out_ref->wkt()));
-
-    // Set SRS if not overridden.
-    if (getSpatialReference().empty())
-        setSpatialReference(SpatialReference(m_out_ref->wkt()));
+    setSpatialReference(SpatialReference(m_out_ref->wkt()));
 
     std::unique_ptr<gdal::Geometry> wkt_g;
 

diff --git a/plugins/greyhound/io/GreyhoundReader.cpp b/plugins/greyhound/io/GreyhoundReader.cpp
@@ -101,7 +101,7 @@ void GreyhoundReader::initialize(PointTableRef table)
         throw pdal_error(std::string("Failed to fetch info: ") + e.what());
     }
 
-    if (m_info.isMember("srs") && getSpatialReference().empty())
+    if (m_info.isMember("srs"))
         setSpatialReference(m_info["srs"].asString());
 }
 

diff --git a/plugins/oci/io/OciReader.cpp b/plugins/oci/io/OciReader.cpp
@@ -95,12 +95,7 @@ void OciReader::initialize()
     if (!m_stmt->Fetch())
         throwError("Unable to fetch a point cloud entry entry.");
     m_block->setFetched();
-
-    // If the spatial reference wasn't provided as an option, fetch it from
-    // the data source.
-    if (m_spatialRef.empty())
-        m_spatialRef = fetchSpatialReference(m_stmt, m_block);
-    setSpatialReference(m_spatialRef);
+    setSpatialReference(fetchSpatialReference(m_stmt, m_block));
 }
 
 

diff --git a/plugins/oci/io/OciReader.hpp b/plugins/oci/io/OciReader.hpp
@@ -85,7 +85,6 @@ class PDAL_DLL OciReader : public DbReader
     std::string m_schemaFile;
     std::string m_connSpec;
     bool m_updatePointSourceId;
-    SpatialReference m_spatialRef;
     bool m_atEnd;
     std::map<int32_t, XMLSchema> m_schemas;
     bool m_compression;

diff --git a/plugins/rdb/io/RdbReader.cpp b/plugins/rdb/io/RdbReader.cpp
@@ -144,9 +144,7 @@ void RdbReader::addArgs(ProgramArgs& args)
 void RdbReader::initialize()
 {
     m_pointcloud.reset(new RdbPointcloud(m_filename, m_filter, m_extras));
-    // Set spatial reference form source if not overridden.
-    if (getSpatialReference().empty())
-        setSpatialReference(getSpatialReferenceSystem(*m_pointcloud));
+    setSpatialReference(getSpatialReferenceSystem(*m_pointcloud));
     readMetadata(*m_pointcloud, getMetadata());
 }
 

diff --git a/plugins/sqlite/io/SQLiteReader.cpp b/plugins/sqlite/io/SQLiteReader.cpp
@@ -79,8 +79,7 @@ void SQLiteReader::initialize()
             std::string(e.what()));
     }
 
-    if (getSpatialReference().empty())
-        setSpatialReference(fetchSpatialReference(m_query));
+    setSpatialReference(fetchSpatialReference(m_query));
     m_patch = PatchPtr(new Patch());
 }
 

diff --git a/plugins/sqlite/io/SQLiteReader.hpp b/plugins/sqlite/io/SQLiteReader.hpp
@@ -63,7 +63,6 @@ class PDAL_DLL SQLiteReader : public DbReader
     std::string m_schemaFile;
     std::string m_connection;
     std::string m_modulename;
-    SpatialReference m_spatialRef;
     PatchPtr m_patch;
 
     bool m_at_end;