Catch transform errors for annotations

nyalldawson · nyalldawson · commit 9fcc13083897 · 2017-02-01T12:14:20.000+10:00
diff --git a/src/gui/qgsmapcanvasannotationitem.cpp b/src/gui/qgsmapcanvasannotationitem.cpp
@@ -57,7 +57,14 @@ void QgsMapCanvasAnnotationItem::updatePosition()
   if ( mAnnotation->hasFixedMapPosition() )
   {
     QgsCoordinateTransform t( mAnnotation->mapPositionCrs(), mMapCanvas->mapSettings().destinationCrs() );
-    setPos( toCanvasCoordinates( t.transform( mAnnotation->mapPosition() ) ) );
+    QgsPoint coord = mAnnotation->mapPosition();
+    try
+    {
+      coord = t.transform( coord );
+    }
+    catch ( QgsCsException& )
+      {}
+    setPos( toCanvasCoordinates( coord ) );
   }
   else
   {

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,14 @@ void QgsMapCanvasAnnotationItem::updatePosition()`
`57`	`57`	`if ( mAnnotation->hasFixedMapPosition() )`
`58`	`58`	`{`
`59`	`59`	`QgsCoordinateTransform t( mAnnotation->mapPositionCrs(), mMapCanvas->mapSettings().destinationCrs() );`
`60`		`- setPos( toCanvasCoordinates( t.transform( mAnnotation->mapPosition() ) ) );`
	`60`	`+ QgsPoint coord = mAnnotation->mapPosition();`
	`61`	`+ try`
	`62`	`+ {`
	`63`	`+ coord = t.transform( coord );`
	`64`	`+ }`
	`65`	`+ catch ( QgsCsException& )`
	`66`	`+ {}`
	`67`	`+ setPos( toCanvasCoordinates( coord ) );`
`61`	`68`	`}`
`62`	`69`	`else`
`63`	`70`	`{`