consolidate metadata-setting code together

PDAL · Sep 17, 2012 · 3676818 · 3676818
1 parent d4edf3e
commit 3676818
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/include/pdal/filters/Stats.hpp b/include/pdal/filters/Stats.hpp
@@ -224,6 +224,8 @@ class PDAL_DLL Stats : public Filter
 
     Stats& operator=(const Stats&); // not implemented
     Stats(const Stats&); // not implemented
+
+    void addMetadata();
 };
 
 

diff --git a/src/filters/Stats.cpp b/src/filters/Stats.cpp
@@ -110,22 +110,19 @@ boost::property_tree::ptree Summary::toPTree() const
 Stats::Stats(Stage& prevStage, const Options& options)
     : pdal::Filter(prevStage, options)
 {
-    Metadata& metadata = getMetadataRef();
-    metadata.addMetadata<boost::uint32_t>("sample_size",
-                                       getOptions().getValueOrDefault<boost::uint32_t>("sample_size", 1000));
-    metadata.addMetadata<boost::uint32_t>("seed",
-                                       getOptions().getValueOrDefault<boost::uint32_t>("seed", 0));
-    metadata.addMetadata<boost::uint32_t>("num_bins",
-                                       getOptions().getValueOrDefault<boost::uint32_t>("num_bins", 20));
-    metadata.addMetadata<boost::uint32_t>("stats_cache_size",
-                                       getOptions().getValueOrDefault<boost::uint32_t>("stats_cache_size", 1000000));
-
+    addMetadata();
     return;
 }
 
 
 Stats::Stats(Stage& prevStage)
     : Filter(prevStage, Options::none())
+{
+    addMetadata();
+    return;
+}
+
+void Stats::addMetadata()
 {
     Metadata& metadata = getMetadataRef();
     metadata.addMetadata<boost::uint32_t>("sample_size",
@@ -135,12 +132,9 @@ Stats::Stats(Stage& prevStage)
     metadata.addMetadata<boost::uint32_t>("num_bins",
                                        getOptions().getValueOrDefault<boost::uint32_t>("num_bins", 20));
     metadata.addMetadata<boost::uint32_t>("stats_cache_size",
-                                       getOptions().getValueOrDefault<boost::uint32_t>("num_bins", 20));
-
-    return;
+                                       getOptions().getValueOrDefault<boost::uint32_t>("num_bins", 20));    
 }
 
-
 Stats::~Stats()
 {