sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-09 00:08:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix point distance renderer handling of crs transform

Browse Source
This commit is contained in:
Nyall Dawson 2016-09-19 13:38:24 +10:00
parent c671bad773
commit 3dcc69a41a
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/core/symbology-ng/qgspointdistancerenderer.cpp
View File

@ -81,19 +81,27 @@ bool QgsPointDistanceRenderer::renderFeature( QgsFeature& feature, QgsRenderCont
label = getLabel( feature ); label = getLabel( feature );
} }
QgsCoordinateTransform xform = context.coordinateTransform();
QgsFeature transformedFeature = feature;
if ( xform.isValid() )
{
geom.transform( xform );
transformedFeature.setGeometry( geom );
}
double searchDistance = mTolerance * QgsSymbolLayerUtils::mapUnitScaleFactor( context, mToleranceUnit, mToleranceMapUnitScale ); double searchDistance = mTolerance * QgsSymbolLayerUtils::mapUnitScaleFactor( context, mToleranceUnit, mToleranceMapUnitScale );
QgsPoint point = feature.geometry().asPoint(); QgsPoint point = transformedFeature.geometry().asPoint();
QList<QgsFeatureId> intersectList = mSpatialIndex->intersects( searchRect( point, searchDistance ) ); QList<QgsFeatureId> intersectList = mSpatialIndex->intersects( searchRect( point, searchDistance ) );
if ( intersectList.empty() ) if ( intersectList.empty() )
{ {
mSpatialIndex->insertFeature( feature ); mSpatialIndex->insertFeature( transformedFeature );
// create new group // create new group
ClusteredGroup newGroup; ClusteredGroup newGroup;
newGroup << GroupedFeature( feature, symbol, selected, label ); newGroup << GroupedFeature( transformedFeature, symbol, selected, label );
mClusteredGroups.push_back( newGroup ); mClusteredGroups.push_back( newGroup );
// add to group index // add to group index
mGroupIndex.insert( feature.id(), mClusteredGroups.count() - 1 ); mGroupIndex.insert( transformedFeature.id(), mClusteredGroups.count() - 1 );
mGroupLocations.insert( feature.id(), point ); mGroupLocations.insert( transformedFeature.id(), point );
} }
else else
{ {
@ -120,9 +128,9 @@ bool QgsPointDistanceRenderer::renderFeature( QgsFeature& feature, QgsRenderCont
( oldCenter.y() * group.size() + point.y() ) / ( group.size() + 1.0 ) ); ( oldCenter.y() * group.size() + point.y() ) / ( group.size() + 1.0 ) );
// add to a group // add to a group
group << GroupedFeature( feature, symbol, selected, label ); group << GroupedFeature( transformedFeature, symbol, selected, label );
// add to group index // add to group index
mGroupIndex.insert( feature.id(), groupIdx ); mGroupIndex.insert( transformedFeature.id(), groupIdx );
} }
return true; return true;
@ -138,7 +146,8 @@ void QgsPointDistanceRenderer::drawGroup( const ClusteredGroup& group, QgsRender
} }
QgsGeometry groupGeom( groupMultiPoint ); QgsGeometry groupGeom( groupMultiPoint );
QgsGeometry centroid = groupGeom.centroid(); QgsGeometry centroid = groupGeom.centroid();
QPointF pt = _getPoint( context, *static_cast<QgsPointV2*>( centroid.geometry() ) ); QPointF pt = centroid.asQPointF();
context.mapToPixel().transformInPlace( pt.rx(), pt.ry() );
context.expressionContext().appendScope( createGroupScope( group ) ); context.expressionContext().appendScope( createGroupScope( group ) );
drawGroup( pt, context, group ); drawGroup( pt, context, group );