Fix missing labels if map rotation is enabled with OTF reprojection

(fix #12025)
qgis · Jun 2, 2015 · 450c3ef · 450c3ef · isabellams · Feb 4, 2016
1 parent d598069
commit 450c3ef
Showing 1 changed file with 27 additions and 11 deletions.
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -3457,6 +3457,33 @@ QgsGeometry* QgsPalLabeling::prepareGeometry( const QgsGeometry* geometry, const
     return 0;
   }
 
+  // Rotate the geometry if needed, before clipping
+  const QgsMapToPixel& m2p = context.mapToPixel();
+  if ( !qgsDoubleNear( m2p.mapRotation(), 0 ) )
+  {
+    QgsPoint center = context.extent().center();
+
+    if ( ct )
+    {
+      try
+      {
+        center = ct->transform( center );
+      }
+      catch ( QgsCsException &cse )
+      {
+        Q_UNUSED( cse );
+        QgsDebugMsgLevel( QString( "Ignoring feature due to transformation exception" ), 4 );
+        return 0;
+      }
+    }
+
+    if ( geom->rotate( m2p.mapRotation(), center ) )
+    {
+      QgsDebugMsg( QString( "Error rotating geometry" ).arg( geom->exportToWkt() ) );
+      return 0;
+    }
+  }
+
   if ( !geom->asGeos() )
     return 0;  // there is something really wrong with the geometry
 
@@ -3472,17 +3499,6 @@ QgsGeometry* QgsPalLabeling::prepareGeometry( const QgsGeometry* geometry, const
     clonedGeometry.reset( geom );
   }
 
-  // Rotate the geometry if needed, before clipping
-  const QgsMapToPixel& m2p = context.mapToPixel();
-  if ( !qgsDoubleNear( m2p.mapRotation(), 0 ) )
-  {
-    if ( geom->rotate( m2p.mapRotation(), context.extent().center() ) )
-    {
-      QgsDebugMsg( QString( "Error rotating geometry" ).arg( geom->exportToWkt() ) );
-      return 0;
-    }
-  }
-
   if ( clipGeometry && !clipGeometry->contains( geom ) )
   {
     QgsGeometry* clipGeom = geom->intersection( clipGeometry ); // creates new geometry