[processing] Throw exception when combining clip geometry fails in clip alg

nirvn · nirvn · commit a93daf143752 · 2018-04-03T15:32:08.000+07:00
diff --git a/src/analysis/processing/qgsalgorithmclip.cpp b/src/analysis/processing/qgsalgorithmclip.cpp
@@ -105,6 +105,10 @@ QVariantMap QgsClipAlgorithm::processAlgorithm( const QVariantMap &parameters, Q
   if ( clipGeoms.length() > 1 )
   {
     combinedClipGeom = QgsGeometry::unaryUnion( clipGeoms );
+    if ( combinedClipGeom.isEmpty() )
+    {
+      throw QgsProcessingException( QObject::tr( "Could not create the combined clip geometry: %1" ).arg( combinedClipGeom.lastError() ) );
+    }
     singleClipFeature = false;
   }
   else

Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,10 @@ QVariantMap QgsClipAlgorithm::processAlgorithm( const QVariantMap &parameters, Q`
`105`	`105`	`if ( clipGeoms.length() > 1 )`
`106`	`106`	`{`
`107`	`107`	`combinedClipGeom = QgsGeometry::unaryUnion( clipGeoms );`
	`108`	`+ if ( combinedClipGeom.isEmpty() )`
	`109`	`+ {`
	`110`	`+ throw QgsProcessingException( QObject::tr( "Could not create the combined clip geometry: %1" ).arg( combinedClipGeom.lastError() ) );`
	`111`	`+ }`
`108`	`112`	`singleClipFeature = false;`
`109`	`113`	`}`
`110`	`114`	`else`