Test moar.

PDAL · Jun 28, 2019 · c62c61d · c62c61d
1 parent 9ca3f0a
commit c62c61d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/io/Ilvis2Reader.cpp b/io/Ilvis2Reader.cpp
@@ -190,6 +190,7 @@ void Ilvis2Reader::readPoint(PointRef& point, StringList s,
 void Ilvis2Reader::ready(PointTableRef table)
 {
 std::cerr << "+Ready!\n";
+    /**
     if (!m_metadataFile.empty())
     {
         try
@@ -201,11 +202,14 @@ std::cerr << "+Ready!\n";
             throwError(err.what());
         }
     }
+**/
 std::cerr << ".. read metadata!\n";
 
     static const int HeaderSize = 2;
 
     m_lineNum = 0;
+/*
+**/
 std::cerr << "Filename = " << m_filename << "!\n";
     m_stream.open(m_filename);
     if (!m_stream.good())
@@ -214,7 +218,6 @@ std::cerr << "Filename = " << m_filename << "!\n";
         std::cerr << "Not open!\n";
     else
         std::cerr << "Open!\n";
-    m_layout = table.layout();
     m_resample = false;
 std::cerr << ".. reading lines -- header = " << HeaderSize << "!\n";
     for (size_t i = 0; m_stream.good() && i < HeaderSize; ++i)
@@ -226,6 +229,7 @@ std::cerr << "About to getline " << i << "!\n";
 std::cerr << "Line = " << line << "!\n";
         m_lineNum++;
     }
+    m_layout = table.layout();
 std::cerr << "-Ready!\n";
 }
 

diff --git a/io/Ilvis2Reader.hpp b/io/Ilvis2Reader.hpp
@@ -84,7 +84,7 @@ class PDAL_DLL Ilvis2Reader : public Reader, public Streamable
     bool m_resample;
     PointLayoutPtr m_layout;
     std::string m_metadataFile;
-    Ilvis2MetadataReader m_mdReader;
+//    Ilvis2MetadataReader m_mdReader;
 
     virtual void addDimensions(PointLayoutPtr layout);
     virtual void addArgs(ProgramArgs& args);

diff --git a/test/unit/filters/MergeTest.cpp b/test/unit/filters/MergeTest.cpp
@@ -80,20 +80,22 @@ TEST(MergeTest, test6)
 
     PipelineManager mgr;
     mgr.setLog(log);
-    mgr.readPipeline(Support::configuredpath("filters/merge3.json"));
+//    mgr.readPipeline(Support::configuredpath("filters/merge3.json"));
 
 //    std::ostringstream oss;
 //    std::ostream& o = std::clog;
 //    auto ctx = Utils::redirect(o, oss);
 
-    mgr.execute();
+//    mgr.execute();
  //   std::string s = oss.str();
  //   EXPECT_TRUE(s.find("inconsistent spatial references") != s.npos);
  //   Utils::restore(o, ctx);
 
+    /**
     PointViewSet viewSet = mgr.views();
 
     EXPECT_EQ(1u, viewSet.size());
     PointViewPtr view = *viewSet.begin();
     EXPECT_EQ(2130u, view->size());
+    **/
 }