Don't add GEOS warnings to message log

nyalldawson · nyalldawson · commit 58e535103cbf · 2018-05-15T16:59:18.000+10:00
This dramatically slows down rendering, especially when labeling
is used. E.g. because labeling clips features, or because the
rendering simplification code results in invalid geometries -
this then fires multiple geos warnings when labeling
tests for geometry validity, etc. But these warnings are useless,
because the original geometry is valid and users cannot repair
them.... yet they slow things RIIIIIIGHHHT DOOOOWN.

Well behaved code, which requires access to geos errors,
should be using QgsGeometry::lastError instead.
diff --git a/src/core/geometry/qgsgeos.cpp b/src/core/geometry/qgsgeos.cpp
@@ -18,7 +18,6 @@ email                : marco.hugentobler at sourcepole dot com
 #include "qgsgeometrycollection.h"
 #include "qgsgeometryfactory.h"
 #include "qgslinestring.h"
-#include "qgsmessagelog.h"
 #include "qgsmulticurve.h"
 #include "qgsmultilinestring.h"
 #include "qgsmultipoint.h"
@@ -34,14 +33,12 @@ email                : marco.hugentobler at sourcepole dot com
 #define CATCH_GEOS(r) \
   catch (GEOSException &e) \
   { \
-    QgsMessageLog::logMessage( QObject::tr( "Exception: %1" ).arg( e.what() ), QObject::tr("GEOS") ); \
     return r; \
   }
 
 #define CATCH_GEOS_WITH_ERRMSG(r) \
   catch (GEOSException &e) \
   { \
-    QgsMessageLog::logMessage( QObject::tr( "Exception: %1" ).arg( e.what() ), QObject::tr("GEOS") ); \
     if ( errorMsg ) \
     { \
       *errorMsg = e.what(); \
@@ -1053,9 +1050,8 @@ geos::unique_ptr QgsGeos::createGeosCollection( int typeId, const QVector<GEOSGe
   {
     geom.reset( GEOSGeom_createCollection_r( geosinit.ctxt, typeId, geomarr, nNotNullGeoms ) );
   }
-  catch ( GEOSException &e )
+  catch ( GEOSException & )
   {
-    QgsMessageLog::logMessage( QObject::tr( "Exception: %1" ).arg( e.what() ), QObject::tr( "GEOS" ) );
   }
 
   delete [] geomarr;
@@ -1751,7 +1747,7 @@ GEOSCoordSequence *QgsGeos::createCoordinateSequence( const QgsCurve *curve, dou
     coordSeq = GEOSCoordSeq_create_r( geosinit.ctxt, numOutPoints, coordDims );
     if ( !coordSeq )
     {
-      QgsMessageLog::logMessage( QObject::tr( "Could not create coordinate sequence for %1 points in %2 dimensions" ).arg( numPoints ).arg( coordDims ), QObject::tr( "GEOS" ) );
+      QgsDebugMsg( QStringLiteral( "GEOS Exception: Could not create coordinate sequence for %1 points in %2 dimensions" ).arg( numPoints ).arg( coordDims ) );
       return nullptr;
     }
     if ( precision > 0. )
@@ -1813,7 +1809,7 @@ geos::unique_ptr QgsGeos::createGeosPointXY( double x, double y, bool hasZ, doub
     GEOSCoordSequence *coordSeq = GEOSCoordSeq_create_r( geosinit.ctxt, 1, coordDims );
     if ( !coordSeq )
     {
-      QgsMessageLog::logMessage( QObject::tr( "Could not create coordinate sequence for point with %1 dimensions" ).arg( coordDims ), QObject::tr( "GEOS" ) );
+      QgsDebugMsg( QStringLiteral( "GEOS Exception: Could not create coordinate sequence for point with %1 dimensions" ).arg( coordDims ) );
       return nullptr;
     }
     if ( precision > 0. )
@@ -2363,7 +2359,6 @@ geos::unique_ptr QgsGeos::reshapeLine( const GEOSGeometry *line, const GEOSGeome
   }
   catch ( GEOSException &e )
   {
-    QgsMessageLog::logMessage( QObject::tr( "Exception: %1" ).arg( e.what() ), QObject::tr( "GEOS" ) );
     atLeastTwoIntersections = false;
   }
 
@@ -2582,7 +2577,6 @@ geos::unique_ptr QgsGeos::reshapePolygon( const GEOSGeometry *polygon, const GEO
   }
   catch ( GEOSException &e )
   {
-    QgsMessageLog::logMessage( QObject::tr( "Exception: %1" ).arg( e.what() ), QObject::tr( "GEOS" ) );
     nIntersections = 0;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@ email : marco.hugentobler at sourcepole dot com`
`18`	`18`	`#include "qgsgeometrycollection.h"`
`19`	`19`	`#include "qgsgeometryfactory.h"`
`20`	`20`	`#include "qgslinestring.h"`
`21`		`-#include "qgsmessagelog.h"`
`22`	`21`	`#include "qgsmulticurve.h"`
`23`	`22`	`#include "qgsmultilinestring.h"`
`24`	`23`	`#include "qgsmultipoint.h"`
`@@ -34,14 +33,12 @@ email : marco.hugentobler at sourcepole dot com`
`34`	`33`	`#define CATCH_GEOS(r) \`
`35`	`34`	`catch (GEOSException &e) \`
`36`	`35`	`{ \`
`37`		`- QgsMessageLog::logMessage( QObject::tr( "Exception: %1" ).arg( e.what() ), QObject::tr("GEOS") ); \`
`38`	`36`	`return r; \`
`39`	`37`	`}`
`40`	`38`
`41`	`39`	`#define CATCH_GEOS_WITH_ERRMSG(r) \`
`42`	`40`	`catch (GEOSException &e) \`
`43`	`41`	`{ \`
`44`		`- QgsMessageLog::logMessage( QObject::tr( "Exception: %1" ).arg( e.what() ), QObject::tr("GEOS") ); \`
`45`	`42`	`if ( errorMsg ) \`
`46`	`43`	`{ \`
`47`	`44`	`*errorMsg = e.what(); \`
`@@ -1053,9 +1050,8 @@ geos::unique_ptr QgsGeos::createGeosCollection( int typeId, const QVector<GEOSGe`
`1053`	`1050`	`{`
`1054`	`1051`	`geom.reset( GEOSGeom_createCollection_r( geosinit.ctxt, typeId, geomarr, nNotNullGeoms ) );`
`1055`	`1052`	`}`
`1056`		`- catch ( GEOSException &e )`
	`1053`	`+ catch ( GEOSException & )`
`1057`	`1054`	`{`
`1058`		`- QgsMessageLog::logMessage( QObject::tr( "Exception: %1" ).arg( e.what() ), QObject::tr( "GEOS" ) );`
`1059`	`1055`	`}`
`1060`	`1056`
`1061`	`1057`	`delete [] geomarr;`
`@@ -1751,7 +1747,7 @@ GEOSCoordSequence QgsGeos::createCoordinateSequence( const QgsCurve curve, dou`
`1751`	`1747`	`coordSeq = GEOSCoordSeq_create_r( geosinit.ctxt, numOutPoints, coordDims );`
`1752`	`1748`	`if ( !coordSeq )`
`1753`	`1749`	`{`
`1754`		`- QgsMessageLog::logMessage( QObject::tr( "Could not create coordinate sequence for %1 points in %2 dimensions" ).arg( numPoints ).arg( coordDims ), QObject::tr( "GEOS" ) );`
	`1750`	`+ QgsDebugMsg( QStringLiteral( "GEOS Exception: Could not create coordinate sequence for %1 points in %2 dimensions" ).arg( numPoints ).arg( coordDims ) );`
`1755`	`1751`	`return nullptr;`
`1756`	`1752`	`}`
`1757`	`1753`	`if ( precision > 0. )`
`@@ -1813,7 +1809,7 @@ geos::unique_ptr QgsGeos::createGeosPointXY( double x, double y, bool hasZ, doub`
`1813`	`1809`	`GEOSCoordSequence *coordSeq = GEOSCoordSeq_create_r( geosinit.ctxt, 1, coordDims );`
`1814`	`1810`	`if ( !coordSeq )`
`1815`	`1811`	`{`
`1816`		`- QgsMessageLog::logMessage( QObject::tr( "Could not create coordinate sequence for point with %1 dimensions" ).arg( coordDims ), QObject::tr( "GEOS" ) );`
	`1812`	`+ QgsDebugMsg( QStringLiteral( "GEOS Exception: Could not create coordinate sequence for point with %1 dimensions" ).arg( coordDims ) );`
`1817`	`1813`	`return nullptr;`
`1818`	`1814`	`}`
`1819`	`1815`	`if ( precision > 0. )`
`@@ -2363,7 +2359,6 @@ geos::unique_ptr QgsGeos::reshapeLine( const GEOSGeometry *line, const GEOSGeome`
`2363`	`2359`	`}`
`2364`	`2360`	`catch ( GEOSException &e )`
`2365`	`2361`	`{`
`2366`		`- QgsMessageLog::logMessage( QObject::tr( "Exception: %1" ).arg( e.what() ), QObject::tr( "GEOS" ) );`
`2367`	`2362`	`atLeastTwoIntersections = false;`
`2368`	`2363`	`}`
`2369`	`2364`
`@@ -2582,7 +2577,6 @@ geos::unique_ptr QgsGeos::reshapePolygon( const GEOSGeometry *polygon, const GEO`
`2582`	`2577`	`}`
`2583`	`2578`	`catch ( GEOSException &e )`
`2584`	`2579`	`{`
`2585`		`- QgsMessageLog::logMessage( QObject::tr( "Exception: %1" ).arg( e.what() ), QObject::tr( "GEOS" ) );`
`2586`	`2580`	`nIntersections = 0;`
`2587`	`2581`	`}`
`2588`	`2582`