Simplify geometry for labeling

ahuarte47 · ahuarte47 · commit 01ece90f51ab · 2016-05-25T22:50:28.000+02:00
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -58,6 +58,7 @@
 #include <qgsproject.h>
 #include "qgssymbolv2.h"
 #include "qgssymbollayerv2utils.h"
+#include "qgsmaptopixelgeometrysimplifier.h"
 #include <QMessageBox>
 
 
@@ -2422,6 +2423,25 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, QgsRenderContext &cont
     return;
   }
 
+  // simplify?
+  const QgsVectorSimplifyMethod &simplifyMethod = context.vectorSimplifyMethod();
+  QScopedPointer<QgsGeometry> scopedClonedGeom;
+  if ( simplifyMethod.simplifyHints() != QgsVectorSimplifyMethod::NoSimplification && simplifyMethod.forceLocalOptimization() )
+  {
+    int simplifyHints = simplifyMethod.simplifyHints() | QgsMapToPixelSimplifier::SimplifyEnvelope;
+    QgsGeometry* g = new QgsGeometry( *geom );
+
+    if ( QgsMapToPixelSimplifier::simplifyGeometry( g, simplifyHints, simplifyMethod.tolerance() ) )
+    {
+      geom = g;
+      scopedClonedGeom.reset( g );
+    }
+    else
+    {
+      delete g;
+    }
+  }
+
   // whether we're going to create a centroid for polygon
   bool centroidPoly = (( placement == QgsPalLayerSettings::AroundPoint
                          || placement == QgsPalLayerSettings::OverPoint )
@@ -2982,6 +3002,25 @@ void QgsPalLayerSettings::registerObstacleFeature( QgsFeature& f, QgsRenderConte
     return;
   }
 
+  // simplify?
+  const QgsVectorSimplifyMethod &simplifyMethod = context.vectorSimplifyMethod();
+  QScopedPointer<QgsGeometry> scopedClonedGeom;
+  if ( simplifyMethod.simplifyHints() != QgsVectorSimplifyMethod::NoSimplification && simplifyMethod.forceLocalOptimization() )
+  {
+    int simplifyHints = simplifyMethod.simplifyHints() | QgsMapToPixelSimplifier::SimplifyEnvelope;
+    QgsGeometry* g = new QgsGeometry( *geom );
+
+    if ( QgsMapToPixelSimplifier::simplifyGeometry( g, simplifyHints, simplifyMethod.tolerance() ) )
+    {
+      geom = g;
+      scopedClonedGeom.reset( g );
+    }
+    else
+    {
+      delete g;
+    }
+  }
+
   const GEOSGeometry* geos_geom = nullptr;
   QScopedPointer<QgsGeometry> scopedPreparedGeom;
 
