Move to unified single geometry check

m-kuhn · m-kuhn · commit 5d7c33eb1f53 · 2018-10-15T14:27:55.000+02:00
diff --git a/src/analysis/vector/geometry_checker/qgssinglegeometrycheck.cpp b/src/analysis/vector/geometry_checker/qgssinglegeometrycheck.cpp
@@ -100,3 +100,8 @@ bool QgsGeometryCheckErrorSingle::handleChanges( const QgsGeometryCheck::Changes
 
   return mError->handleChanges( changes.value( layerId() ).value( featureId() ) );
 }
+
+void QgsSingleGeometryCheck::collectErrors( QList<QgsGeometryCheckError *> &errors, QStringList &messages, QAtomicInt *progressCounter, const QMap<QString, QgsFeatureIds> &ids ) const
+{
+
+}
diff --git a/src/app/qgsgeometryvalidationservice.cpp b/src/app/qgsgeometryvalidationservice.cpp
@@ -87,6 +87,7 @@ void QgsGeometryValidationService::processFeature( QgsVectorLayer *layer, QgsFea
   emit geometryCheckStarted( layer, fid );
 
   QgsFeature feature = layer->getFeature( fid );
-  const auto errors = mIsValidGeometryCheck->collectErrors( feature );
+  // TODO: this is a bit hardcore
+  const auto errors = mIsValidGeometryCheck->processGeometry( QgsGeometryCheckerUtils::LayerFeature( nullptr, feature ) );
   emit geometryCheckCompleted( layer, fid, errors );
 }

Original file line number	Diff line number	Diff line change
`@@ -100,3 +100,8 @@ bool QgsGeometryCheckErrorSingle::handleChanges( const QgsGeometryCheck::Changes`
`100`	`100`
`101`	`101`	`return mError->handleChanges( changes.value( layerId() ).value( featureId() ) );`
`102`	`102`	`}`
	`103`	`+`
	`104`	`+void QgsSingleGeometryCheck::collectErrors( QList<QgsGeometryCheckError > &errors, QStringList &messages, QAtomicInt progressCounter, const QMap<QString, QgsFeatureIds> &ids ) const`
	`105`	`+{`
	`106`	`+`
	`107`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,7 @@ void QgsGeometryValidationService::processFeature( QgsVectorLayer *layer, QgsFea`
`87`	`87`	`emit geometryCheckStarted( layer, fid );`
`88`	`88`
`89`	`89`	`QgsFeature feature = layer->getFeature( fid );`
`90`		`- const auto errors = mIsValidGeometryCheck->collectErrors( feature );`
	`90`	`+ // TODO: this is a bit hardcore`
	`91`	`+ const auto errors = mIsValidGeometryCheck->processGeometry( QgsGeometryCheckerUtils::LayerFeature( nullptr, feature ) );`
`91`	`92`	`emit geometryCheckCompleted( layer, fid, errors );`
`92`	`93`	`}`