Fix some uncaught transform exceptions

qgis · Feb 18, 2015 · e952fe8 · e952fe8
1 parent 05c07f2
commit e952fe8
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 3 deletions.
diff --git a/src/core/qgsmaprenderer.cpp b/src/core/qgsmaprenderer.cpp
@@ -684,7 +684,14 @@ void QgsMapRenderer::setDestinationCrs( const QgsCoordinateReferenceSystem& crs,
     if ( transformExtent && !mExtent.isEmpty() )
     {
       QgsCoordinateTransform transform( *mDestCRS, crs );
-      rect = transform.transformBoundingBox( mExtent );
+      try
+      {
+        rect = transform.transformBoundingBox( mExtent );
+      }
+      catch ( QgsCsException &e )
+      {
+        QgsDebugMsg( QString( "Transform error caught: %1" ).arg( e.what() ) );
+      }
     }
 
     QgsDebugMsg( "Setting DistArea CRS to " + QString::number( crs.srsid() ) );

diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
@@ -518,7 +518,14 @@ void QgsMapCanvas::setDestinationCrs( const QgsCoordinateReferenceSystem &crs )
     if ( !mSettings.visibleExtent().isEmpty() )
     {
       QgsCoordinateTransform transform( mSettings.destinationCrs(), crs );
-      rect = transform.transformBoundingBox( mSettings.visibleExtent() );
+      try
+      {
+        rect = transform.transformBoundingBox( mSettings.visibleExtent() );
+      }
+      catch ( QgsCsException &e )
+      {
+        QgsDebugMsg( QString( "Transform error caught: %1" ).arg( e.what() ) );
+      }
     }
     if ( !rect.isEmpty() )
     {

diff --git a/src/server/qgswcsprojectparser.cpp b/src/server/qgswcsprojectparser.cpp
@@ -119,7 +119,16 @@ void QgsWCSProjectParser::wcsContentMetadata( QDomElement& parentElement, QDomDo
         const QgsCoordinateReferenceSystem& layerCrs = layer->crs();
         QgsCoordinateTransform t( layerCrs, QgsCoordinateReferenceSystem( 4326 ) );
         //transform
-        QgsRectangle BBox = t.transformBoundingBox( layer->extent() );
+        QgsRectangle BBox;
+        try
+        {
+          BBox = t.transformBoundingBox( layer->extent() );
+        }
+        catch ( QgsCsException &e )
+        {
+          QgsDebugMsg( QString( "Transform error caught: %1. Using original layer extent." ).arg( e.what() ) );
+          BBox = layer->extent();
+        }
         QDomElement lonLatElem = doc.createElement( "lonLatEnvelope" );
         lonLatElem.setAttribute( "srsName", "urn:ogc:def:crs:OGC:1.3:CRS84" );
         QDomElement lowerPosElem = doc.createElement( "gml:pos" );