Have QGsGeometry::fromRect(nullRect) return null geometry

Includes testcase
qgis · Oct 22, 2023 · e366095 · e366095
1 parent f3c1ba7
commit e366095
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/src/core/geometry/qgsgeometry.cpp b/src/core/geometry/qgsgeometry.cpp
@@ -233,6 +233,9 @@ QgsGeometry QgsGeometry::fromMultiPolygonXY( const QgsMultiPolygonXY &multipoly
 
 QgsGeometry QgsGeometry::fromRect( const QgsRectangle &rect )
 {
+  if ( rect.isNull() )
+    return QgsGeometry();
+
   std::unique_ptr< QgsLineString > ext = std::make_unique< QgsLineString >(
       QVector< double >() << rect.xMinimum()
       << rect.xMaximum()

diff --git a/tests/src/core/geometry/testqgsgeometry.cpp b/tests/src/core/geometry/testqgsgeometry.cpp
@@ -96,6 +96,7 @@ class TestQgsGeometry : public QgsTest
     void fromQPoint();
     void fromQPolygonF();
     void fromPolyline();
+    void fromRect();
     void asQPointF();
     void asQPolygonF();
 
@@ -834,6 +835,17 @@ void TestQgsGeometry::fromPolyline()
   QCOMPARE( fromPolyline.asWkt(), QStringLiteral( "LineStringZM (10 20 4 100, 30 40 5 200)" ) );
 }
 
+void TestQgsGeometry::fromRect()
+{
+  QgsRectangle rectNull = QgsRectangle::createNull();
+
+  QgsGeometry fromRect = QgsGeometry::fromRect( rectNull );
+  QVERIFY( fromRect.isNull() );
+
+  fromRect = QgsGeometry::fromRect( QgsRectangle( 1, 2, 3, 4 ) );
+  QCOMPARE( fromRect.asWkt(), QStringLiteral( "Polygon ((1 2, 3 2, 3 4, 1 4, 1 2))" ) );
+}
+
 void TestQgsGeometry::asQPointF()
 {
   QPointF point( 1.0, 2.0 );