port Minimum bounding geometry algorithm to C++ #62594
Open
+421
−354
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
alexbruy
added
the
Processing
🍎 MacOS Qt6 buildsDownload MacOS Qt6 builds of this PR for testing. 🪟 Windows buildsDownload Windows builds of this PR for testing. 🪟 Windows Qt6 buildsDownload Windows Qt6 builds of this PR for testing. |
alexbruy
force-pushed
the
processing-min-bounding-geometry-cpp
branch
2 times, most recently
from
5a37812 to
2031a99
Compare
nyalldawson
approved these changes
Jul 22, 2025
src/analysis/processing/qgsalgorithmminimumboundinggeometry.cpp
Outdated
Show resolved
Hide resolved
src/analysis/processing/qgsalgorithmminimumboundinggeometry.cpp
Outdated
Show resolved
Hide resolved
Comment on lines
180
to
186
| if ( !geometryHash.contains( fieldValue ) ) | ||
| { | ||
| geometryHash.insert( fieldValue, QVector<QgsGeometry>() << f.geometry() ); | ||
| } | ||
| else | ||
| { | ||
| geometryHash.insert( fieldValue, geometryHash[fieldValue] << f.geometry() ); |
There was a problem hiding this comment.
Suggested change
| if ( !geometryHash.contains( fieldValue ) ) | |
| { | |
| geometryHash.insert( fieldValue, QVector<QgsGeometry>() << f.geometry() ); | |
| } | |
| else | |
| { | |
| geometryHash.insert( fieldValue, geometryHash[fieldValue] << f.geometry() ); | |
| auto geometryHashIt = geometryHash.constFind( fieldValue ); | |
| if ( geometryHashIt == geometryHash.constEnd() ) | |
| { | |
| geometryHash.insert( fieldValue, QVector<QgsGeometry>() << f.geometry() ); | |
| } | |
| else | |
| { | |
| geometryHash.insert( fieldValue, geometryHashIt.value() << f.geometry() ); |
There was a problem hiding this comment.
It seems to me, that we need to use non-const find() here as we modify iterator value in the else branch.
|
If not done (afaict, not yet in the help text), should we also cover the situation where a group or layer would contain one singlepart point feature, as done in #62300? |
alexbruy
force-pushed
the
processing-min-bounding-geometry-cpp
branch
from
2031a99 to
e93e8f0
Compare
nyalldawson
reviewed
Jul 23, 2025
Comment on lines
+167
to
+176
| auto boundsHashIt = boundsHash.constFind( fieldValue ); | ||
| if ( boundsHashIt == boundsHash.constEnd() ) | ||
| { | ||
| boundsHash.insert( fieldValue, f.geometry().boundingBox() ); | ||
| } | ||
| else | ||
| { | ||
| QgsRectangle r = boundsHashIt.value(); | ||
| r.combineExtentWith( f.geometry().boundingBox() ); | ||
| boundsHash.insert( fieldValue, r ); |
There was a problem hiding this comment.
Does this work?
Suggested change
| auto boundsHashIt = boundsHash.constFind( fieldValue ); | |
| if ( boundsHashIt == boundsHash.constEnd() ) | |
| { | |
| boundsHash.insert( fieldValue, f.geometry().boundingBox() ); | |
| } | |
| else | |
| { | |
| QgsRectangle r = boundsHashIt.value(); | |
| r.combineExtentWith( f.geometry().boundingBox() ); | |
| boundsHash.insert( fieldValue, r ); | |
| auto boundsHashIt = boundsHash.find( fieldValue ); | |
| if ( boundsHashIt == boundsHash.end() ) | |
| { | |
| boundsHash.insert( fieldValue, f.geometry().boundingBox() ); | |
| } | |
| else | |
| { | |
| boundsHashIt.value().combineExtentWith( f.geometry().boundingBox() ); |
Comment on lines
+181
to
+188
| auto geometryHashIt = geometryHash.find( fieldValue ); | ||
| if ( geometryHashIt == geometryHash.constEnd() ) | ||
| { | ||
| geometryHash.insert( fieldValue, QVector<QgsGeometry>() << f.geometry() ); | ||
| } | ||
| else | ||
| { | ||
| geometryHash.insert( fieldValue, geometryHashIt.value() << f.geometry() ); |
There was a problem hiding this comment.
Suggested change
| auto geometryHashIt = geometryHash.find( fieldValue ); | |
| if ( geometryHashIt == geometryHash.constEnd() ) | |
| { | |
| geometryHash.insert( fieldValue, QVector<QgsGeometry>() << f.geometry() ); | |
| } | |
| else | |
| { | |
| geometryHash.insert( fieldValue, geometryHashIt.value() << f.geometry() ); | |
| auto geometryHashIt = geometryHash.find( fieldValue ); | |
| if ( geometryHashIt == geometryHash.end() ) | |
| { | |
| geometryHash.insert( fieldValue, QVector<QgsGeometry>() << f.geometry() ); | |
| } | |
| else | |
| { | |
| geometryHashIt.value().append( f.geometry() ); |
| QgsFeature feature = createFeature( feedback, i, geometryType, it.value(), it.key() ); | ||
| if ( !sink->addFeature( feature, QgsFeatureSink::FastInsert ) ) | ||
| throw QgsProcessingException( writeFeatureError( sink.get(), parameters, QStringLiteral( "OUTPUT" ) ) ); | ||
| geometryHash.insert( it.key(), QVector<QgsGeometry>() ); |
There was a problem hiding this comment.
actually this is going to cause issues -- we can't modify geometryHash while we're iterating over it. What's this used for anyway? Aren't we finished with the hash when we're creating the features?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Port Processing Minimum bounding geometry algorithm from Python to C++.