Exclude degenerated rings from polygon area calculation

mhugent · nyalldawson · commit 81befa389803 · 2017-02-04T12:25:08.000+10:00
(forward port from 64b0b1)
diff --git a/src/core/geometry/qgscurvepolygonv2.cpp b/src/core/geometry/qgscurvepolygonv2.cpp
@@ -371,7 +371,7 @@ double QgsCurvePolygonV2::area() const
 
   double totalArea = 0.0;
 
-  if ( mExteriorRing->isClosed() )
+  if ( mExteriorRing->isRing() )
   {
     double area = 0.0;
     mExteriorRing->sumUpArea( area );
@@ -382,7 +382,7 @@ double QgsCurvePolygonV2::area() const
   for ( ; ringIt != mInteriorRings.constEnd(); ++ringIt )
   {
     double area = 0.0;
-    if (( *ringIt )->isClosed() )
+    if (( *ringIt )->isRing() )
     {
       ( *ringIt )->sumUpArea( area );
       totalArea -= qAbs( area );

Original file line number	Diff line number	Diff line change
`@@ -371,7 +371,7 @@ double QgsCurvePolygonV2::area() const`
`371`	`371`
`372`	`372`	`double totalArea = 0.0;`
`373`	`373`
`374`		`- if ( mExteriorRing->isClosed() )`
	`374`	`+ if ( mExteriorRing->isRing() )`
`375`	`375`	`{`
`376`	`376`	`double area = 0.0;`
`377`	`377`	`mExteriorRing->sumUpArea( area );`
`@@ -382,7 +382,7 @@ double QgsCurvePolygonV2::area() const`
`382`	`382`	`for ( ; ringIt != mInteriorRings.constEnd(); ++ringIt )`
`383`	`383`	`{`
`384`	`384`	`double area = 0.0;`
`385`		`- if (( *ringIt )->isClosed() )`
	`385`	`+ if (( *ringIt )->isRing() )`
`386`	`386`	`{`
`387`	`387`	`( *ringIt )->sumUpArea( area );`
`388`	`388`	`totalArea -= qAbs( area );`