add configuration map to constructors of all tests

3nids · m-kuhn · commit 16481d203a25 · 2018-10-15T14:27:57.000+02:00
diff --git a/src/analysis/vector/geometry_checker/qgsgeometryisvalidcheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometryisvalidcheck.cpp
@@ -30,8 +30,6 @@ QList<QgsWkbTypes::GeometryType> QgsGeometryIsValidCheck::compatibleGeometryType
 
 QList<QgsSingleGeometryCheckError *> QgsGeometryIsValidCheck::processGeometry( const QgsGeometry &geometry ) const
 {
-  Q_UNUSED( configuration )
-
   QVector<QgsGeometry::Error> errors;
 
   QgsGeometry::ValidationMethod method = QgsGeometry::ValidatorQgisInternal;
diff --git a/src/analysis/vector/geometry_checker/qgsgeometrysliverpolygoncheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometrysliverpolygoncheck.cpp
@@ -27,5 +27,5 @@ bool QgsGeometrySliverPolygonCheck::checkThreshold( double layerToMapUnits, cons
   {
     return false;
   }
-  return value > mCheckConfiguration.value( QStringLiteral( "thresholdMapUnits" ) ).toDouble(); // the sliver threshold is actually a map unit independent number, just abusing QgsGeometryAreaCheck::mThresholdMapUnits to store it
+  return value > mThreshold; // the sliver threshold is actually a map unit independent number, just abusing QgsGeometryAreaCheck::mThresholdMapUnits to store it
 }
diff --git a/src/app/qgsgeometryvalidationservice.cpp b/src/app/qgsgeometryvalidationservice.cpp
@@ -25,7 +25,7 @@ QgsGeometryValidationService::QgsGeometryValidationService( QgsProject *project
 {
   connect( project, &QgsProject::layersAdded, this, &QgsGeometryValidationService::onLayersAdded );
   // TODO: should not provide a nullptr context
-  mIsValidGeometryCheck = new QgsIsValidGeometryCheck( nullptr );
+  mIsValidGeometryCheck = new QgsIsValidGeometryCheck( nullptr, QVariantMap() );
 }
 
 QgsGeometryValidationService::~QgsGeometryValidationService()
@@ -89,6 +89,6 @@ void QgsGeometryValidationService::processFeature( QgsVectorLayer *layer, QgsFea
 
   QgsFeature feature = layer->getFeature( fid );
   // TODO: this is a bit hardcore
-  const auto errors = mIsValidGeometryCheck->processGeometry( feature.geometry(), QVariantMap() );
+  const auto errors = mIsValidGeometryCheck->processGeometry( feature.geometry() );
   // emit geometryCheckCompleted( layer, fid, errors );
 }

Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,6 @@ QList<QgsWkbTypes::GeometryType> QgsGeometryIsValidCheck::compatibleGeometryType`
`30`	`30`
`31`	`31`	`QList<QgsSingleGeometryCheckError *> QgsGeometryIsValidCheck::processGeometry( const QgsGeometry &geometry ) const`
`32`	`32`	`{`
`33`		`- Q_UNUSED( configuration )`
`34`		`-`
`35`	`33`	`QVector<QgsGeometry::Error> errors;`
`36`	`34`
`37`	`35`	`QgsGeometry::ValidationMethod method = QgsGeometry::ValidatorQgisInternal;`
Original file line number	Diff line number	Diff line change
`@@ -27,5 +27,5 @@ bool QgsGeometrySliverPolygonCheck::checkThreshold( double layerToMapUnits, cons`
`27`	`27`	`{`
`28`	`28`	`return false;`
`29`	`29`	`}`
`30`		`- return value > mCheckConfiguration.value( QStringLiteral( "thresholdMapUnits" ) ).toDouble(); // the sliver threshold is actually a map unit independent number, just abusing QgsGeometryAreaCheck::mThresholdMapUnits to store it`
	`30`	`+ return value > mThreshold; // the sliver threshold is actually a map unit independent number, just abusing QgsGeometryAreaCheck::mThresholdMapUnits to store it`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ QgsGeometryValidationService::QgsGeometryValidationService( QgsProject *project`
`25`	`25`	`{`
`26`	`26`	`connect( project, &QgsProject::layersAdded, this, &QgsGeometryValidationService::onLayersAdded );`
`27`	`27`	`// TODO: should not provide a nullptr context`
`28`		`- mIsValidGeometryCheck = new QgsIsValidGeometryCheck( nullptr );`
	`28`	`+ mIsValidGeometryCheck = new QgsIsValidGeometryCheck( nullptr, QVariantMap() );`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`QgsGeometryValidationService::~QgsGeometryValidationService()`
`@@ -89,6 +89,6 @@ void QgsGeometryValidationService::processFeature( QgsVectorLayer *layer, QgsFea`
`89`	`89`
`90`	`90`	`QgsFeature feature = layer->getFeature( fid );`
`91`	`91`	`// TODO: this is a bit hardcore`
`92`		`- const auto errors = mIsValidGeometryCheck->processGeometry( feature.geometry(), QVariantMap() );`
	`92`	`+ const auto errors = mIsValidGeometryCheck->processGeometry( feature.geometry() );`
`93`	`93`	`// emit geometryCheckCompleted( layer, fid, errors );`
`94`	`94`	`}`