rename userData option to user_data for consistency

PDAL · Dec 30, 2016 · 6bb6a5b · 6bb6a5b
1 parent 94d68ca
commit 6bb6a5b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/doc/pipeline.rst b/doc/pipeline.rst
@@ -185,7 +185,7 @@ For more on PDAL stages and their options, check the PDAL documentation on
   stage-specific option names and their respective values. Values provided as
   JSON objects or arrays will be stringified and parsed within the stage.
 
-* Applications can place a ``userData`` node on any stage object and it will be
+* Applications can place a ``user_data`` node on any stage object and it will be
   carried through to any serialized pipeline output.
 
 Filename Globbing

diff --git a/pdal/Options.cpp b/pdal/Options.cpp
@@ -50,8 +50,8 @@ std::string Option::toArg() const
 
 void Option::toMetadata(MetadataNode& parent) const
 {
-    // 'userData' nodes on Stages are JSON
-    if (!Utils::iequals(getName(), "userData"))
+    // 'user_data' nodes on Stages are JSON
+    if (!Utils::iequals(getName(), "user_data"))
         parent.add(getName(), getValue());
     else
         parent.addWithType(getName(), getValue(), "json", "User JSON");

diff --git a/pdal/Options.hpp b/pdal/Options.hpp
@@ -154,7 +154,7 @@ class PDAL_DLL Options
             }
 
             // 'userData' keys on stages and such are JSON
-            if (!Utils::iequals(k, "userData"))
+            if (!Utils::iequals(k, "user_data"))
                 parent.add(k, vs);
             else
                 parent.addWithType(k, vs, "json", "User JSON");

diff --git a/pdal/Stage.cpp b/pdal/Stage.cpp
@@ -360,7 +360,7 @@ void Stage::l_done(PointTableRef table)
 
 void Stage::l_addArgs(ProgramArgs& args)
 {
-    args.add("userData", "User JSON", m_userDataJSON);
+    args.add("user_data", "User JSON", m_userDataJSON);
     args.add("log", "Debug output filename", m_logname);
     readerAddArgs(args);
 }