Fix QgsGeometry nearestPoint and minimalEnclosingCircle when the geometry is empty

Bertrand Rix · web-flow · commit 843860e2c0fa · 2020-05-13T05:19:02.000+10:00
fix #36142
diff --git a/src/core/geometry/qgsgeometry.cpp b/src/core/geometry/qgsgeometry.cpp
@@ -1072,7 +1072,7 @@ QgsGeometry QgsGeometry::minimalEnclosingCircle( QgsPointXY &center, double &rad
   center = QgsPointXY();
   radius = 0;
 
-  if ( !d->geometry )
+  if ( isEmpty() )
   {
     return QgsGeometry();
   }
diff --git a/src/core/geometry/qgsgeos.cpp b/src/core/geometry/qgsgeos.cpp
@@ -2213,7 +2213,7 @@ QgsGeometry QgsGeos::mergeLines( QString *errorMsg ) const
 
 QgsGeometry QgsGeos::closestPoint( const QgsGeometry &other, QString *errorMsg ) const
 {
-  if ( !mGeos || other.isNull() )
+  if ( !mGeos || isEmpty() || other.isNull() )
   {
     return QgsGeometry();
   }

Original file line number	Diff line number	Diff line change
`@@ -1072,7 +1072,7 @@ QgsGeometry QgsGeometry::minimalEnclosingCircle( QgsPointXY &center, double &rad`
`1072`	`1072`	`center = QgsPointXY();`
`1073`	`1073`	`radius = 0;`
`1074`	`1074`
`1075`		`- if ( !d->geometry )`
	`1075`	`+ if ( isEmpty() )`
`1076`	`1076`	`{`
`1077`	`1077`	`return QgsGeometry();`
`1078`	`1078`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2213,7 +2213,7 @@ QgsGeometry QgsGeos::mergeLines( QString *errorMsg ) const`
`2213`	`2213`
`2214`	`2214`	`QgsGeometry QgsGeos::closestPoint( const QgsGeometry &other, QString *errorMsg ) const`
`2215`	`2215`	`{`
`2216`		`- if ( !mGeos \|\| other.isNull() )`
	`2216`	`+ if ( !mGeos \|\| isEmpty() \|\| other.isNull() )`
`2217`	`2217`	`{`
`2218`	`2218`	`return QgsGeometry();`
`2219`	`2219`	`}`