Update SimpleHexGrid origin to work properly when no points are actua…

…lly located.
PDAL · May 26, 2021 · 71fe5d3 · 71fe5d3
1 parent bc84145
commit 71fe5d3
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 12 deletions.
diff --git a/filters/private/hexer/HexGrid.cpp b/filters/private/hexer/HexGrid.cpp
@@ -179,7 +179,7 @@ Hexagon *HexGrid::findHexagon(Point p)
 Hexagon *HexGrid::getHexagon(HexKey key)
 {
     // Stick a hexagon into the map if necessary.
-    HexMap::value_type hexpair(key, Hexagon(key.x(), key.y()));
+    HexMap::value_type hexpair(key, Hexagon(key));
     std::pair<HexMap::iterator,bool> retval;
     retval = m_hexes.insert(hexpair);
     HexMap::iterator it = retval.first;

diff --git a/filters/private/hexer/Hexagon.hpp b/filters/private/hexer/Hexagon.hpp
@@ -50,6 +50,9 @@ class Hexagon
         m_dense_neighbors(0)
         {}
 
+    Hexagon(HexKey key) : Hexagon(key.x(), key.y())
+    {}
+
     void increment()
        { m_count++; }
 

diff --git a/filters/private/hexer/Path.hpp b/filters/private/hexer/Path.hpp
@@ -36,8 +36,6 @@
 #include <vector>
 #include <ostream>
 
-#include <pdal/private/Mathpair.hpp>
-
 #include "Segment.hpp"
 
 namespace pdal

diff --git a/filters/private/hexer/Segment.cpp b/filters/private/hexer/Segment.cpp
@@ -133,9 +133,7 @@ Point Segment::pos(HexGrid *grid, const Point& offset) const
     pos.m_x = m_hex->x() * grid->width();
     pos.m_y = m_hex->y() * grid->height();
     if (m_hex->xodd())
-    {
         pos.m_y += (grid->height() / 2);
-    }
     return pos + offset + grid->origin();
 }
 

diff --git a/pdal/private/SimpleHexGrid.cpp b/pdal/private/SimpleHexGrid.cpp
@@ -42,14 +42,10 @@ using namespace std;
 namespace pdal
 {
 
-SimpleHexGrid::SimpleHexGrid() : m_height(-1.0), m_width(-1.0),
-    m_origin(std::numeric_limits<double>::max(),
-        std::numeric_limits<double>::max())
+SimpleHexGrid::SimpleHexGrid() : m_height(-1.0), m_width(-1.0), m_origin(0, 0), m_first(true)
 {}
 
-SimpleHexGrid::SimpleHexGrid(double height) : 
-    m_origin(std::numeric_limits<double>::max(),
-        std::numeric_limits<double>::max())
+SimpleHexGrid::SimpleHexGrid(double height) : m_origin(0, 0), m_first(true)
 {
     initialize(height);
 }
@@ -108,8 +104,9 @@ HexKey SimpleHexGrid::findHexagon(Point p)
 {
     int x, y;
 
-    if (m_origin.m_x == std::numeric_limits<double>::max())
+    if (m_first)
     {
+        m_first = false;
         m_origin = p;
         return HexKey(0, 0);
     }

diff --git a/pdal/private/SimpleHexGrid.hpp b/pdal/private/SimpleHexGrid.hpp
@@ -131,6 +131,8 @@ class SimpleHexGrid
     double m_width;
     /// Origin of the hex grid in point coordinates.
     Point m_origin;
+    /// First query done.
+    bool m_first;
     /// Offsets of vertices of hexagon, going anti-clockwise from upper-left
     Point m_offsets[6];
     /// Offset of the center of the hexagons.