Expose segmentization parameters to QgsGeometry::convertToStraightSegment

nyalldawson · nyalldawson · commit 6bd7600aa3c9 · 2018-03-04T12:10:27.000+10:00
diff --git a/python/core/geometry/qgsgeometry.sip.in b/python/core/geometry/qgsgeometry.sip.in
@@ -1423,10 +1423,13 @@ An empty geometry will be returned in the case of errors.
 .. versionadded:: 3.0
 %End
 
-    void convertToStraightSegment();
+    void convertToStraightSegment( double tolerance = M_PI / 180., QgsAbstractGeometry::SegmentationToleranceType toleranceType = QgsAbstractGeometry::MaximumAngle );
 %Docstring
 Converts the geometry to straight line segments, if it is a curved geometry type.
 
+:param tolerance: segmentation tolerance
+:param toleranceType: maximum segmentation angle or maximum difference between approximation and curve
+
 .. versionadded:: 2.10
 
 .. seealso:: :py:func:`requiresConversionToStraightSegments`
diff --git a/src/core/geometry/qgsgeometry.cpp b/src/core/geometry/qgsgeometry.cpp
@@ -2312,14 +2312,14 @@ QgsGeometry QgsGeometry::polygonize( const QVector<QgsGeometry> &geometryList )
   return result;
 }
 
-void QgsGeometry::convertToStraightSegment()
+void QgsGeometry::convertToStraightSegment( double tolerance, QgsAbstractGeometry::SegmentationToleranceType toleranceType )
 {
   if ( !d->geometry || !requiresConversionToStraightSegments() )
   {
     return;
   }
 
-  std::unique_ptr< QgsAbstractGeometry > straightGeom( d->geometry->segmentize() );
+  std::unique_ptr< QgsAbstractGeometry > straightGeom( d->geometry->segmentize( tolerance, toleranceType ) );
   reset( std::move( straightGeom ) );
 }
 
diff --git a/src/core/geometry/qgsgeometry.h b/src/core/geometry/qgsgeometry.h
@@ -1413,10 +1413,12 @@ class CORE_EXPORT QgsGeometry
 
     /**
      * Converts the geometry to straight line segments, if it is a curved geometry type.
+     * \param tolerance segmentation tolerance
+     * \param toleranceType maximum segmentation angle or maximum difference between approximation and curve
      * \since QGIS 2.10
      * \see requiresConversionToStraightSegments
      */
-    void convertToStraightSegment();
+    void convertToStraightSegment( double tolerance = M_PI / 180., QgsAbstractGeometry::SegmentationToleranceType toleranceType = QgsAbstractGeometry::MaximumAngle );
 
     /**
      * Returns true if the geometry is a curved geometry type which requires conversion to

Original file line number	Diff line number	Diff line change
`@@ -2312,14 +2312,14 @@ QgsGeometry QgsGeometry::polygonize( const QVector<QgsGeometry> &geometryList )`
`2312`	`2312`	`return result;`
`2313`	`2313`	`}`
`2314`	`2314`
`2315`		`-void QgsGeometry::convertToStraightSegment()`
	`2315`	`+void QgsGeometry::convertToStraightSegment( double tolerance, QgsAbstractGeometry::SegmentationToleranceType toleranceType )`
`2316`	`2316`	`{`
`2317`	`2317`	`if ( !d->geometry \|\| !requiresConversionToStraightSegments() )`
`2318`	`2318`	`{`
`2319`	`2319`	`return;`
`2320`	`2320`	`}`
`2321`	`2321`
`2322`		`- std::unique_ptr< QgsAbstractGeometry > straightGeom( d->geometry->segmentize() );`
	`2322`	`+ std::unique_ptr< QgsAbstractGeometry > straightGeom( d->geometry->segmentize( tolerance, toleranceType ) );`
`2323`	`2323`	`reset( std::move( straightGeom ) );`
`2324`	`2324`	`}`
`2325`	`2325`