sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-12-15 00:07:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(geometry_checker): do not call crs() on layer from another thread

Browse Source
This commit is contained in:
Jacky Volpes 2024-08-01 17:04:46 +02:00 committed by Nyall Dawson
parent b358ab8a9d
commit fa961c7b5b
6 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
python/PyQt6/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckerutils.sip.in
View File

@ -58,6 +58,7 @@ The geometry will not be reprojected regardless of useMapCrs.
%End
QString layerId() const;
%Docstring
The layer id.

1
python/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckerutils.sip.in
View File

@ -58,6 +58,7 @@ The geometry will not be reprojected regardless of useMapCrs.
%End
QString layerId() const;
%Docstring
The layer id.

4
src/analysis/vector/geometry_checker/qgsgeometrychecker.cpp
View File

@ -149,7 +149,7 @@ bool QgsGeometryChecker::fixError( QgsGeometryCheckError *error, int method, boo
{
const QMap<QgsFeatureId, QList<QgsGeometryCheck::Change>> &layerChanges = it.value();
QgsFeaturePool *featurePool = mFeaturePools[it.key()];
QgsCoordinateTransform t( featurePool->layer()->crs(), mContext->mapCrs, QgsProject::instance() );
QgsCoordinateTransform t( featurePool->crs(), mContext->mapCrs, QgsProject::instance() );
t.setBallparkTransformsAreAppropriate( true );
for ( auto layerChangeIt = layerChanges.constBegin(); layerChangeIt != layerChanges.constEnd(); ++layerChangeIt )
{
@ -189,7 +189,7 @@ bool QgsGeometryChecker::fixError( QgsGeometryCheckError *error, int method, boo
for ( auto it = mFeaturePools.constBegin(); it != mFeaturePools.constEnd(); it++ )
{
QgsFeaturePool *featurePool = it.value();
QgsCoordinateTransform t( mContext->mapCrs, featurePool->layer()->crs(), QgsProject::instance() );
QgsCoordinateTransform t( mContext->mapCrs, featurePool->crs(), QgsProject::instance() );
recheckAreaFeatures[it.key()] = featurePool->getIntersects( t.transform( recheckArea ) );
}

20
src/analysis/vector/geometry_checker/qgsgeometrycheckerror.cpp
View File

@ -63,19 +63,15 @@ QgsGeometryCheckError::QgsGeometryCheckError( const QgsGeometryCheck *check,
}
if ( !layerFeature.useMapCrs() )
{
QgsVectorLayer *vl = layerFeature.layer().data();
if ( vl )
const QgsCoordinateTransform ct( layerFeature.layerCrs(), check->context()->mapCrs, check->context()->transformContext );
try
{
const QgsCoordinateTransform ct( vl->crs(), check->context()->mapCrs, check->context()->transformContext );
try
{
mGeometry.transform( ct );
mErrorLocation = ct.transform( mErrorLocation );
}
catch ( const QgsCsException & )
{
QgsDebugError( QStringLiteral( "Can not show error in current map coordinate reference system" ) );
}
mGeometry.transform( ct );
mErrorLocation = ct.transform( mErrorLocation );
}
catch ( const QgsCsException & )
{
QgsDebugError( QStringLiteral( "Can not show error in current map coordinate reference system" ) );
}
}
}

5
src/analysis/vector/geometry_checker/qgsgeometrycheckerutils.cpp
View File

@ -57,6 +57,11 @@ QgsFeature QgsGeometryCheckerUtils::LayerFeature::feature() const
return mFeature;
}
QgsCoordinateReferenceSystem QgsGeometryCheckerUtils::LayerFeature::layerCrs() const
{
return mFeaturePool->crs();
}
QPointer<QgsVectorLayer> QgsGeometryCheckerUtils::LayerFeature::layer() const
{
return mFeaturePool->layerPtr();

5
src/analysis/vector/geometry_checker/qgsgeometrycheckerutils.h
View File

@ -66,6 +66,11 @@ class ANALYSIS_EXPORT QgsGeometryCheckerUtils
*/
QgsFeature feature() const;
/**
* The layer CRS.
*/
QgsCoordinateReferenceSystem layerCrs() const SIP_SKIP;
/**
* The layer.
*/