Merge pull request #2852 from ahuarte47/Labeling_CheckBoundingBoxes

nyalldawson · nyalldawson · commit bd140a75bb73 · 2016-03-07T12:02:28.000+11:00
[Improvement] Use BoundingBoxes in labeling
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -3827,17 +3827,17 @@ bool QgsPalLabeling::geometryRequiresPreparation( const QgsGeometry* geometry, Q
   if ( ct )
     return true;
 
-  //requires fixing
-  if ( geometry->type() == QGis::Polygon && !geometry->isGeosValid() )
-    return true;
-
   //requires rotation
   const QgsMapToPixel& m2p = context.mapToPixel();
   if ( !qgsDoubleNear( m2p.mapRotation(), 0 ) )
     return true;
 
   //requires clip
-  if ( clipGeometry && !clipGeometry->contains( geometry ) )
+  if ( clipGeometry && !clipGeometry->boundingBox().contains( geometry->boundingBox() ) )
+    return true;
+
+  //requires fixing
+  if ( geometry->type() == QGis::Polygon && !geometry->isGeosValid() )
     return true;
 
   return false;
@@ -3944,7 +3944,9 @@ QgsGeometry* QgsPalLabeling::prepareGeometry( const QgsGeometry* geometry, QgsRe
     clonedGeometry.reset( geom );
   }
 
-  if ( clipGeometry && !clipGeometry->contains( geom ) )
+  if ( clipGeometry &&
+       (( qgsDoubleNear( m2p.mapRotation(), 0 ) && !clipGeometry->boundingBox().contains( geom->boundingBox() ) )
+        || ( !qgsDoubleNear( m2p.mapRotation(), 0 ) && !clipGeometry->contains( geom ) ) ) )
   {
     QgsGeometry* clipGeom = geom->intersection( clipGeometry ); // creates new geometry
     if ( !clipGeom )
