Put encoded LAS VLR in its own node.

Close #1648
PDAL · Aug 28, 2017 · 31683bc · 31683bc
1 parent 4f25afc
commit 31683bc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/io/LasReader.cpp b/io/LasReader.cpp
@@ -450,9 +450,11 @@ void LasReader::extractVlrMetadata(MetadataNode& forward, MetadataNode& m)
 
         std::ostringstream name;
         name << "vlr_" << i++;
-        MetadataNode vlrNode = m.addEncoded(name.str(),
-            (const uint8_t *)vlr.data(), vlr.dataLen(), vlr.description());
+        MetadataNode vlrNode(name.str());
+        m.add(vlrNode);
 
+        vlrNode.addEncoded("data",
+            (const uint8_t *)vlr.data(), vlr.dataLen(), vlr.description());
         vlrNode.add("user_id", vlr.userId(),
             "User ID of the record or pre-defined value from the "
             "specification.");

diff --git a/test/unit/io/LasReaderTest.cpp b/test/unit/io/LasReaderTest.cpp
@@ -243,7 +243,9 @@ TEST(LasReaderTest, test_vlr)
         std::string name("vlr_");
         name += std::to_string(i);
         MetadataNode m = root.findChild(name);
-        EXPECT_TRUE(!m.value().empty()) << "No node " << i;
+        EXPECT_TRUE(!m.empty()) << "No node " << i;
+        m = m.findChild("data");
+        EXPECT_TRUE(!m.empty()) << "No value for node " << i;
     }
 }