fetch XML metadata for ILVIS2 and IceBridge drivers at ready() instea…

…d of done()
PDAL · Oct 7, 2016 · f09352c · f09352c
1 parent f30b70f
commit f09352c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/io/ilvis2/Ilvis2Reader.cpp b/io/ilvis2/Ilvis2Reader.cpp
@@ -208,6 +208,11 @@ void Ilvis2Reader::readPoint(PointRef& point, StringList s,
 
 void Ilvis2Reader::ready(PointTableRef table)
 {
+    if (!m_metadataFile.empty())
+    {
+        m_mdReader.readMetadataFile(m_metadataFile, &m_metadata);
+    }
+
     static const int HeaderSize = 2;
     std::string line;
 
@@ -291,10 +296,7 @@ point_count_t Ilvis2Reader::read(PointViewPtr view, point_count_t count)
 
 void Ilvis2Reader::done(PointTableRef table)
 {
-    if (!m_metadataFile.empty())
-    {
-        m_mdReader.readMetadataFile(m_metadataFile, &m_metadata);
-    }
+
 
 }
 

diff --git a/plugins/icebridge/io/IcebridgeReader.cpp b/plugins/icebridge/io/IcebridgeReader.cpp
@@ -105,6 +105,10 @@ void IcebridgeReader::ready(PointTableRef table)
 {
     m_hdf5Handler.initialize(m_filename, hdf5Columns);
     m_index = 0;
+    if (!m_metadataFile.empty())
+    {
+        m_mdReader.readMetadataFile(m_metadataFile, &m_metadata);
+    }
 }
 
 
@@ -209,11 +213,6 @@ void IcebridgeReader::initialize()
 void IcebridgeReader::done(PointTableRef table)
 {
     m_hdf5Handler.close();
-    if (!m_metadataFile.empty())
-    {
-        m_mdReader.readMetadataFile(m_metadataFile, &m_metadata);
-    }
-
 }