qgsgeometry: Add contains method from x,y coordinates

Author: ptitjano

python/PyQt6/core/auto_generated/geometry/qgsgeometry.sip.in

@@ -1322,6 +1322,13 @@ geometries.
     bool contains( const QgsPointXY *p ) const;
 %Docstring
 Returns ``True`` if the geometry contains the point ``p``.
+%End
+
+    bool contains( double x, double y ) const;
+%Docstring
+Returns ``True`` if the geometry contains the point at (``x``, ``y``).
+
+.. versionadded:: 3.38
 %End
 
     bool contains( const QgsGeometry &geometry ) const;

python/core/auto_generated/geometry/qgsgeometry.sip.in

@@ -1322,6 +1322,13 @@ geometries.
     bool contains( const QgsPointXY *p ) const;
 %Docstring
 Returns ``True`` if the geometry contains the point ``p``.
+%End
+
+    bool contains( double x, double y ) const;
+%Docstring
+Returns ``True`` if the geometry contains the point at (``x``, ``y``).
+
+.. versionadded:: 3.38
 %End
 
     bool contains( const QgsGeometry &geometry ) const;

src/core/geometry/qgsgeometry.cpp

@@ -1492,6 +1492,19 @@ bool QgsGeometry::contains( const QgsPointXY *p ) const
   return geos.contains( &pt, &mLastError );
 }
 
+bool QgsGeometry::contains( double x, double y ) const
+{
+  if ( !d->geometry )
+  {
+    return false;
+  }
+
+  QgsPoint pt( x, y );
+  QgsGeos geos( d->geometry.get() );
+  mLastError.clear();
+  return geos.contains( &pt, &mLastError );
+}
+
 bool QgsGeometry::contains( const QgsGeometry &geometry ) const
 {
   if ( !d->geometry || geometry.isNull() )

src/core/geometry/qgsgeometry.h

@@ -1417,6 +1417,13 @@ class CORE_EXPORT QgsGeometry
      */
     bool contains( const QgsPointXY *p ) const;
 
+    /**
+     * Returns TRUE if the geometry contains the point at (\a x, \a y).
+     *
+     * \since QGIS 3.38
+     */
+    bool contains( double x, double y ) const;
+
     /**
      * Returns TRUE if the geometry completely contains another \a geometry.
      *

tests/src/core/geometry/testqgsgeometry.cpp

@@ -2085,10 +2085,12 @@ void TestQgsGeometry::contains()
   QgsPointXY pointInside( 1, 2 );
   QVERIFY( geomTest.contains( &pointInside ) );
   QVERIFY( geomTest.contains( QgsGeometry::fromWkt( QStringLiteral( "Point(1 2)" ) ) ) );
+  QVERIFY( geomTest.contains( pointInside.x(), pointInside.y() ) );
 
   QgsPointXY pointOutside( 3, 1 );
   QVERIFY( !geomTest.contains( &pointOutside ) );
   QVERIFY( !geomTest.contains( QgsGeometry::fromWkt( QStringLiteral( "Point(3 1)" ) ) ) );
+  QVERIFY( !geomTest.contains( pointOutside.x(), pointOutside.y() ) );
 }
 
 void TestQgsGeometry::reshapeGeometryLineMerge()

tests/src/python/test_qgsgeometry.py

@@ -1116,10 +1116,12 @@ def testContains(self):
         pointInside = QgsPointXY(1, 1)
         self.assertTrue(myPoly.contains(pointInside))
         self.assertTrue(myPoly.contains(QgsGeometry.fromPointXY(pointInside)))
+        self.assertTrue(myPoly.contains(pointInside.x(), pointInside.y()))
 
         pointOutside = QgsPointXY(3, 3)
         self.assertFalse(myPoly.contains(pointOutside))
         self.assertFalse(myPoly.contains(QgsGeometry.fromPointXY(pointOutside)))
+        self.assertFalse(myPoly.contains(pointOutside.x(), pointOutside.y()))
 
     def testTouches(self):
         myLine = QgsGeometry.fromPolylineXY([