Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Backport queued_ltr_backports] [Processing] Fix Dissolve alg for featureless input layer or containing empty/null geometries, when the output is a memory layer (Fix #53392) #57484

Merged
merged 1 commit into from
May 19, 2024
Merged

[Backport queued_ltr_backports] [Processing] Fix Dissolve alg for featureless input layer or containing empty/null geometries, when the output is a memory layer (Fix #53392) #57484

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions src/analysis/processing/qgsalgorithmdissolve.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,16 @@ QVariantMap QgsCollectorAlgorithm::processCollection( const QVariantMap &paramet
if ( !sink )
throw QgsProcessingException( invalidSinkError( parameters, QStringLiteral( "OUTPUT" ) ) );

QVariantMap outputs;
outputs.insert( QStringLiteral( "OUTPUT" ), dest );

const QStringList fields = parameterAsStrings( parameters, QStringLiteral( "FIELD" ), context );

const long count = source->featureCount();

if ( !( count > 0 ) )
return outputs;

QgsFeature f;
QgsFeatureIterator it = source->getFeatures( QgsFeatureRequest(), sourceFlags );

Expand Down Expand Up @@ -67,7 +73,7 @@ QVariantMap QgsCollectorAlgorithm::processCollection( const QVariantMap &paramet
firstFeature = false;
}

if ( f.hasGeometry() && !f.geometry().isNull() )
if ( f.hasGeometry() && !f.geometry().isEmpty() )
{
geomQueue.append( f.geometry() );
if ( maxQueueLength > 0 && geomQueue.length() > maxQueueLength )
Expand All @@ -83,7 +89,13 @@ QVariantMap QgsCollectorAlgorithm::processCollection( const QVariantMap &paramet
current++;
}

if ( !separateDisjoint )
if ( geomQueue.isEmpty() )
{
outputFeature.clearGeometry();
if ( !sink->addFeature( outputFeature, QgsFeatureSink::FastInsert ) )
throw QgsProcessingException( writeFeatureError( sink.get(), parameters, QStringLiteral( "OUTPUT" ) ) );
}
else if ( !separateDisjoint )
{
outputFeature.setGeometry( collector( geomQueue ) );
if ( !sink->addFeature( outputFeature, QgsFeatureSink::FastInsert ) )
Expand Down Expand Up @@ -136,7 +148,7 @@ QVariantMap QgsCollectorAlgorithm::processCollection( const QVariantMap &paramet
attributeHash.insert( indexAttributes, f.attributes() );
}

if ( f.hasGeometry() && !f.geometry().isNull() )
if ( f.hasGeometry() && !f.geometry().isEmpty() )
{
geometryHash[ indexAttributes ].append( f.geometry() );
}
Expand Down Expand Up @@ -190,8 +202,6 @@ QVariantMap QgsCollectorAlgorithm::processCollection( const QVariantMap &paramet
}
}

QVariantMap outputs;
outputs.insert( QStringLiteral( "OUTPUT" ), dest );
return outputs;
}

Expand Down
Loading