Have QgsRectangle::asPolygon return "EMPTY" for null rects

Update python test accordingly
qgis · Oct 2, 2023 · a60739f · a60739f
1 parent 61ab0e4
commit a60739f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/core/geometry/qgsrectangle.cpp b/src/core/geometry/qgsrectangle.cpp
@@ -158,8 +158,11 @@ QString QgsRectangle::toString( int precision ) const
 
 QString QgsRectangle::asPolygon() const
 {
-//   QString rep = tmp.sprintf("%16f %16f,%16f %16f,%16f %16f,%16f %16f,%16f %16f",
-//     xmin, ymin, xmin, ymax, xmax, ymax, xmax, ymin, xmin, ymin);
+  if ( isNull() )
+  {
+    return "EMPTY";
+  }
+
   QString rep;
 
   QTextStream foo( &rep );

diff --git a/tests/src/python/test_qgsrectangle.py b/tests/src/python/test_qgsrectangle.py
@@ -143,7 +143,7 @@ def testToString(self):
 
     def testAsPolygon(self):
         """Test string representation as polygon"""
-        self.assertEqual(QgsRectangle().asPolygon(), '0.00000000 0.00000000, 0.00000000 0.00000000, 0.00000000 0.00000000, 0.00000000 0.00000000, 0.00000000 0.00000000')
+        self.assertEqual(QgsRectangle().asPolygon(), 'EMPTY')
         self.assertEqual(QgsRectangle(0, 0.1, 0.2, 0.3).asPolygon(), '0.00000000 0.10000000, 0.00000000 0.30000000, 0.20000000 0.30000000, 0.20000000 0.10000000, 0.00000000 0.10000000')
 
     def testToBox3d(self):