Exclude degenerated rings from polygon area calculation

mhugent · nyalldawson · commit e433639604d0 · 2017-01-10T09:11:03.000+10:00
(forward-port from 64b0b1)
diff --git a/src/core/geometry/qgscurvepolygon.cpp b/src/core/geometry/qgscurvepolygon.cpp
@@ -359,7 +359,7 @@ double QgsCurvePolygon::area() const
 
   double totalArea = 0.0;
 
-  if ( mExteriorRing->isClosed() )
+  if ( mExteriorRing->isRing() )
   {
     double area = 0.0;
     mExteriorRing->sumUpArea( area );
@@ -370,7 +370,7 @@ double QgsCurvePolygon::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
`@@ -359,7 +359,7 @@ double QgsCurvePolygon::area() const`
`359`	`359`
`360`	`360`	`double totalArea = 0.0;`
`361`	`361`
`362`		`- if ( mExteriorRing->isClosed() )`
	`362`	`+ if ( mExteriorRing->isRing() )`
`363`	`363`	`{`
`364`	`364`	`double area = 0.0;`
`365`	`365`	`mExteriorRing->sumUpArea( area );`
`@@ -370,7 +370,7 @@ double QgsCurvePolygon::area() const`
`370`	`370`	`for ( ; ringIt != mInteriorRings.constEnd(); ++ringIt )`
`371`	`371`	`{`
`372`	`372`	`double area = 0.0;`
`373`		`- if (( *ringIt )->isClosed() )`
	`373`	`+ if (( *ringIt )->isRing() )`
`374`	`374`	`{`
`375`	`375`	`( *ringIt )->sumUpArea( area );`
`376`	`376`	`totalArea -= qAbs( area );`