Invalid CRS instances should be equal

qgis · Mar 25, 2014 · af9da1d · af9da1d
1 parent c69f2e1
commit af9da1d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/core/qgscoordinatereferencesystem.cpp b/src/core/qgscoordinatereferencesystem.cpp
@@ -1130,7 +1130,8 @@ long QgsCoordinateReferenceSystem::findMatchingProj()
 
 bool QgsCoordinateReferenceSystem::operator==( const QgsCoordinateReferenceSystem &theSrs ) const
 {
-  return mIsValidFlag && theSrs.mIsValidFlag && theSrs.authid() == authid();
+  return ( !mIsValidFlag && !theSrs.mIsValidFlag ) ||
+         ( mIsValidFlag && theSrs.mIsValidFlag && theSrs.authid() == authid() );
 }
 
 bool QgsCoordinateReferenceSystem::operator!=( const QgsCoordinateReferenceSystem &theSrs ) const

diff --git a/tests/src/core/testqgscoordinatereferencesystem.cpp b/tests/src/core/testqgscoordinatereferencesystem.cpp
@@ -49,6 +49,7 @@ class TestQgsCoordinateReferenceSystem: public QObject
     void validate();
     void equality();
     void noEquality();
+    void equalityInvalid();
     void readXML();
     void writeXML();
     void setCustomSrsValidation();
@@ -312,6 +313,12 @@ void TestQgsCoordinateReferenceSystem::noEquality()
   debugPrint( myCrs );
   QVERIFY( myCrs != myCrs2 );
 }
+void TestQgsCoordinateReferenceSystem::equalityInvalid()
+{
+  QgsCoordinateReferenceSystem invalidCrs1;
+  QgsCoordinateReferenceSystem invalidCrs2;
+  QVERIFY( invalidCrs1 == invalidCrs2 );
+}
 void TestQgsCoordinateReferenceSystem::readXML()
 {
   //QgsCoordinateReferenceSystem myCrs;