get create option for filters.selector working properly, with test

PDAL · Sep 10, 2012 · c0f4a16 · c0f4a16
1 parent 3f009da
commit c0f4a16
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/src/filters/Selector.cpp b/src/filters/Selector.cpp
@@ -147,7 +147,7 @@ void Selector::checkImpedance()
                 size = ops.getValueOrDefault<boost::uint32_t>("size", 1);
 
                 description = ops.getValueOrDefault<std::string>("description", "");
-                interpretation = ops.getValueOrThrow<std::string>("interpretation");
+                interpretation = ops.getValueOrDefault<std::string>("interpretation", "int32_t");
 
                 std::string endy = ops.getValueOrDefault<std::string>("endianness", "little");
                 if (boost::iequals(endy, "big"))

diff --git a/test/data/pipeline/pipeline_selector.xml b/test/data/pipeline/pipeline_selector.xml
@@ -53,7 +53,7 @@
                         <Option name="offset">
                             10.6
                         </Option>
-                    </Options
+                    </Options>
                 </Option>
             </Options>
         </Option>        

diff --git a/test/unit/filters/SelectorFilterTest.cpp b/test/unit/filters/SelectorFilterTest.cpp
@@ -64,18 +64,28 @@ BOOST_AUTO_TEST_CASE(test1)
         BOOST_CHECK_EQUAL(numRead, 1000u);
     }
 
-    // pdal::Schema const& new_schema = data.getSchema();
-
-    // FIXME: not done yet
-    // BOOST_CHECK_THROW(new_schema.getDimension("Red"), pdal::dimension_not_found);
-    // BOOST_CHECK_THROW(new_schema.getDimension("Green"), pdal::dimension_not_found);
-    // BOOST_CHECK_THROW(new_schema.getDimension("Blue"), pdal::dimension_not_found);
 
+    pdal::Schema const& new_schema = data.getSchema();
+
+    // std::cout << new_schema << std::endl;
+
+    BOOST_CHECK_EQUAL(new_schema.getDimension("Red").isIgnored(), true);
+    BOOST_CHECK_EQUAL(new_schema.getDimension("Green").isIgnored(), true);
+    BOOST_CHECK_EQUAL(new_schema.getDimension("Blue").isIgnored(), true);
 
+    // ignore by default is true because not set on the pipeline
+    BOOST_CHECK_EQUAL(new_schema.getDimension("PointSourceId").isIgnored(), true); 
+
+    // We explicitly kept X
+    BOOST_CHECK_EQUAL(new_schema.getDimension("X").isIgnored(), false);
+
+    // We created Greenish
+    BOOST_CHECK_EQUAL(new_schema.getDimension("Greenish").isIgnored(), false);
 
     return;
 }
 
 
 
+
 BOOST_AUTO_TEST_SUITE_END()