[QGIS Commit] r13372 - in trunk/qgis: python/core src/core
src/plugins/spatialquery
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sat Apr 24 15:08:53 EDT 2010
Author: jef
Date: 2010-04-24 15:08:49 -0400 (Sat, 24 Apr 2010)
New Revision: 13372
Modified:
trunk/qgis/python/core/qgsgeometry.sip
trunk/qgis/src/core/qgsgeometry.h
trunk/qgis/src/plugins/spatialquery/CMakeLists.txt
Log:
missed python binding to additional GEOS operators
Modified: trunk/qgis/python/core/qgsgeometry.sip
===================================================================
--- trunk/qgis/python/core/qgsgeometry.sip 2010-04-24 18:49:03 UTC (rev 13371)
+++ trunk/qgis/python/core/qgsgeometry.sip 2010-04-24 19:08:49 UTC (rev 13372)
@@ -100,6 +100,11 @@
*/
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 @@
/** 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/;
Modified: trunk/qgis/src/core/qgsgeometry.h
===================================================================
--- trunk/qgis/src/core/qgsgeometry.h 2010-04-24 18:49:03 UTC (rev 13371)
+++ trunk/qgis/src/core/qgsgeometry.h 2010-04-24 19:08:49 UTC (rev 13372)
@@ -288,7 +288,7 @@
/** 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 );
Modified: trunk/qgis/src/plugins/spatialquery/CMakeLists.txt
===================================================================
--- trunk/qgis/src/plugins/spatialquery/CMakeLists.txt 2010-04-24 18:49:03 UTC (rev 13371)
+++ trunk/qgis/src/plugins/spatialquery/CMakeLists.txt 2010-04-24 19:08:49 UTC (rev 13372)
@@ -41,6 +41,7 @@
../../core/symbology
../../gui
..
+ ${GEOS_INCLUDE_DIR}
)
TARGET_LINK_LIBRARIES(spatialqueryplugin
More information about the QGIS-commit
mailing list