sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-16 00:05:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

[processing] Skip redundant and potentially expensive duplicate intersection

Browse Source 
test in Split With Lines algorithm
This commit is contained in:
Nyall Dawson 2020-10-13 13:50:49 +10:00
parent 710230cc0c
commit f8222f0f16
8 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/core/auto_generated/geometry/qgsgeometry.sip.in
View File

@ -857,7 +857,7 @@ Splits this geometry according to a given line.
- will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY.
%End
OperationResult splitGeometry( const QgsPointSequence &splitLine, QVector<QgsGeometry> &newGeometries /Out/, bool topological, QgsPointSequence &topologyTestPoints /Out/, bool splitFeature = true );
OperationResult splitGeometry( const QgsPointSequence &splitLine, QVector<QgsGeometry> &newGeometries /Out/, bool topological, QgsPointSequence &topologyTestPoints /Out/, bool splitFeature = true);
%Docstring
Splits this geometry according to a given line.

4
python/core/auto_generated/geometry/qgsgeometryengine.sip.in
View File

@ -240,7 +240,7 @@ Determines whether the geometry is simple (according to OGC definition).
virtual QgsGeometryEngine::EngineOperationResult splitGeometry( const QgsLineString &splitLine,
QVector<QgsGeometry > &newGeometries /Out/,
bool topological,
QgsPointSequence &topologyTestPoints, QString *errorMsg = 0 ) const;
QgsPointSequence &topologyTestPoints, QString *errorMsg = 0, bool skipIntersectionCheck = false ) const;
%Docstring
Splits this geometry according to a given line.
@ -249,6 +249,8 @@ Splits this geometry according to a given line.
:param topological: ``True`` if topological editing is enabled
\param[out] topologyTestPoints points that need to be tested for topological completeness in the dataset
\param[out] errorMsg error messages emitted, if any
:param skipIntersectionCheck: set to ``True`` to skip the potentially expensive initial intersection check. Only set this flag if an intersection
test has already been performed by the caller!
:return: 0 in case of success, 1 if geometry has not been split, error else
%End

2
src/analysis/processing/qgsalgorithmsplitwithlines.cpp
View File

