fix polygon generalization artifacts, if last ring segment is one of two

segments exceeding the tolerance plus some cleanups

Author: jef-n

python/core/qgsmaptopixelgeometrysimplifier.sip

@@ -28,10 +28,10 @@ class QgsMapToPixelSimplifier : QgsAbstractGeometrySimplifier
   public:
 
     //! Returns whether the envelope can be replaced by its BBOX when is applied the specified map2pixel context
-    static bool canbeGeneralizedByMapBoundingBox( const QgsRectangle& envelope, double map2pixelTol );
+    static bool isGeneralizableByMapBoundingBox( const QgsRectangle& envelope, double map2pixelTol );
 
     //! Returns whether the envelope can be replaced by its BBOX when is applied the specified map2pixel context
-    bool canbeGeneralizedByMapBoundingBox( const QgsRectangle& envelope ) const;
+    bool isGeneralizableByMapBoundingBox( const QgsRectangle& envelope ) const;
 
     //! Simplifies the geometry when is applied the specified map2pixel context
     static bool simplifyGeometry( QgsGeometry* geometry, int simplifyFlags, double tolerance );

src/core/qgsfeatureiterator.cpp

@@ -56,7 +56,8 @@ bool QgsAbstractFeatureIterator::nextFeature( QgsFeature& f )
   if ( dataOk && mLocalSimplification )
   {
     QgsGeometry* geometry = f.geometry();
-    if ( geometry ) simplify( f );
+    if ( geometry )
+      simplify( f );
   }
   return dataOk;
 }
@@ -133,7 +134,8 @@ bool QgsAbstractFeatureIterator::simplify( QgsFeature& feature )
     QgsGeometry* geometry = feature.geometry();
 
     QGis::GeometryType geometryType = geometry->type();
-    if ( geometryType == QGis::Line || geometryType == QGis::Polygon ) return mGeometrySimplifier->simplifyGeometry( geometry );
+    if ( geometryType == QGis::Line || geometryType == QGis::Polygon )
+      return mGeometrySimplifier->simplifyGeometry( geometry );
   }
   return false;
 }