Merge pull request #3326 from pvalsecc/perf

Add heuristic to not simplify geometries for nothing
qgis · Aug 16, 2016 · 40b70a3 · 40b70a3
2 parents cd4bc88 + 5ee97ad
commit 40b70a3
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 2 deletions.
diff --git a/src/core/qgsmaptopixelgeometrysimplifier.cpp b/src/core/qgsmaptopixelgeometrysimplifier.cpp
@@ -547,9 +547,15 @@ bool QgsMapToPixelSimplifier::simplifyPoints( QgsWkbTypes::Type wkbType, QgsCons
   if ( numPoints <= ( isaLinearRing ? 6 : 3 ) )
     return false;
 
-  QgsRectangle envelope = calculateBoundingBox( singleType, QgsConstWkbPtr( sourceWkbPtr ), numPoints );
-  sourceWkbPtr -= sizeof( int );
+  const QgsRectangle envelope = calculateBoundingBox( singleType, QgsConstWkbPtr( sourceWkbPtr ), numPoints );
+
+  if ( qMax( envelope.width(), envelope.height() ) / numPoints > tolerance * 2.0 )
+  {
+    //points are in average too far appart to lead to any significant simplification
+    return false;
+  }
 
+  sourceWkbPtr -= sizeof( int );
   int targetWkbSize = 5 + sizeof( int ) + numPoints * ( 2 * sizeof( double ) );
   unsigned char* targetWkb = new unsigned char[ targetWkbSize ];
 

diff --git a/...data/control_images/expected_arrowsymbollayer_1/expected_arrowsymbollayer_1.png b/...data/control_images/expected_arrowsymbollayer_1/expected_arrowsymbollayer_1.png
diff --git a/...control_images/expected_arrowsymbollayer_1/expected_arrowsymbollayer_1_mask.png b/...control_images/expected_arrowsymbollayer_1/expected_arrowsymbollayer_1_mask.png
diff --git a/...data/control_images/expected_arrowsymbollayer_2/expected_arrowsymbollayer_2.png b/...data/control_images/expected_arrowsymbollayer_2/expected_arrowsymbollayer_2.png
diff --git a/...control_images/expected_arrowsymbollayer_2/expected_arrowsymbollayer_2_mask.png b/...control_images/expected_arrowsymbollayer_2/expected_arrowsymbollayer_2_mask.png
diff --git a/...data/control_images/expected_arrowsymbollayer_4/expected_arrowsymbollayer_4.png b/...data/control_images/expected_arrowsymbollayer_4/expected_arrowsymbollayer_4.png
diff --git a/...control_images/expected_arrowsymbollayer_4/expected_arrowsymbollayer_4_mask.png b/...control_images/expected_arrowsymbollayer_4/expected_arrowsymbollayer_4_mask.png
diff --git a/...cted_geometrygenerator_buffer_lines/expected_geometrygenerator_buffer_lines.png b/...cted_geometrygenerator_buffer_lines/expected_geometrygenerator_buffer_lines.png
diff --git a/...geometrygenerator_buffer_lines/expected_geometrygenerator_buffer_lines_mask.png b/...geometrygenerator_buffer_lines/expected_geometrygenerator_buffer_lines_mask.png
diff --git a/tests/testdata/control_images/qgis_server_accesscontrol/WMS_GetMap/WMS_GetMap.png b/tests/testdata/control_images/qgis_server_accesscontrol/WMS_GetMap/WMS_GetMap.png