Stop considering 0,0,0,0 as a Null QgsRectangle

strk · nyalldawson · commit 376f9798cd0c · 2023-10-23T10:07:42.000+10:00
Construct a proper null rectangle by default. Make sure a Null rectangle is always also considered Empty. Print Null rectangle as Null, still print details of Empty rectangles. Update expected QgsRectangle::toString output on Null rectangle Includes unit tests Closes GH-45563
diff --git a/src/core/geometry/qgsrectangle.cpp b/src/core/geometry/qgsrectangle.cpp
@@ -146,8 +146,8 @@ QString QgsRectangle::toString( int precision ) const
     }
   }
 
-  if ( isEmpty() )
-    rep = QStringLiteral( "Empty" );
+  if ( isNull() )
+    rep = QStringLiteral( "Null" );
   else
     rep = QStringLiteral( "%1,%2 : %3,%4" )
           .arg( mXmin, 0, 'f', precision )
diff --git a/src/core/geometry/qgsrectangle.h b/src/core/geometry/qgsrectangle.h
@@ -516,7 +516,7 @@ class CORE_EXPORT QgsRectangle
      */
     bool isEmpty() const
     {
-      return mXmax < mXmin || mYmax < mYmin || qgsDoubleNear( mXmax, mXmin ) || qgsDoubleNear( mYmax, mYmin );
+      return isNull() || mXmax <= mXmin || mYmax <= mYmin || qgsDoubleNear( mXmax, mXmin ) || qgsDoubleNear( mYmax, mYmin );
     }
 
     /**
@@ -533,7 +533,6 @@ class CORE_EXPORT QgsRectangle
       // rectangle created QgsRectangle() or with rect.setNull() or
       // otherwise having NaN ordinates
       return ( std::isnan( mXmin )  && std::isnan( mXmax ) && std::isnan( mYmin ) && std::isnan( mYmax ) ) ||
-             ( qgsDoubleNear( mXmin, 0.0 ) && qgsDoubleNear( mXmax, 0.0 ) && qgsDoubleNear( mYmin, 0.0 ) && qgsDoubleNear( mYmax, 0.0 ) ) ||
              ( qgsDoubleNear( mXmin, std::numeric_limits<double>::max() ) && qgsDoubleNear( mYmin, std::numeric_limits<double>::max() ) &&
                qgsDoubleNear( mXmax, -std::numeric_limits<double>::max() ) && qgsDoubleNear( mYmax, -std::numeric_limits<double>::max() ) );
     }
@@ -665,10 +664,10 @@ class CORE_EXPORT QgsRectangle
 
   private:
 
-    double mXmin = 0.0;
-    double mYmin = 0.0;
-    double mXmax = 0.0;
-    double mYmax = 0.0;
+    double mXmin = std::numeric_limits<double>::max();
+    double mYmin = std::numeric_limits<double>::max();
+    double mXmax = -std::numeric_limits<double>::max();
+    double mYmax = -std::numeric_limits<double>::max();
 
 };
 
diff --git a/tests/src/core/geometry/testqgsrectangle.cpp b/tests/src/core/geometry/testqgsrectangle.cpp
@@ -72,11 +72,13 @@ void TestQgsRectangle::isNull()
   QVERIFY( QgsRectangle().isNull() );
   QVERIFY( QgsRectangle( std::numeric_limits<double>::quiet_NaN(), std::numeric_limits<double>::quiet_NaN(),
                          std::numeric_limits<double>::quiet_NaN(), std::numeric_limits<double>::quiet_NaN() ).isNull() );
-  QVERIFY( QgsRectangle( 0.0, 0.0, 0.0, 0.0 ).isNull() );
+  QVERIFY( !QgsRectangle( 0.0, 0.0, 0.0, 0.0 ).isNull() );
+  QVERIFY( !QgsRectangle( 1.0, 1.0, 1.0, 1.0 ).isNull() );
   QVERIFY( !QgsRectangle( std::numeric_limits<double>::max(), -std::numeric_limits<double>::max(), std::numeric_limits<double>::max(), -std::numeric_limits<double>::max() ).isNull() );
   QVERIFY( !QgsRectangle( 1, 2, 2, 1 ).isNull() );
 }
 
+
 void TestQgsRectangle::fromWkt()
 {
   QgsRectangle rect = QgsRectangle::fromWkt( QStringLiteral( "POLYGON((0 0,1 0,1 1,0 1,0 0))" ) );
diff --git a/tests/src/python/test_qgsrectangle.py b/tests/src/python/test_qgsrectangle.py
@@ -125,7 +125,7 @@ def testAsWktPolygon(self):
 
     def testToString(self):
         """Test the different string representations"""
-        self.assertEqual(QgsRectangle().toString(), 'Empty')
+        self.assertEqual(QgsRectangle().toString(), 'Null')
         rect = QgsRectangle(0, 0.1, 0.2, 0.3)
         self.assertEqual(rect.toString(), '0.0000000000000000,0.1000000000000000 : 0.2000000000000000,0.3000000000000000')
 

Original file line number	Diff line number	Diff line change
`@@ -146,8 +146,8 @@ QString QgsRectangle::toString( int precision ) const`
`146`	`146`	`}`
`147`	`147`	`}`
`148`	`148`
`149`		`- if ( isEmpty() )`
`150`		`- rep = QStringLiteral( "Empty" );`
	`149`	`+ if ( isNull() )`
	`150`	`+ rep = QStringLiteral( "Null" );`
`151`	`151`	`else`
`152`	`152`	`rep = QStringLiteral( "%1,%2 : %3,%4" )`
`153`	`153`	`.arg( mXmin, 0, 'f', precision )`
Original file line number	Diff line number	Diff line change
`@@ -72,11 +72,13 @@ void TestQgsRectangle::isNull()`
`72`	`72`	`QVERIFY( QgsRectangle().isNull() );`
`73`	`73`	`QVERIFY( QgsRectangle( std::numeric_limits<double>::quiet_NaN(), std::numeric_limits<double>::quiet_NaN(),`
`74`	`74`	`std::numeric_limits<double>::quiet_NaN(), std::numeric_limits<double>::quiet_NaN() ).isNull() );`
`75`		`- QVERIFY( QgsRectangle( 0.0, 0.0, 0.0, 0.0 ).isNull() );`
	`75`	`+ QVERIFY( !QgsRectangle( 0.0, 0.0, 0.0, 0.0 ).isNull() );`
	`76`	`+ QVERIFY( !QgsRectangle( 1.0, 1.0, 1.0, 1.0 ).isNull() );`
`76`	`77`	`QVERIFY( !QgsRectangle( std::numeric_limits<double>::max(), -std::numeric_limits<double>::max(), std::numeric_limits<double>::max(), -std::numeric_limits<double>::max() ).isNull() );`
`77`	`78`	`QVERIFY( !QgsRectangle( 1, 2, 2, 1 ).isNull() );`
`78`	`79`	`}`
`79`	`80`
	`81`	`+`
`80`	`82`	`void TestQgsRectangle::fromWkt()`
`81`	`83`	`{`
`82`	`84`	`QgsRectangle rect = QgsRectangle::fromWkt( QStringLiteral( "POLYGON((0 0,1 0,1 1,0 1,0 0))" ) );`