Have QgsGeometry::boundingBox return null rect for null geom

Includes unit test
qgis · Oct 22, 2023 · 3d21718 · 3d21718
1 parent f3e3e0d
commit 3d21718
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/core/geometry/qgsgeometry.cpp b/src/core/geometry/qgsgeometry.cpp
@@ -1201,7 +1201,7 @@ QgsRectangle QgsGeometry::boundingBox() const
   {
     return d->geometry->boundingBox();
   }
-  return QgsRectangle();
+  return QgsRectangle::createNull();
 }
 
 QgsBox3D QgsGeometry::boundingBox3D() const

diff --git a/tests/src/core/geometry/testqgsgeometry.cpp b/tests/src/core/geometry/testqgsgeometry.cpp
@@ -155,6 +155,7 @@ class TestQgsGeometry : public QgsTest
     void createCollectionOfType();
 
     void orientedMinimumBoundingBox( );
+    void boundingBox();
     void boundingBox3D();
     void minimalEnclosingCircle( );
     void splitGeometry();
@@ -2167,6 +2168,16 @@ void TestQgsGeometry::orientedMinimumBoundingBox()
 
 }
 
+void TestQgsGeometry::boundingBox()
+{
+  QgsGeometry geomTest;
+  QgsRectangle nullRect = QgsRectangle::createNull();
+  QCOMPARE( geomTest.boundingBox(), nullRect );
+
+  geomTest = QgsGeometry::fromWkt( QStringLiteral( "LINESTRING(-1 -2, 4 5)" ) );
+  QCOMPARE( geomTest.boundingBox3D(), QgsRectangle( -1, -2, 4, 5 ) );
+}
+
 void TestQgsGeometry::boundingBox3D()
 {
   QgsGeometry geomTest;