missed python binding to additional GEOS operators

jef · jef · commit 7b76f093face · 2010-04-24T19:08:49.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13372 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/python/core/qgsgeometry.sip b/python/core/qgsgeometry.sip
@@ -100,6 +100,11 @@ class QgsGeometry
      */
     bool isGeosValid();
 
+    /** check if geometry is empty using GEOS
+      @note added in 1.5
+     */
+    bool isGeosEmpty();
+
     /**
        Set the geometry, feeding in a geometry in GEOS format.
     */
@@ -239,10 +244,34 @@ not disjoint with existing polygons of the feature*/
     /** Test for containment of a point (uses GEOS) */
     bool contains(QgsPoint* p);
     
-    /** Test for containment with a geometry (uses GEOS)
-    *  @note added in 1.5 */
+    /** Test for if geometry is contained in an other (uses GEOS)
+     *  @note added in 1.5 */
     bool contains( QgsGeometry* geometry );
 
+    /** Test for if geometry is disjoint of an other (uses GEOS)
+     *  @note added in 1.5 */
+    bool disjoint( QgsGeometry* geometry );
+
+    /** Test for if geometry equals an other (uses GEOS)
+     *  @note added in 1.5 */
+    bool equals( QgsGeometry* geometry );
+
+    /** Test for if geometry touch an other (uses GEOS)
+     *  @note added in 1.5 */
+    bool touches( QgsGeometry* geometry );
+
+    /** Test for if geometry overlaps an other (uses GEOS)
+     *  @note added in 1.5 */
+    bool overlaps( QgsGeometry* geometry );
+
+    /** Test for if geometry is within an other (uses GEOS)
+     *  @note added in 1.5 */
+    bool within( QgsGeometry* geometry );
+
+    /** Test for if geometry crosses an other (uses GEOS)
+     *  @note added in 1.5 */
+    bool crosses( QgsGeometry* geometry );
+
     /** Returns a buffer region around this geometry having the given width and with a specified number
         of segments used to approximate curves */
     QgsGeometry* buffer(double distance, int segments) /Factory/;
diff --git a/src/core/qgsgeometry.h b/src/core/qgsgeometry.h
@@ -288,7 +288,7 @@ class CORE_EXPORT QgsGeometry
     /** Test for containment of a point (uses GEOS) */
     bool contains( QgsPoint* p );
 
-    /** Test for if geometry is contain in an other (uses GEOS)
+    /** Test for if geometry is contained in an other (uses GEOS)
      *  @note added in 1.5 */
     bool contains( QgsGeometry* geometry );
 
diff --git a/src/plugins/spatialquery/CMakeLists.txt b/src/plugins/spatialquery/CMakeLists.txt
@@ -41,6 +41,7 @@ INCLUDE_DIRECTORIES(
      ../../core/symbology
      ../../gui
      ..
+     ${GEOS_INCLUDE_DIR}
 )
 
 TARGET_LINK_LIBRARIES(spatialqueryplugin

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ INCLUDE_DIRECTORIES(`
`41`	`41`	`../../core/symbology`
`42`	`42`	`../../gui`
`43`	`43`	`..`
	`44`	`+ ${GEOS_INCLUDE_DIR}`
`44`	`45`	`)`
`45`	`46`
`46`	`47`	`TARGET_LINK_LIBRARIES(spatialqueryplugin`