Skip to content

Commit

Permalink
Test changes for SRS setting in prepare().
Browse files Browse the repository at this point in the history
  • Loading branch information
abellgithub committed Oct 29, 2015
1 parent 3b03118 commit d74c460
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
4 changes: 2 additions & 2 deletions io/las/LasReader.cpp
Expand Up @@ -128,7 +128,7 @@ QuickInfo LasReader::inspect()
}


void LasReader::initialize()
void LasReader::initialize(MetadataNode& m)
{
if (m_initialized)
return;
Expand Down Expand Up @@ -168,6 +168,7 @@ void LasReader::initialize()
readExtraBytesVlr();
}
fixupVlrs();
setSrsFromVlrs(m);
m_initialized = true;
}

Expand All @@ -176,7 +177,6 @@ void LasReader::ready(PointTableRef table, MetadataNode& m)
{
m_index = 0;

setSrsFromVlrs(m);
MetadataNode forward = table.privateMetadata("lasforward");
extractHeaderMetadata(forward, m);
extractVlrMetadata(forward, m);
Expand Down
4 changes: 3 additions & 1 deletion io/las/LasReader.hpp
Expand Up @@ -111,7 +111,9 @@ class PDAL_DLL LasReader : public pdal::Reader
std::string m_compression;

virtual void processOptions(const Options& options);
virtual void initialize();
virtual void initialize()
{ initialize(m_metadata); }
virtual void initialize(MetadataNode& m);
virtual void addDimensions(PointLayoutPtr layout);
void fixupVlrs();
VariableLengthRecord *findVlr(const std::string& userId, uint16_t recordId);
Expand Down
5 changes: 4 additions & 1 deletion plugins/nitf/io/NitfReader.cpp
Expand Up @@ -107,7 +107,10 @@ void NitfReader::initialize()
m_metadata.add("DESDATA_LENGTH", m_length);

nitf.close();
LasReader::initialize();

// Initialize the LAS stuff with its own metadata node.
MetadataNode lasNode = m_metadata.add(LasReader::getName());
LasReader::initialize(lasNode);
}


Expand Down

0 comments on commit d74c460

Please sign in to comment.