Invalidate crs cache after adding a new user CRS

nyalldawson · nyalldawson · commit 39851f4474b7 · 2017-11-13T15:01:46.000+10:00
Refs #17257
diff --git a/src/core/qgscoordinatereferencesystem.cpp b/src/core/qgscoordinatereferencesystem.cpp
@@ -1714,6 +1714,8 @@ long QgsCoordinateReferenceSystem::saveAsUserCrs( const QString &name )
   }
   else
     returnId = -1;
+
+  invalidateCache();
   return returnId;
 }
 
diff --git a/tests/src/core/testqgscoordinatereferencesystem.cpp b/tests/src/core/testqgscoordinatereferencesystem.cpp
@@ -106,6 +106,7 @@ void TestQgsCoordinateReferenceSystem::initTestCase()
   //
   // init QGIS's paths - true means that all path will be inited from prefix
   QgsApplication::init( mTempFolder );
+  QgsApplication::createDatabase();
   QgsApplication::initQgis();
   QgsApplication::showSettings();
 
@@ -820,6 +821,13 @@ void TestQgsCoordinateReferenceSystem::saveAsUserCrs()
 
   long newId = userCrs.saveAsUserCrs( QStringLiteral( "babies first projection" ) );
   QCOMPARE( newId, static_cast< long >( USER_CRS_START_ID ) );
+  QCOMPARE( userCrs.srsid(), newId );
+
+  // new CRS with same definition, check that it's matched to user crs
+  QgsCoordinateReferenceSystem userCrs2 = QgsCoordinateReferenceSystem::fromProj4( madeUpProjection );
+  QVERIFY( userCrs2.isValid() );
+  QCOMPARE( userCrs2.toProj4(), madeUpProjection );
+  QCOMPARE( userCrs2.srsid(), userCrs.srsid() );
 }
 
 QGSTEST_MAIN( TestQgsCoordinateReferenceSystem )

Original file line number	Diff line number	Diff line change
`@@ -1714,6 +1714,8 @@ long QgsCoordinateReferenceSystem::saveAsUserCrs( const QString &name )`
`1714`	`1714`	`}`
`1715`	`1715`	`else`
`1716`	`1716`	`returnId = -1;`
	`1717`	`+`
	`1718`	`+ invalidateCache();`
`1717`	`1719`	`return returnId;`
`1718`	`1720`	`}`
`1719`	`1721`