[postgis-tickets] r17816 - Remove tolerance in point-in-ring stabline tests

[Paul Ramsey]

Author: pramsey
Date: 2019-09-17 13:00:09 -0700 (Tue, 17 Sep 2019)
New Revision: 17816

Modified:
   branches/2.5/NEWS
   branches/2.5/postgis/lwgeom_functions_analytic.c
Log:
Remove tolerance in point-in-ring stabline tests
References #4506


Modified: branches/2.5/NEWS
===================================================================
--- branches/2.5/NEWS	2019-09-17 19:58:52 UTC (rev 17815)
+++ branches/2.5/NEWS	2019-09-17 20:00:09 UTC (rev 17816)
@@ -11,7 +11,9 @@
   - #4493, Fix ST_RemoveRepeatedPoints output having an outdated bbox (Raúl Marín)
   - #4495, Fix ST_SnapToGrid output having an outdated bbox (Raúl Marín)
   - #4496, Make ST_Simplify(TRIANGLE) collapse if requested (Raúl Marín)
+  - #4506, Remove tolerance in point-in-ring tests (Paul Ramsey)
 
+
 PostGIS 2.5.3
 2019/08/11
 

Modified: branches/2.5/postgis/lwgeom_functions_analytic.c
===================================================================
--- branches/2.5/postgis/lwgeom_functions_analytic.c	2019-09-17 19:58:52 UTC (rev 17815)
+++ branches/2.5/postgis/lwgeom_functions_analytic.c	2019-09-17 20:00:09 UTC (rev 17816)
@@ -743,7 +743,7 @@
 		 * then the line is to the right of the point and
 		 * circling counter-clockwise, so increment.
 		 */
-		if (FP_CONTAINS_BOTTOM(seg1->y, point->y, seg2->y) && side>0)
+		if ((seg1->y <= point->y) && (point->y < seg2->y) && (side > 0))
 		{
 			POSTGIS_DEBUG(3, "incrementing winding number.");
 
@@ -754,7 +754,7 @@
 		 * then the line is to the right of the point and circling
 		 * clockwise, so decrement.
 		 */
-		else if (FP_CONTAINS_BOTTOM(seg2->y, point->y, seg1->y) && side<0)
+		else if ((seg2->y <= point->y) && (point->y < seg1->y) && (side < 0))
 		{
 			POSTGIS_DEBUG(3, "decrementing winding number.");
 
@@ -798,7 +798,7 @@
 		POSTGIS_DEBUGF(3, "counterclockwise wrap %d, clockwise wrap %d", FP_CONTAINS_BOTTOM(seg1->y, point->y, seg2->y), FP_CONTAINS_BOTTOM(seg2->y, point->y, seg1->y));
 
 		/* zero length segments are ignored. */
-		if (((seg2->x - seg1->x)*(seg2->x - seg1->x) + (seg2->y - seg1->y)*(seg2->y - seg1->y)) < 1e-12*1e-12)
+		if ((seg2->x == seg1->x) && (seg2->y == seg1->y))
 		{
 			POSTGIS_DEBUG(3, "segment is zero length... ignoring.");
 
@@ -822,7 +822,7 @@
 		 * then the line is to the right of the point and
 		 * circling counter-clockwise, so increment.
 		 */
-		if (FP_CONTAINS_BOTTOM(seg1->y, point->y, seg2->y) && side>0)
+		if ((seg1->y <= point->y) && (point->y < seg2->y) && (side > 0))
 		{
 			POSTGIS_DEBUG(3, "incrementing winding number.");
 
@@ -833,7 +833,7 @@
 		 * then the line is to the right of the point and circling
 		 * clockwise, so decrement.
 		 */
-		else if (FP_CONTAINS_BOTTOM(seg2->y, point->y, seg1->y) && side<0)
+		else if ((seg2->y <= point->y) && (point->y < seg1->y) && (side < 0))
 		{
 			POSTGIS_DEBUG(3, "decrementing winding number.");