Fix withinDistance with negative distance value

pramsey · web-flow · commit bdef32796de1 · 2025-07-08T11:36:32.000-07:00
Closes #1277 Negative values are now treated as zero.
diff --git a/.gitignore b/.gitignore
@@ -37,3 +37,4 @@ capi/geos_c.h
 .project
 .ccache/
 web/public/
+*.code-workspace
diff --git a/src/operation/distance/DistanceOp.cpp b/src/operation/distance/DistanceOp.cpp
@@ -90,7 +90,7 @@ DistanceOp::DistanceOp(const Geometry& g0, const Geometry& g1):
 DistanceOp::DistanceOp(const Geometry& g0, const Geometry& g1, double tdist)
     :
     geom{{&g0, &g1}},
-    terminateDistance(tdist),
+    terminateDistance(tdist < 0.0 ? 0.0 : tdist),
     minDistance(DoubleInfinity)
 {}
 
diff --git a/src/operation/distance/IndexedFacetDistance.cpp b/src/operation/distance/IndexedFacetDistance.cpp
@@ -59,6 +59,7 @@ IndexedFacetDistance::distance(const Geometry* g) const
 bool
 IndexedFacetDistance::isWithinDistance(const Geometry* g, double maxDistance) const
 {
+    if (maxDistance < 0.0) maxDistance = 0.0;
     // short-circuit check
     double envDist = baseGeometry.getEnvelopeInternal()->distance(*g->getEnvelopeInternal());
     if (envDist > maxDistance) {

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ DistanceOp::DistanceOp(const Geometry& g0, const Geometry& g1):`
`90`	`90`	`DistanceOp::DistanceOp(const Geometry& g0, const Geometry& g1, double tdist)`
`91`	`91`	`:`
`92`	`92`	`geom{{&g0, &g1}},`
`93`		`- terminateDistance(tdist),`
	`93`	`+ terminateDistance(tdist < 0.0 ? 0.0 : tdist),`
`94`	`94`	`minDistance(DoubleInfinity)`
`95`	`95`	`{}`
`96`	`96`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ IndexedFacetDistance::distance(const Geometry* g) const`
`59`	`59`	`bool`
`60`	`60`	`IndexedFacetDistance::isWithinDistance(const Geometry* g, double maxDistance) const`
`61`	`61`	`{`
	`62`	`+ if (maxDistance < 0.0) maxDistance = 0.0;`
`62`	`63`	`// short-circuit check`
`63`	`64`	`double envDist = baseGeometry.getEnvelopeInternal()->distance(*g->getEnvelopeInternal());`
`64`	`65`	`if (envDist > maxDistance) {`