mirror of
https://github.com/qgis/QGIS.git
synced 2025-12-15 00:07:25 -05:00
Merge pull request #61508 from Djedouas/checker_fix_delete_features
Processing: Add Fix Geometry algorithm and test: delete features
This commit is contained in:
Loïc Bartoletti
GitHub
commit
6acf097d33
@ -63,6 +63,7 @@ set(QGIS_ANALYSIS_SRCS
|
||||
processing/qgsalgorithmcentroid.cpp
|
||||
processing/qgsalgorithmcheckgeometrysegmentlength.cpp
|
||||
processing/qgsalgorithmcheckgeometryangle.cpp
|
||||
processing/qgsalgorithmfixgeometrydeletefeatures.cpp
|
||||
processing/qgsalgorithmfixgeometryangle.cpp
|
||||
processing/qgsalgorithmfixgeometrygap.cpp
|
||||
processing/qgsalgorithmcheckgeometryhole.cpp
|
||||
|
||||
@ -0,0 +1,185 @@
|
||||
/***************************************************************************
|
||||
qgsalgorithmfixgeometrydeletefeatures.cpp
|
||||
---------------------
|
||||
begin : April 2025
|
||||
copyright : (C) 2025 by Jacky Volpes
|
||||
email : jacky dot volpes at oslandia dot com
|
||||
***************************************************************************/
|
||||
|
||||
/***************************************************************************
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
* it under the terms of the GNU General Public License as published by *
|
||||
* the Free Software Foundation; either version 2 of the License, or *
|
||||
* (at your option) any later version. *
|
||||
* *
|
||||
***************************************************************************/
|
||||
|
||||
#include "qgsalgorithmfixgeometrydeletefeatures.h"
|
||||
|
||||
///@cond PRIVATE
|
||||
|
||||
QString QgsFixGeometryDeleteFeaturesAlgorithm::name() const
|
||||
{
|
||||
return QStringLiteral( "fixgeometrydeletefeatures" );
|
||||
}
|
||||
|
||||
QString QgsFixGeometryDeleteFeaturesAlgorithm::displayName() const
|
||||
{
|
||||
return QObject::tr( "Fix geometry (delete features)" );
|
||||
}
|
||||
|
||||
QStringList QgsFixGeometryDeleteFeaturesAlgorithm::tags() const
|
||||
{
|
||||
return QObject::tr( "fix,delete,features" ).split( ',' );
|
||||
}
|
||||
|
||||
QString QgsFixGeometryDeleteFeaturesAlgorithm::group() const
|
||||
{
|
||||
return QObject::tr( "Fix geometry" );
|
||||
}
|
||||
|
||||
QString QgsFixGeometryDeleteFeaturesAlgorithm::groupId() const
|
||||
{
|
||||
return QStringLiteral( "fixgeometry" );
|
||||
}
|
||||
|
||||
QString QgsFixGeometryDeleteFeaturesAlgorithm::shortHelpString() const
|
||||
{
|
||||
return QObject::tr( "This algorithm deletes error features listed in the errors layer from a check geometry algorithm.\n"
|
||||
"The required inputs are the original layer used in the check algorithm, its unique id field, and its corresponding errors layer.\n\n"
|
||||
"For instance, it can be used after the following check algorithms to delete error features:"
|
||||
"<html><ul><li>contained</li>"
|
||||
"<li>degenerate</li>"
|
||||
"<li>segment length</li>"
|
||||
"<li>duplicate</li>"
|
||||
"<li>etc.</li></ul></html>" );
|
||||
}
|
||||
|
||||
QgsFixGeometryDeleteFeaturesAlgorithm *QgsFixGeometryDeleteFeaturesAlgorithm::createInstance() const
|
||||
{
|
||||
return new QgsFixGeometryDeleteFeaturesAlgorithm();
|
||||
}
|
||||
|
||||
void QgsFixGeometryDeleteFeaturesAlgorithm::initAlgorithm( const QVariantMap &configuration )
|
||||
{
|
||||
Q_UNUSED( configuration )
|
||||
|
||||
// Inputs
|
||||
addParameter( new QgsProcessingParameterFeatureSource(
|
||||
QStringLiteral( "INPUT" ), QObject::tr( "Input layer" ),
|
||||
QList<int>()
|
||||
<< static_cast<int>( Qgis::ProcessingSourceType::VectorPoint )
|
||||
<< static_cast<int>( Qgis::ProcessingSourceType::VectorLine )
|
||||
<< static_cast<int>( Qgis::ProcessingSourceType::VectorPolygon )
|
||||
) );
|
||||
addParameter( new QgsProcessingParameterFeatureSource(
|
||||
QStringLiteral( "ERRORS" ), QObject::tr( "Error layer" ), QList<int>() << static_cast<int>( Qgis::ProcessingSourceType::VectorPoint )
|
||||
) );
|
||||
addParameter( new QgsProcessingParameterField(
|
||||
QStringLiteral( "UNIQUE_ID" ), QObject::tr( "Field of original feature unique identifier" ),
|
||||
QString(), QStringLiteral( "ERRORS" )
|
||||
) );
|
||||
|
||||
// Outputs
|
||||
addParameter( new QgsProcessingParameterFeatureSink(
|
||||
QStringLiteral( "OUTPUT" ), QObject::tr( "Output layer" ), Qgis::ProcessingSourceType::VectorAnyGeometry
|
||||
) );
|
||||
addParameter( new QgsProcessingParameterFeatureSink(
|
||||
QStringLiteral( "REPORT" ), QObject::tr( "Report layer" ), Qgis::ProcessingSourceType::VectorPoint
|
||||
) );
|
||||
}
|
||||
|
||||
QVariantMap QgsFixGeometryDeleteFeaturesAlgorithm::processAlgorithm( const QVariantMap ¶meters, QgsProcessingContext &context, QgsProcessingFeedback *feedback )
|
||||
{
|
||||
const std::unique_ptr<QgsProcessingFeatureSource> input( parameterAsSource( parameters, QStringLiteral( "INPUT" ), context ) );
|
||||
if ( !input )
|
||||
throw QgsProcessingException( invalidSourceError( parameters, QStringLiteral( "INPUT" ) ) );
|
||||
|
||||
const std::unique_ptr<QgsProcessingFeatureSource> errors( parameterAsSource( parameters, QStringLiteral( "ERRORS" ), context ) );
|
||||
if ( !errors )
|
||||
throw QgsProcessingException( invalidSourceError( parameters, QStringLiteral( "ERRORS" ) ) );
|
||||
|
||||
const QString featIdFieldName = parameterAsString( parameters, QStringLiteral( "UNIQUE_ID" ), context );
|
||||
|
||||
// Verify that input fields exists
|
||||
const int errorsIdFieldIndex = errors->fields().indexFromName( featIdFieldName );
|
||||
if ( errorsIdFieldIndex == -1 )
|
||||
throw QgsProcessingException( QObject::tr( "Field %1 does not exist in the error layer." ).arg( featIdFieldName ) );
|
||||
const int inputIdFieldIndex = input->fields().indexFromName( featIdFieldName );
|
||||
if ( inputIdFieldIndex == -1 )
|
||||
throw QgsProcessingException( QObject::tr( "Field %1 does not exist in input layer." ).arg( featIdFieldName ) );
|
||||
|
||||
const QgsField inputFeatIdField = input->fields().at( inputIdFieldIndex );
|
||||
const QMetaType::Type inputFeatIdFieldType = inputFeatIdField.type();
|
||||
if ( inputFeatIdFieldType != errors->fields().at( errorsIdFieldIndex ).type() )
|
||||
throw QgsProcessingException( QObject::tr( "Input field %1 does not have the same type as in the error layer." ).arg( featIdFieldName ) );
|
||||
|
||||
QString dest_output;
|
||||
const std::unique_ptr<QgsFeatureSink> sink_output( parameterAsSink( parameters, QStringLiteral( "OUTPUT" ), context, dest_output, input->fields(), input->wkbType(), input->sourceCrs() ) );
|
||||
if ( !sink_output )
|
||||
throw QgsProcessingException( invalidSinkError( parameters, QStringLiteral( "OUTPUT" ) ) );
|
||||
|
||||
QString dest_report;
|
||||
QgsFields reportFields = errors->fields();
|
||||
reportFields.append( QgsField( QStringLiteral( "report" ), QMetaType::QString ) );
|
||||
reportFields.append( QgsField( QStringLiteral( "error_fixed" ), QMetaType::Bool ) );
|
||||
const std::unique_ptr<QgsFeatureSink> sink_report( parameterAsSink( parameters, QStringLiteral( "REPORT" ), context, dest_report, reportFields, errors->wkbType(), errors->sourceCrs() ) );
|
||||
if ( !sink_report )
|
||||
throw QgsProcessingException( invalidSinkError( parameters, QStringLiteral( "REPORT" ) ) );
|
||||
|
||||
QgsFeature inputFeature, errorFeature, reportFeature;
|
||||
reportFeature.setFields( reportFields );
|
||||
long long progression = 0;
|
||||
long long totalProgression = input->featureCount();
|
||||
feedback->setProgressText( QObject::tr( "Fixing errors..." ) );
|
||||
|
||||
QgsFeatureIterator inputFeaturesIt = input->getFeatures();
|
||||
while ( inputFeaturesIt.nextFeature( inputFeature ) )
|
||||
{
|
||||
progression++;
|
||||
feedback->setProgress( static_cast<double>( static_cast<long double>( progression ) / totalProgression ) * 100 );
|
||||
|
||||
QString idValue = inputFeature.attribute( featIdFieldName ).toString();
|
||||
if ( inputFeatIdFieldType == QMetaType::QString )
|
||||
idValue = "'" + idValue + "'";
|
||||
|
||||
QgsFeatureIterator errorFeaturesIt = errors->getFeatures(
|
||||
QgsFeatureRequest()
|
||||
.setFlags( Qgis::FeatureRequestFlag::SubsetOfAttributes ) // the request will select only the fields referenced in the expression
|
||||
.setFilterExpression( "\"" + featIdFieldName + "\" = " + idValue )
|
||||
);
|
||||
if ( errorFeaturesIt.nextFeature( errorFeature ) && errorFeature.isValid() )
|
||||
{
|
||||
// We found an error feature corresponding to the input feature we are iterating
|
||||
// so it means that we want to delete this feature.
|
||||
// Just don't add this feature to the output sink, and add a report feature saying
|
||||
// that everything went fine.
|
||||
reportFeature.setGeometry( errorFeature.geometry() );
|
||||
reportFeature.setAttributes( errorFeature.attributes() << QStringLiteral( "Feature deleted" ) << true );
|
||||
if ( !sink_report->addFeature( reportFeature, QgsFeatureSink::FastInsert ) )
|
||||
throw QgsProcessingException( writeFeatureError( sink_report.get(), parameters, QStringLiteral( "REPORT" ) ) );
|
||||
}
|
||||
else
|
||||
{
|
||||
// We didn't find an error corresponding to this feature, so we must keep this feature.
|
||||
// Just add it to the output sink.
|
||||
if ( !sink_output->addFeature( inputFeature, QgsFeatureSink::FastInsert ) )
|
||||
throw QgsProcessingException( writeFeatureError( sink_output.get(), parameters, QStringLiteral( "OUTPUT" ) ) );
|
||||
}
|
||||
}
|
||||
feedback->setProgress( 100 );
|
||||
|
||||
QVariantMap outputs;
|
||||
outputs.insert( QStringLiteral( "OUTPUT" ), dest_output );
|
||||
outputs.insert( QStringLiteral( "REPORT" ), dest_report );
|
||||
|
||||
return outputs;
|
||||
}
|
||||
|
||||
Qgis::ProcessingAlgorithmFlags QgsFixGeometryDeleteFeaturesAlgorithm::flags() const
|
||||
{
|
||||
return QgsProcessingAlgorithm::flags() | Qgis::ProcessingAlgorithmFlag::NoThreading;
|
||||
}
|
||||
|
||||
///@endcond
|
||||
@ -0,0 +1,48 @@
|
||||
/***************************************************************************
|
||||
qgsalgorithmfixgeometrydeletefeatures.h
|
||||
---------------------
|
||||
begin : April 2025
|
||||
copyright : (C) 2025 by Jacky Volpes
|
||||
email : jacky dot volpes at oslandia dot com
|
||||
***************************************************************************/
|
||||
|
||||
/***************************************************************************
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
* it under the terms of the GNU General Public License as published by *
|
||||
* the Free Software Foundation; either version 2 of the License, or *
|
||||
* (at your option) any later version. *
|
||||
* *
|
||||
***************************************************************************/
|
||||
|
||||
#ifndef QGSALGORITHMFIXGEOMETRYDELETEFEATURES_H
|
||||
#define QGSALGORITHMFIXGEOMETRYDELETEFEATURES_H
|
||||
|
||||
#define SIP_NO_FILE
|
||||
|
||||
#include "qgis_sip.h"
|
||||
#include "qgsprocessingalgorithm.h"
|
||||
|
||||
///@cond PRIVATE
|
||||
|
||||
class QgsFixGeometryDeleteFeaturesAlgorithm : public QgsProcessingAlgorithm
|
||||
{
|
||||
public:
|
||||
QgsFixGeometryDeleteFeaturesAlgorithm() = default;
|
||||
void initAlgorithm( const QVariantMap &configuration = QVariantMap() ) override;
|
||||
QString name() const override;
|
||||
QString displayName() const override;
|
||||
QStringList tags() const override;
|
||||
QString group() const override;
|
||||
QString groupId() const override;
|
||||
QString shortHelpString() const override;
|
||||
Qgis::ProcessingAlgorithmFlags flags() const override;
|
||||
QgsFixGeometryDeleteFeaturesAlgorithm *createInstance() const override SIP_FACTORY;
|
||||
|
||||
protected:
|
||||
QVariantMap processAlgorithm( const QVariantMap ¶meters, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;
|
||||
};
|
||||
|
||||
///@endcond PRIVATE
|
||||
|
||||
#endif // QGSALGORITHMFIXGEOMETRYDELETEFEATURES_H
|
||||
@ -46,6 +46,7 @@
|
||||
#include "qgsalgorithmcheckgeometrysegmentlength.h"
|
||||
#include "qgsalgorithmcheckgeometryangle.h"
|
||||
#include "qgsalgorithmcheckgeometryarea.h"
|
||||
#include "qgsalgorithmfixgeometrydeletefeatures.h"
|
||||
#include "qgsalgorithmfixgeometrygap.h"
|
||||
#include "qgsalgorithmfixgeometryarea.h"
|
||||
#include "qgsalgorithmfixgeometryhole.h"
|
||||
@ -628,6 +629,7 @@ void QgsNativeAlgorithms::loadAlgorithms()
|
||||
addAlgorithm( new QgsPolygonsToLinesAlgorithm() );
|
||||
addAlgorithm( new QgsDensifyGeometriesByIntervalAlgorithm() );
|
||||
addAlgorithm( new QgsDensifyGeometriesByCountAlgorithm() );
|
||||
addAlgorithm( new QgsFixGeometryDeleteFeaturesAlgorithm() );
|
||||
addAlgorithm( new QgsFixGeometryAngleAlgorithm() );
|
||||
addAlgorithm( new QgsFixGeometryGapAlgorithm() );
|
||||
addAlgorithm( new QgsFixGeometryAreaAlgorithm() );
|
||||
|
||||
@ -39,6 +39,8 @@ class TestQgsProcessingFixGeometry : public QgsTest
|
||||
void fixAreaAlg_data();
|
||||
void fixAreaAlg();
|
||||
|
||||
void fixDeleteFeaturesAlg_data();
|
||||
void fixDeleteFeaturesAlg();
|
||||
void fixGapAlg_data();
|
||||
void fixGapAlg();
|
||||
|
||||
@ -459,5 +461,93 @@ void TestQgsProcessingFixGeometry::fixMissingVertexAlg()
|
||||
}
|
||||
}
|
||||
|
||||
void TestQgsProcessingFixGeometry::fixDeleteFeaturesAlg_data()
|
||||
{
|
||||
const QDir testDataDir( QDir( TEST_DATA_DIR ).absoluteFilePath( "geometry_checker" ) );
|
||||
QTest::addColumn<QgsVectorLayer *>( "sourceLayer" );
|
||||
QTest::addColumn<QgsVectorLayer *>( "errorsLayer" );
|
||||
QTest::addColumn<QStringList>( "reportList" );
|
||||
|
||||
QTest::newRow( "Points" )
|
||||
<< new QgsVectorLayer( testDataDir.absoluteFilePath( "point_layer.shp" ), QStringLiteral( "point layer" ), QStringLiteral( "ogr" ) )
|
||||
<< new QgsVectorLayer( mDataDir.absoluteFilePath( "delete_features.gpkg|layername=points_to_delete" ), QStringLiteral( "points to delete" ), QStringLiteral( "ogr" ) )
|
||||
<< ( QStringList()
|
||||
<< QStringLiteral( "Feature deleted" )
|
||||
<< QStringLiteral( "Feature deleted" ) );
|
||||
|
||||
QTest::newRow( "Lines" )
|
||||
<< new QgsVectorLayer( testDataDir.absoluteFilePath( "line_layer.shp" ), QStringLiteral( "line layer" ), QStringLiteral( "ogr" ) )
|
||||
<< new QgsVectorLayer( mDataDir.absoluteFilePath( "delete_features.gpkg|layername=lines_to_delete" ), QStringLiteral( "lines to delete" ), QStringLiteral( "ogr" ) )
|
||||
<< ( QStringList()
|
||||
<< QStringLiteral( "Feature deleted" )
|
||||
<< QStringLiteral( "Feature deleted" ) );
|
||||
|
||||
QTest::newRow( "Polygons" )
|
||||
<< new QgsVectorLayer( testDataDir.absoluteFilePath( "polygon_layer.shp" ), QStringLiteral( "polygon layer" ), QStringLiteral( "ogr" ) )
|
||||
<< new QgsVectorLayer( mDataDir.absoluteFilePath( "delete_features.gpkg|layername=polygons_to_delete" ), QStringLiteral( "polygons to delete" ), QStringLiteral( "ogr" ) )
|
||||
<< ( QStringList()
|
||||
<< QStringLiteral( "Feature deleted" )
|
||||
<< QStringLiteral( "Feature deleted" )
|
||||
<< QStringLiteral( "Feature deleted" )
|
||||
<< QStringLiteral( "Feature deleted" )
|
||||
<< QStringLiteral( "Feature deleted" )
|
||||
<< QStringLiteral( "Feature deleted" )
|
||||
<< QStringLiteral( "Feature deleted" )
|
||||
<< QStringLiteral( "Feature deleted" )
|
||||
<< QStringLiteral( "Feature deleted" )
|
||||
<< QStringLiteral( "Feature deleted" )
|
||||
<< QStringLiteral( "Feature deleted" )
|
||||
<< QStringLiteral( "Feature deleted" )
|
||||
<< QStringLiteral( "Feature deleted" )
|
||||
<< QStringLiteral( "Feature deleted" )
|
||||
<< QStringLiteral( "Feature deleted" )
|
||||
<< QStringLiteral( "Feature deleted" ) );
|
||||
}
|
||||
|
||||
void TestQgsProcessingFixGeometry::fixDeleteFeaturesAlg()
|
||||
{
|
||||
QFETCH( QgsVectorLayer *, sourceLayer );
|
||||
QFETCH( QgsVectorLayer *, errorsLayer );
|
||||
QFETCH( QStringList, reportList );
|
||||
|
||||
QVERIFY( sourceLayer->isValid() );
|
||||
QVERIFY( errorsLayer->isValid() );
|
||||
|
||||
const std::unique_ptr<QgsProcessingAlgorithm> alg(
|
||||
QgsApplication::processingRegistry()->createAlgorithmById( QStringLiteral( "native:fixgeometrydeletefeatures" ) )
|
||||
);
|
||||
QVERIFY( alg != nullptr );
|
||||
|
||||
QVariantMap parameters;
|
||||
parameters.insert( QStringLiteral( "INPUT" ), QVariant::fromValue( QgsProcessingFeatureSourceDefinition( sourceLayer->source() ) ) );
|
||||
parameters.insert( QStringLiteral( "UNIQUE_ID" ), "id" );
|
||||
parameters.insert( QStringLiteral( "ERRORS" ), QVariant::fromValue( QgsProcessingFeatureSourceDefinition( errorsLayer->source() ) ) );
|
||||
parameters.insert( QStringLiteral( "OUTPUT" ), QgsProcessing::TEMPORARY_OUTPUT );
|
||||
parameters.insert( QStringLiteral( "REPORT" ), QgsProcessing::TEMPORARY_OUTPUT );
|
||||
|
||||
bool ok = false;
|
||||
QgsProcessingFeedback feedback;
|
||||
auto context = std::make_unique<QgsProcessingContext>();
|
||||
|
||||
QVariantMap results;
|
||||
results = alg->run( parameters, *context, &feedback, &ok );
|
||||
QVERIFY( ok );
|
||||
|
||||
std::unique_ptr<QgsVectorLayer> outputLayer( qobject_cast<QgsVectorLayer *>( context->getMapLayer( results.value( QStringLiteral( "OUTPUT" ) ).toString() ) ) );
|
||||
std::unique_ptr<QgsVectorLayer> reportLayer( qobject_cast<QgsVectorLayer *>( context->getMapLayer( results.value( QStringLiteral( "REPORT" ) ).toString() ) ) );
|
||||
QVERIFY( reportLayer->isValid() );
|
||||
QVERIFY( outputLayer->isValid() );
|
||||
|
||||
QCOMPARE( outputLayer->featureCount(), sourceLayer->featureCount() - reportList.count() );
|
||||
QCOMPARE( reportLayer->featureCount(), reportList.count() );
|
||||
int idx = 1;
|
||||
for ( const QString &expectedReport : reportList )
|
||||
{
|
||||
const QgsFeature reportFeature = reportLayer->getFeature( idx );
|
||||
QCOMPARE( reportFeature.attribute( "report" ), expectedReport );
|
||||
idx++;
|
||||
}
|
||||
}
|
||||
|
||||
QGSTEST_MAIN( TestQgsProcessingFixGeometry )
|
||||
#include "testqgsprocessingfixgeometry.moc"
|
||||
|
||||
BIN
tests/testdata/geometry_fix/delete_features.gpkg
vendored
Normal file
BIN
tests/testdata/geometry_fix/delete_features.gpkg
vendored
Normal file
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user