Remove QgsGeometry::isGeosEmpty

Use the faster native QgsGeometry::isEmpty instead
qgis · Jan 30, 2017 · afcb75a · afcb75a
1 parent 79bf17a
commit afcb75a
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 24 deletions.
diff --git a/doc/api_break.dox b/doc/api_break.dox
@@ -1057,6 +1057,7 @@ empty geometry collection)
 - static bool compare( const QgsMultiPolygon& p1, const QgsMultiPolygon& p2, double epsilon ) has been renamed to compareMultiPolygons
 - smoothLine and smoothPolygon are no longer public API (use smooth() instead)
 - avoidIntersections() got an extra argument: list of layers to include in the operation (previously read from active QgsProject)
+- isGeosEmpty() was removed. Use isEmpty() instead.
 
 
 QgsGeometryAnalyzer        {#qgis_api_break_3_0_QgsGeometryAnalyzer}

diff --git a/python/core/geometry/qgsgeometry.sip b/python/core/geometry/qgsgeometry.sip
@@ -130,11 +130,6 @@ class QgsGeometry
      */
     bool isGeosValid() const;
 
-    /** Check if the geometry is empty using GEOS
-      @note added in 1.5
-     */
-    bool isGeosEmpty() const;
-
     /** Returns the area of the geometry using GEOS
       @note added in 1.5
      */

diff --git a/src/core/geometry/qgsgeometry.cpp b/src/core/geometry/qgsgeometry.cpp
@@ -1940,17 +1940,6 @@ bool QgsGeometry::isGeosEqual( const QgsGeometry& g ) const
   return geos.isEqual( *( g.d->geometry ) );
 }
 
-bool QgsGeometry::isGeosEmpty() const
-{
-  if ( !d->geometry )
-  {
-    return false;
-  }
-
-  QgsGeos geos( d->geometry );
-  return geos.isEmpty();
-}
-
 QgsGeometry QgsGeometry::unaryUnion( const QList<QgsGeometry>& geometryList )
 {
   QgsGeos geos( nullptr );

diff --git a/src/core/geometry/qgsgeometry.h b/src/core/geometry/qgsgeometry.h
@@ -177,9 +177,9 @@ class CORE_EXPORT QgsGeometry
 
     /**
      * Returns true if the geometry is empty (eg a linestring with no vertices,
-     * or a collection with no geometries).
+     * or a collection with no geometries). A null geometry will always
+     * return true for isEmpty().
      * @see isNull()
-     * @see isGeosEmpty()
      */
     bool isEmpty() const;
 
@@ -196,12 +196,6 @@ class CORE_EXPORT QgsGeometry
      */
     bool isGeosValid() const;
 
-    /** Check if the geometry is empty using GEOS
-      @note added in 1.5
-      @see isEmpty()
-     */
-    bool isGeosEmpty() const;
-
     /** Returns the area of the geometry using GEOS
       @note added in 1.5
      */