@ -215,7 +215,7 @@ QVariantMap QgsSplitWithLinesAlgorithm::processAlgorithm( const QVariantMap &par
QVector< QgsGeometry > newGeometries;
QgsPointSequence topologyTestPoints;
QgsGeometry::OperationResult result = inGeom.splitGeometry( splitterPList, newGeometries, false, topologyTestPoints );
QgsGeometry::OperationResult result = inGeom.splitGeometry( splitterPList, newGeometries, false, topologyTestPoints, true );
// splitGeometry: If there are several intersections
// between geometry and splitLine, only the first one is considered.

4
src/core/geometry/qgsgeometry.cpp
View File

@ -837,7 +837,7 @@ QgsGeometry::OperationResult QgsGeometry::splitGeometry( const QVector<QgsPointX
convertPointList( topology, topologyTestPoints );
return result;
}
QgsGeometry::OperationResult QgsGeometry::splitGeometry( const QgsPointSequence &splitLine, QVector<QgsGeometry> &newGeometries, bool topological, QgsPointSequence &topologyTestPoints, bool splitFeature )
QgsGeometry::OperationResult QgsGeometry::splitGeometry( const QgsPointSequence &splitLine, QVector<QgsGeometry> &newGeometries, bool topological, QgsPointSequence &topologyTestPoints, bool splitFeature, bool skipIntersectionTest )
{
if ( !d->geometry )
{
@ -860,7 +860,7 @@ QgsGeometry::OperationResult QgsGeometry::splitGeometry( const QgsPointSequence
QgsGeos geos( d->geometry.get() );
mLastError.clear();
QgsGeometryEngine::EngineOperationResult result = geos.splitGeometry( splitLineString, newGeoms, topological, topologyTestPoints, &mLastError );
QgsGeometryEngine::EngineOperationResult result = geos.splitGeometry( splitLineString, newGeoms, topological, topologyTestPoints, &mLastError, skipIntersectionTest );
if ( result == QgsGeometryEngine::Success )
{

4
src/core/geometry/qgsgeometry.h
View File

@ -899,6 +899,8 @@ class CORE_EXPORT QgsGeometry
* \param[out] topologyTestPoints points that need to be tested for topological completeness in the dataset
* \param splitFeature Set to True if you want to split a feature, otherwise set to False to split parts
* fix this bug?
* \param skipIntersectionTest set to TRUE to skip the potentially expensive initial intersection check. Only set this flag if an intersection
* test has already been performed by the caller! Not available in Python bindings.
* \returns OperationResult a result code: success or reason of failure
*
* Example:
@ -910,7 +912,7 @@ class CORE_EXPORT QgsGeometry
* > LineStringZ (2749549.12 1262908.38 125.14, 2749557.82 1262920.06 200)
* \endcode
*/
OperationResult splitGeometry( const QgsPointSequence &splitLine, QVector<QgsGeometry> &newGeometries SIP_OUT, bool topological, QgsPointSequence &topologyTestPoints SIP_OUT, bool splitFeature = true );
OperationResult splitGeometry( const QgsPointSequence &splitLine, QVector<QgsGeometry> &newGeometries SIP_OUT, bool topological, QgsPointSequence &topologyTestPoints SIP_OUT, bool splitFeature = true, bool skipIntersectionTest SIP_PYARGREMOVE = false );
/**
* Splits this geometry according to a given curve.

5
src/core/geometry/qgsgeometryengine.h
View File

@ -253,18 +253,21 @@ class CORE_EXPORT QgsGeometryEngine
* \param topological TRUE if topological editing is enabled
* \param[out] topologyTestPoints points that need to be tested for topological completeness in the dataset
* \param[out] errorMsg error messages emitted, if any
* \param skipIntersectionCheck set to TRUE to skip the potentially expensive initial intersection check. Only set this flag if an intersection
* test has already been performed by the caller!
* \returns 0 in case of success, 1 if geometry has not been split, error else
*/
virtual QgsGeometryEngine::EngineOperationResult splitGeometry( const QgsLineString &splitLine,
QVector<QgsGeometry > &newGeometries SIP_OUT,
bool topological,
QgsPointSequence &topologyTestPoints, QString *errorMsg = nullptr ) const
QgsPointSequence &topologyTestPoints, QString *errorMsg = nullptr, bool skipIntersectionCheck = false ) const
{
Q_UNUSED( splitLine )
Q_UNUSED( newGeometries )
Q_UNUSED( topological )
Q_UNUSED( topologyTestPoints )
Q_UNUSED( errorMsg )
Q_UNUSED( skipIntersectionCheck )
return MethodNotImplemented;
}

14
src/core/geometry/qgsgeos.cpp
View File

@ -620,7 +620,7 @@ QgsGeometryEngine::EngineOperationResult QgsGeos::splitGeometry( const QgsLineSt
QVector<QgsGeometry> &newGeometries,
bool topological,
QgsPointSequence &topologyTestPoints,
QString *errorMsg ) const
QString *errorMsg, bool skipIntersectionCheck ) const
{
EngineOperationResult returnCode = Success;
@ -678,11 +678,11 @@ QgsGeometryEngine::EngineOperationResult QgsGeos::splitGeometry( const QgsLineSt
//call split function depending on geometry type
if ( mGeometry->dimension() == 1 )
{
returnCode = splitLinearGeometry( splitLineGeos.get(), newGeometries );
returnCode = splitLinearGeometry( splitLineGeos.get(), newGeometries, skipIntersectionCheck );
}
else if ( mGeometry->dimension() == 2 )
{
returnCode = splitPolygonGeometry( splitLineGeos.get(), newGeometries );
returnCode = splitPolygonGeometry( splitLineGeos.get(), newGeometries, skipIntersectionCheck );
}
else
{
@ -817,7 +817,7 @@ geos::unique_ptr QgsGeos::linePointDifference( GEOSGeometry *GEOSsplitPoint ) co
return asGeos( &lines, mPrecision );
}
QgsGeometryEngine::EngineOperationResult QgsGeos::splitLinearGeometry( GEOSGeometry *splitLine, QVector<QgsGeometry> &newGeometries ) const
QgsGeometryEngine::EngineOperationResult QgsGeos::splitLinearGeometry( GEOSGeometry *splitLine, QVector<QgsGeometry> &newGeometries, bool skipIntersectionCheck ) const
{
if ( !splitLine )
return InvalidInput;
@ -826,7 +826,7 @@ QgsGeometryEngine::EngineOperationResult QgsGeos::splitLinearGeometry( GEOSGeome
return InvalidBaseGeometry;
//first test if linestring intersects geometry. If not, return straight away
if ( !GEOSIntersects_r( geosinit()->ctxt, splitLine, mGeos.get() ) )
if ( !skipIntersectionCheck && !GEOSIntersects_r( geosinit()->ctxt, splitLine, mGeos.get() ) )
return NothingHappened;
//check that split line has no linear intersection
@ -872,7 +872,7 @@ QgsGeometryEngine::EngineOperationResult QgsGeos::splitLinearGeometry( GEOSGeome
return Success;
}
QgsGeometryEngine::EngineOperationResult QgsGeos::splitPolygonGeometry( GEOSGeometry *splitLine, QVector<QgsGeometry> &newGeometries ) const
QgsGeometryEngine::EngineOperationResult QgsGeos::splitPolygonGeometry( GEOSGeometry *splitLine, QVector<QgsGeometry> &newGeometries, bool skipIntersectionCheck ) const
{
if ( !splitLine )
return InvalidInput;
@ -886,7 +886,7 @@ QgsGeometryEngine::EngineOperationResult QgsGeos::splitPolygonGeometry( GEOSGeom
return EngineError;
//first test if linestring intersects geometry. If not, return straight away
if ( !GEOSPreparedIntersects_r( geosinit()->ctxt, mGeosPrepared.get(), splitLine ) )
if ( !skipIntersectionCheck && !GEOSPreparedIntersects_r( geosinit()->ctxt, mGeosPrepared.get(), splitLine ) )
return NothingHappened;
//first union all the polygon rings together (to get them noded, see JTS developer guide)

6
src/core/geometry/qgsgeos.h
View File

@ -227,7 +227,7 @@ class CORE_EXPORT QgsGeos: public QgsGeometryEngine
QVector<QgsGeometry> &newGeometries,
bool topological,
QgsPointSequence &topologyTestPoints,
QString *errorMsg = nullptr ) const override;
QString *errorMsg = nullptr, bool skipIntersectionCheck = false ) const override;
QgsAbstractGeometry *offsetCurve( double distance, int segments, int joinStyle, double miterLimit, QString *errorMsg = nullptr ) const override;
@ -406,8 +406,8 @@ class CORE_EXPORT QgsGeos: public QgsGeometryEngine
//utils for geometry split
bool topologicalTestPointsSplit( const GEOSGeometry *splitLine, QgsPointSequence &testPoints, QString *errorMsg = nullptr ) const;
geos::unique_ptr linePointDifference( GEOSGeometry *GEOSsplitPoint ) const;
EngineOperationResult splitLinearGeometry( GEOSGeometry *splitLine, QVector<QgsGeometry > &newGeometries ) const;
EngineOperationResult splitPolygonGeometry( GEOSGeometry *splitLine, QVector<QgsGeometry > &newGeometries ) const;
EngineOperationResult splitLinearGeometry( GEOSGeometry *splitLine, QVector<QgsGeometry > &newGeometries, bool skipIntersectionCheck ) const;
EngineOperationResult splitPolygonGeometry( GEOSGeometry *splitLine, QVector<QgsGeometry > &newGeometries, bool skipIntersectionCheck ) const;
//utils for reshape
static geos::unique_ptr reshapeLine( const GEOSGeometry *line, const GEOSGeometry *reshapeLineGeos, double precision );