Expose makeValid() errors to QgsGeometry::error()

m-kuhn · m-kuhn · commit d0f33d6d05cb · 2017-08-13T12:18:55.000+02:00
diff --git a/python/core/geometry/qgsgeometry.sip b/python/core/geometry/qgsgeometry.sip
@@ -1109,15 +1109,21 @@ Ring 0 is outer ring and can't be deleted.
 %Docstring
  Attempts to make an invalid geometry valid without losing vertices.
 
-.. note::
-
-   Ported from PostGIS ST_MakeValid() and it should return equivalent results.
  Already-valid geometries are returned without further intervention.
  In case of full or partial dimensional collapses, the output geometry may be a collection
  of lower-to-equal dimension geometries or a geometry of lower dimension.
  Single polygons may become multi-geometries in case of self-intersections.
  It preserves Z values, but M values will be dropped.
+
+ If an error was encountered during the process, more information can be retrieved
+ by calling `error()` on the returned geometry.
+
  :return: new valid QgsGeometry or null geometry on error
+
+.. note::
+
+   Ported from PostGIS ST_MakeValid() and it should return equivalent results.
+
 .. versionadded:: 3.0
  :rtype: QgsGeometry
 %End
diff --git a/src/core/geometry/qgsgeometry.cpp b/src/core/geometry/qgsgeometry.cpp
@@ -2012,8 +2012,7 @@ QgsGeometry QgsGeometry::makeValid()
   if ( !d->geometry )
     return QgsGeometry();
 
-  QString errorMsg;
-  QgsAbstractGeometry *g = _qgis_lwgeom_make_valid( d->geometry, errorMsg );
+  QgsAbstractGeometry *g = _qgis_lwgeom_make_valid( d->geometry, d->error );
 
   return QgsGeometry( g );
 }
diff --git a/src/core/geometry/qgsgeometry.h b/src/core/geometry/qgsgeometry.h
@@ -993,13 +993,19 @@ class CORE_EXPORT QgsGeometry
     /**
      * Attempts to make an invalid geometry valid without losing vertices.
      *
-     * \note Ported from PostGIS ST_MakeValid() and it should return equivalent results.
      * Already-valid geometries are returned without further intervention.
      * In case of full or partial dimensional collapses, the output geometry may be a collection
      * of lower-to-equal dimension geometries or a geometry of lower dimension.
      * Single polygons may become multi-geometries in case of self-intersections.
      * It preserves Z values, but M values will be dropped.
+     *
+     * If an error was encountered during the process, more information can be retrieved
+     * by calling `error()` on the returned geometry.
+     *
      * \returns new valid QgsGeometry or null geometry on error
+     *
+     * \note Ported from PostGIS ST_MakeValid() and it should return equivalent results.
+     *
      * \since QGIS 3.0
      */
     QgsGeometry makeValid();

Original file line number	Diff line number	Diff line change
`@@ -2012,8 +2012,7 @@ QgsGeometry QgsGeometry::makeValid()`
`2012`	`2012`	`if ( !d->geometry )`
`2013`	`2013`	`return QgsGeometry();`
`2014`	`2014`
`2015`		`- QString errorMsg;`
`2016`		`- QgsAbstractGeometry *g = _qgis_lwgeom_make_valid( d->geometry, errorMsg );`
	`2015`	`+ QgsAbstractGeometry *g = _qgis_lwgeom_make_valid( d->geometry, d->error );`
`2017`	`2016`
`2018`	`2017`	`return QgsGeometry( g );`
`2019`	`2018`	`}`