Fix #2937 to support writers.las assignment of VLRs

PDAL · Feb 20, 2020 · 57abd25 · 57abd25
1 parent b40acc7
commit 57abd25
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/doc/stages/writers.las.rst b/doc/stages/writers.las.rst
@@ -30,7 +30,7 @@ containing `user_id` and `data` items.
       },
       {
           "type":"writers.las",
-          "vlrs": [{
+          "vlrs": {"json":[{
               "description": "A description under 32 bytes",
               "record_id": 42,
               "user_id": "hobu",
@@ -41,7 +41,7 @@ containing `user_id` and `data` items.
               "record_id": 43,
               "user_id": "hobu",
               "data": "dGhpcyBpcyBzb21lIG1vcmUgdGV4dA=="
-              }],
+              }]},
           "filename":"outputfile.las"
       }
   ]

diff --git a/io/LasWriter.cpp b/io/LasWriter.cpp
@@ -236,7 +236,11 @@ void LasWriter::prepared(PointTableRef table)
 // Capture user-specified VLRs
 void LasWriter::addUserVlrs()
 {
-    for (const auto& v : *m_userVLRs)
+    NL::json* p_vlrs = m_userVLRs.get();
+    if (!(*p_vlrs).contains("json"))
+        throwError("VLR JSON object containing list of VLR entries must be at 'json' node");
+    NL::json vlrs = (*p_vlrs)["json"];
+    for (const auto& v : vlrs)
     {
         uint16_t recordId(1);
         std::string userId("");

diff --git a/test/unit/io/LasWriterTest.cpp b/test/unit/io/LasWriterTest.cpp
@@ -1151,7 +1151,7 @@ TEST(LasWriterTest, pdal_add_vlr)
     Options readerOpts;
     readerOpts.add("filename", infile);
 
-    std::string vlr( " [ { \"description\": \"A description under 32 bytes\", \"record_id\": 42, \"user_id\": \"hobu\", \"data\": \"dGhpcyBpcyBzb21lIHRleHQ=\" },  { \"description\": \"A description under 32 bytes\", \"record_id\": 43, \"user_id\": \"hobu\", \"data\": \"dGhpcyBpcyBzb21lIG1vcmUgdGV4dA==\" } ]");
+    std::string vlr( "{\"json\": [ { \"description\": \"A description under 32 bytes\", \"record_id\": 42, \"user_id\": \"hobu\", \"data\": \"dGhpcyBpcyBzb21lIHRleHQ=\" },  { \"description\": \"A description under 32 bytes\", \"record_id\": 43, \"user_id\": \"hobu\", \"data\": \"dGhpcyBpcyBzb21lIG1vcmUgdGV4dA==\" } ]}");
 
     Options writerOpts;
     writerOpts.add("vlrs", vlr);