[pal] fix quadrant exp. wrongly overwriting cartographic placement

nirvn · nirvn · commit 7c34c53709b8 · 2016-06-10T08:59:18.000+07:00
(fixes #14989)
diff --git a/src/core/pal/feature.cpp b/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;
