Skip to content

Fix within-distance check between a point and a linestring #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
patrickbr merged 2 commits into from
Aug 14, 2026
Merged

Fix within-distance check between a point and a linestring #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6d1791
Fix `within-distance` check between a point and a linestring
hannahbast Aug 14, 2026
c67d932
add some regression tests
patrickbr Aug 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions geo/Geo.tpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1362,11 +1362,12 @@ double withinDist(const Point<T>& p, const XSortedLine<T>& line, double maxDist,
double euclideanDistUpperBound =
std::min(maxEuclideanDist, std::min(dist(p, line.rawLine().back().other),
dist(p, line.rawLine().front().p)));
double minDist = std::min(
std::min(maxDist, distFunc(p, line.rawLine().back().other, maxDist)),
distFunc(p, line.rawLine().front().p, maxDist));
double minDist = std::min(distFunc(p, line.rawLine().back().other,
std::numeric_limits<double>::max()),
distFunc(p, line.rawLine().front().p,
std::numeric_limits<double>::max()));

auto padding = paddingFunc(euclideanDistUpperBound, minDist,
auto padding = paddingFunc(euclideanDistUpperBound, std::min(maxDist, minDist),
getBoundingBox(p), line.boundingBox());

// skip irrelevant parts
Expand Down Expand Up @@ -1400,8 +1401,8 @@ double withinDist(const Point<T>& p, const XSortedLine<T>& line, double maxDist,

if (euclideanDist < euclideanDistUpperBound) {
euclideanDistUpperBound = euclideanDist;
padding = paddingFunc(euclideanDistUpperBound, minDist, getBoundingBox(p),
line.boundingBox());
padding = paddingFunc(euclideanDistUpperBound, std::min(maxDist, minDist),
getBoundingBox(p), line.boundingBox());
}
}

Expand Down
17 changes: 17 additions & 0 deletions tests/GeoTestDist.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,17 @@ static void testDistWithinRealisticMaxDist() {
approx(5.5));
TEST(util::geo::withinDist(XSortedLine<double>(line), point, 10.0), ==,
approx(5.5));
TEST(util::geo::withinDist(XSortedLine<double>(line), point, 5.4), >,
5.4);
TEST(util::geo::withinDist(XSortedLine<double>(line), point, 5.0), >,
5.0);
TEST(util::geo::withinDist(XSortedLine<double>(line), point, 1.0), >,
1.0);

TEST(util::geo::withinDist(XSortedPolygon<double>(poly), point2, 10.0), ==,
approx(sqrt(2)));
TEST(util::geo::withinDist(XSortedPolygon<double>(poly), point2, 1.0), >,
1);
TEST(util::geo::withinDist(point2, XSortedPolygon<double>(poly), 10.0), ==,
approx(sqrt(2)));

Expand All @@ -172,13 +180,22 @@ static void testDistWithinRealisticMaxDist() {
TEST(util::geo::withinDist(XSortedPolygon<double>(polyWithInner),
point, 10.0),
==, approx(0.5));
TEST(util::geo::withinDist(XSortedPolygon<double>(polyWithInner),
XSortedLine<double>(line2), .2),
>, 0.2);
TEST(util::geo::withinDist(XSortedPolygon<double>(polyWithInner),
point, .4),
>, 0.4);

TEST(util::geo::withinDist(XSortedPolygon<double>(poly2),
XSortedPolygon<double>(polyWithInner), 10.0),
==, approx(0.25));
TEST(util::geo::withinDist(XSortedPolygon<double>(polyWithInner),
XSortedPolygon<double>(poly2), 10.0),
==, approx(0.25));
TEST(util::geo::withinDist(XSortedPolygon<double>(polyWithInner),
XSortedPolygon<double>(poly2), .2),
>, 0.2);
}

// _____________________________________________________________________________
Expand Down
Loading