Don't run triangulation if we don't have at least three points. (#2555)

Use filter() instead of run() for cleaner interface. Close #2513
PDAL · Jun 21, 2019 · 8559c75 · 8559c75
1 parent d1b6e7a
commit 8559c75
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 35 deletions.
diff --git a/filters/DelaunayFilter.cpp b/filters/DelaunayFilter.cpp
@@ -53,39 +53,44 @@ std::string DelaunayFilter::getName() const
     return s_info.name;
 }
 
-PointViewSet DelaunayFilter::run(PointViewPtr pointView)
+
+DelaunayFilter::DelaunayFilter()
+{}
+
+
+DelaunayFilter::~DelaunayFilter()
+{}
+
+
+void DelaunayFilter::filter(PointView& pointView)
 {
     // Returns NULL if the mesh already exists
-    TriangularMesh *mesh = pointView->createMesh("delaunay2d");
-
-    if (mesh != NULL)
+    TriangularMesh *mesh = pointView.createMesh("delaunay2d");
+
+    if (!mesh)
+        throwError("Unable to create mesh 'delaunay2d'.");
+    if (pointView.size() < 3)
     {
-        std::vector<double> delaunayPoints;
-        for (PointId i = 0; i < pointView->size(); i++)
-        {
-            PointRef point(*pointView, i);
-            double x(point.getFieldAs<double>(Dimension::Id::X));
-            double y(point.getFieldAs<double>(Dimension::Id::Y));
-
-            delaunayPoints.push_back(x);
-            delaunayPoints.push_back(y);
-        }
-
-        // Actually perform the triangulation
-        delaunator::Delaunator triangulation(delaunayPoints);
-
-        for (std::size_t i = 0; i < triangulation.triangles.size(); i += 3)
-        {
-            mesh->add(triangulation.triangles[i+2],
-                triangulation.triangles[i+1],
-                triangulation.triangles[i]);
-        }
+        log()->get(LogLevel::Warning) << getName() << ": triangulation "
+            "requested for fewer than three points.\n";
+        return;
     }
-
-    PointViewSet viewSet;
-    viewSet.insert(pointView);
-
-    return viewSet;
+
+    std::vector<double> delaunayPoints;
+    for (PointId i = 0; i < pointView.size(); i++)
+    {
+        delaunayPoints.push_back(
+            pointView.getFieldAs<double>(Dimension::Id::X, i));
+        delaunayPoints.push_back(
+            pointView.getFieldAs<double>(Dimension::Id::Y, i));
+    }
+
+    // Actually perform the triangulation
+    delaunator::Delaunator triangulation(delaunayPoints);
+
+    for (std::size_t i = 0; i < triangulation.triangles.size(); i += 3)
+        mesh->add(triangulation.triangles[i+2], triangulation.triangles[i+1],
+            triangulation.triangles[i]);
 }
 
 } // namespace pdal
diff --git a/filters/DelaunayFilter.hpp b/filters/DelaunayFilter.hpp
@@ -42,15 +42,15 @@ namespace pdal
 class PDAL_DLL DelaunayFilter : public Filter
 {
 public:
-    DelaunayFilter() : Filter()
-    {}
+    DelaunayFilter& operator=(const DelaunayFilter&) = delete;
+    DelaunayFilter(const DelaunayFilter&) = delete;
+    DelaunayFilter();
+    virtual ~DelaunayFilter();
+
     std::string getName() const;
 
 private:
-    virtual PointViewSet run(PointViewPtr view);
-
-    DelaunayFilter& operator=(const DelaunayFilter&); // not implemented
-    DelaunayFilter(const DelaunayFilter&); // not implemented
+    virtual void filter(PointView& view);
 };
 
 } // namespace pdal