Skip to content
Permalink
Browse files

Merge pull request #3193 from nirvn/pal_fix_quadrant

[pal] fix quadrant exp. wrongly overwriting cartographic placement (fixes #14989)
  • Loading branch information
nyalldawson committed Jun 10, 2016
2 parents a376867 + 7c34c53 commit 3afb05c21d87056381dfec52fe42d7da52caa912
Showing with 3 additions and 3 deletions.
  1. +3 −3 src/core/pal/feature.cpp
@@ -1308,10 +1308,10 @@ int FeaturePart::createCandidates( QList< LabelPosition*>& lPos,
switch ( type )
{
case GEOS_POINT:
if ( mLF->layer()->arrangement() == QgsPalLayerSettings::OverPoint || mLF->hasFixedQuadrant() )
createCandidatesOverPoint( x[0], y[0], lPos, angle );
else if ( mLF->layer()->arrangement() == QgsPalLayerSettings::OrderedPositionsAroundPoint )
if ( mLF->layer()->arrangement() == QgsPalLayerSettings::OrderedPositionsAroundPoint )
createCandidatesAtOrderedPositionsOverPoint( x[0], y[0], lPos, angle );
else if ( mLF->layer()->arrangement() == QgsPalLayerSettings::OverPoint || mLF->hasFixedQuadrant() )
createCandidatesOverPoint( x[0], y[0], lPos, angle );
else
createCandidatesAroundPoint( x[0], y[0], lPos, angle );
break;

0 comments on commit 3afb05c

Please sign in to comment.
You can’t perform that action at this time.