Be a bit less aggresive at pruning small feature polygon label candidates

nyalldawson · nyalldawson · commit 30540120c919 · 2020-05-04T05:38:48.000+10:00
diff --git a/src/core/pal/feature.cpp b/src/core/pal/feature.cpp
@@ -1875,7 +1875,7 @@ std::size_t FeaturePart::createCandidatesOutsidePolygon( std::vector<std::unique
   const double ringLength = ring->length();
   const double circleArea = std::pow( ringLength, 2 ) / ( 4 * M_PI );
   const std::size_t candidatesForArea = static_cast< std::size_t>( std::ceil( mLF->layer()->mPal->maximumPolygonCandidatesPerMapUnitSquared() * circleArea ) );
-  const std::size_t targetPolygonCandidates = std::max( static_cast< std::size_t >( 4 ), maxPolygonCandidates > 0 ? std::min( maxPolygonCandidates,  candidatesForArea ) : candidatesForArea );
+  const std::size_t targetPolygonCandidates = std::max( static_cast< std::size_t >( 16 ), maxPolygonCandidates > 0 ? std::min( maxPolygonCandidates,  candidatesForArea ) : candidatesForArea );
 
   // assume each position generates one candidate
   const double delta = ringLength / targetPolygonCandidates;
diff --git a/src/core/pal/pal.cpp b/src/core/pal/pal.cpp
@@ -312,7 +312,7 @@ std::unique_ptr<Problem> Pal::extract( const QgsRectangle &extent, const QgsGeom
           break;
 
         case GEOS_POLYGON:
-          maxCandidates = std::max( static_cast< std::size_t >( 4 ), feat->feature->maximumPolygonCandidates() );
+          maxCandidates = std::max( static_cast< std::size_t >( 16 ), feat->feature->maximumPolygonCandidates() );
           break;
       }
 

Original file line number	Diff line number	Diff line change
`@@ -312,7 +312,7 @@ std::unique_ptr<Problem> Pal::extract( const QgsRectangle &extent, const QgsGeom`
`312`	`312`	`break;`
`313`	`313`
`314`	`314`	`case GEOS_POLYGON:`
`315`		`- maxCandidates = std::max( static_cast< std::size_t >( 4 ), feat->feature->maximumPolygonCandidates() );`
	`315`	`+ maxCandidates = std::max( static_cast< std::size_t >( 16 ), feat->feature->maximumPolygonCandidates() );`
`316`	`316`	`break;`
`317`	`317`	`}`
`318`	`318`