Remove GEOSPreparedContainsProperlyXY

References #677
libgeos · Sep 24, 2022 · df8b93c · df8b93c
1 parent 7b5db8a
commit df8b93c
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 43 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -4,8 +4,7 @@ xxxx-xx-xx
 - New things:
   - Polygonal coverage operations: CoverageValidator, CoveragePolygonValidator,
     CoverageGapFinder, CoverageUnion (JTS-900, Martin Davis & Paul Ramsey)
-  - CAPI: GEOSPreparedContainsXY, GEOSPreparedContainsProperlyXY,
-    GEOSPreparedIntersectsXY (GH-677, Dan Baston)
+  - CAPI: GEOSPreparedContainsXY, GEOSPreparedIntersectsXY (GH-677, Dan Baston)
   - Add CoordinateSequenceIterator (GH-685, Dan Baston)
 
 - Fixes/Improvements:

diff --git a/capi/geos_c.cpp b/capi/geos_c.cpp
@@ -1461,12 +1461,6 @@ extern "C" {
         return GEOSPreparedContainsProperly_r(handle, pg1, g2);
     }
 
-    char
-    GEOSPreparedContainsProperlyXY(const geos::geom::prep::PreparedGeometry* pg1, double x, double y)
-    {
-        return GEOSPreparedContainsProperlyXY_r(handle, pg1, x, y);
-    }
-
     char
     GEOSPreparedCoveredBy(const geos::geom::prep::PreparedGeometry* pg1, const Geometry* g2)
     {

diff --git a/capi/geos_c.h.in b/capi/geos_c.h.in
@@ -1124,13 +1124,6 @@ extern char GEOS_DLL GEOSPreparedContainsProperly_r(
     const GEOSPreparedGeometry* pg1,
     const GEOSGeometry* g2);
 
-/** \see GEOSPreparedContainsProperlyXY */
-extern char GEOS_DLL GEOSPreparedContainsProperlyXY_r(
-        GEOSContextHandle_t handle,
-        const GEOSPreparedGeometry* pg1,
-        double x,
-        double y);
-
 /** \see GEOSPreparedCoveredBy */
 extern char GEOS_DLL GEOSPreparedCoveredBy_r(
     GEOSContextHandle_t handle,
@@ -4331,20 +4324,6 @@ extern char GEOS_DLL GEOSPreparedContainsProperly(
     const GEOSPreparedGeometry* pg1,
     const GEOSGeometry* g2);
 
-/**
-* Use a \ref GEOSPreparedGeometry do a high performance
-* calculation of whether the provided point is contained properly.
-* \param pg1 The prepared geometry
-* \param x x coordinate of point to test
-* \param y y coordinate of point to test
-* \returns 1 on true, 0 on false, 2 on exception
-* \see GEOSContainsProperly
-*/
-extern char GEOS_DLL GEOSPreparedContainsProperlyXY(
-        const GEOSPreparedGeometry* pg1,
-        double x,
-        double y);
-
 /**
 * Using a \ref GEOSPreparedGeometry do a high performance
 * calculation of whether the provided geometry is covered by.

diff --git a/capi/geos_ts_c.cpp b/capi/geos_ts_c.cpp
@@ -3413,15 +3413,6 @@ extern "C" {
         });
     }
 
-    char
-    GEOSPreparedContainsProperlyXY_r(GEOSContextHandle_t extHandle,
-                                   const geos::geom::prep::PreparedGeometry* pg, double x, double y)
-    {
-        extHandle->point2d->setXY(x, y);
-
-        return GEOSPreparedContainsProperly_r(extHandle, pg, extHandle->point2d.get());
-    }
-
     char
     GEOSPreparedCoveredBy_r(GEOSContextHandle_t extHandle,
                             const geos::geom::prep::PreparedGeometry* pg, const Geometry* g)

diff --git a/tests/unit/capi/GEOSPreparedGeometryTest.cpp b/tests/unit/capi/GEOSPreparedGeometryTest.cpp
@@ -435,11 +435,6 @@ void object::test<15>
     ensure_equals(GEOSPreparedContainsXY(prepGeom1_, 1.5, 0.5), 0);
     ensure_equals(GEOSPreparedContainsXY(prepGeom1_, 0.75, 0.5), 1);
 
-    ensure_equals(GEOSPreparedContainsProperlyXY(prepGeom1_, 0.5, 0.5), 1);
-    ensure_equals(GEOSPreparedContainsProperlyXY(prepGeom1_, 0, 0), 0);
-    ensure_equals(GEOSPreparedContainsProperlyXY(prepGeom1_, 1.5, 0.5), 0);
-    ensure_equals(GEOSPreparedContainsProperlyXY(prepGeom1_, 0.75, 0.5), 1);
-
     ensure_equals(GEOSPreparedIntersectsXY(prepGeom1_, 0.5, 0.5), 1);
     ensure_equals(GEOSPreparedIntersectsXY(prepGeom1_, 1.5, 0.5), 0);
     ensure_equals(GEOSPreparedIntersectsXY(prepGeom1_, 0.75, 0.5), 1);