Update CRS cache when deleting a custom CRS

leyan · leyan · commit 3bcf890dba6d · 2013-06-15T14:47:09.000+08:00
diff --git a/src/app/qgscustomprojectiondialog.cpp b/src/app/qgscustomprojectiondialog.cpp
@@ -168,6 +168,9 @@ bool  QgsCustomProjectionDialog::deleteCRS( QString id )
     QgsDebugMsg( QString( "failed to remove CRS from database in custom projection dialog: %1 [%2]" ).arg( mySql ).arg( sqlite3_errmsg( myDatabase ) ) );
   }
   sqlite3_close( myDatabase );
+
+  QgsCRSCache::instance()->updateCRSCache( QString( "USER:%1" ).arg( id ) );
+
   return myResult == SQLITE_OK;
 }
 
diff --git a/src/core/qgscrscache.cpp b/src/core/qgscrscache.cpp
@@ -106,6 +106,11 @@ void QgsCRSCache::updateCRSCache( const QString& authid )
   {
     mCRS.insert( authid, s );
   }
+  else
+  {
+    mCRS.remove( authid );
+  }
+
   QgsCoordinateTransformCache::instance()->invalidateCrs( authid );
 }
 

Original file line number	Diff line number	Diff line change
`@@ -168,6 +168,9 @@ bool QgsCustomProjectionDialog::deleteCRS( QString id )`
`168`	`168`	`QgsDebugMsg( QString( "failed to remove CRS from database in custom projection dialog: %1 [%2]" ).arg( mySql ).arg( sqlite3_errmsg( myDatabase ) ) );`
`169`	`169`	`}`
`170`	`170`	`sqlite3_close( myDatabase );`
	`171`	`+`
	`172`	`+ QgsCRSCache::instance()->updateCRSCache( QString( "USER:%1" ).arg( id ) );`
	`173`	`+`
`171`	`174`	`return myResult == SQLITE_OK;`
`172`	`175`	`}`
`173`	`176`
Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,11 @@ void QgsCRSCache::updateCRSCache( const QString& authid )`
`106`	`106`	`{`
`107`	`107`	`mCRS.insert( authid, s );`
`108`	`108`	`}`
	`109`	`+ else`
	`110`	`+ {`
	`111`	`+ mCRS.remove( authid );`
	`112`	`+ }`
	`113`	`+`
`109`	`114`	`QgsCoordinateTransformCache::instance()->invalidateCrs( authid );`
`110`	`115`	`}`
`111`	`116`