Remove redundant scaling factor (the values are set to a fixed range

shortly after this code executes)
qgis · Dec 27, 2019 · cb62685 · cb62685
1 parent 49dccd8
commit cb62685
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/src/core/pal/costcalculator.cpp b/src/core/pal/costcalculator.cpp
@@ -116,8 +116,7 @@ void CostCalculator::calculateCandidatePolygonRingDistanceCosts( std::vector< st
   double maxCandidateRingDistanceCost = std::numeric_limits< double >::lowest();
   for ( std::unique_ptr< LabelPosition > &pos : lPos )
   {
-    // 4* multiplier came from original pal library logic - TODO: evaluate if this is still appropriate
-    const double candidatePolygonRingDistanceCost = 4 * calculatePolygonRingDistance( pos.get(), obstacles, bbx, bby );
+    const double candidatePolygonRingDistanceCost = calculatePolygonRingDistance( pos.get(), obstacles, bbx, bby );
 
     minCandidateRingDistanceCost = std::min( minCandidateRingDistanceCost, candidatePolygonRingDistanceCost );
     maxCandidateRingDistanceCost = std::max( maxCandidateRingDistanceCost, candidatePolygonRingDistanceCost );