Fix area calculation of compoundcurve rings if they contain a 2-vertex linestring

mhugent · mhugent · commit 30d742379725 · 2017-01-03T14:55:50.000+01:00
diff --git a/src/core/geometry/qgslinestringv2.cpp b/src/core/geometry/qgslinestringv2.cpp
@@ -837,9 +837,6 @@ QgsPointV2 QgsLineStringV2::centroid() const
 void QgsLineStringV2::sumUpArea( double& sum ) const
 {
   int maxIndex = numPoints() - 1;
-  if ( maxIndex == 1 )
-    return; //no area, just a single line
-
   for ( int i = 0; i < maxIndex; ++i )
   {
     sum += 0.5 * ( mX.at( i ) * mY.at( i + 1 ) - mY.at( i ) * mX.at( i + 1 ) );

Original file line number	Diff line number	Diff line change
`@@ -837,9 +837,6 @@ QgsPointV2 QgsLineStringV2::centroid() const`
`837`	`837`	`void QgsLineStringV2::sumUpArea( double& sum ) const`
`838`	`838`	`{`
`839`	`839`	`int maxIndex = numPoints() - 1;`
`840`		`- if ( maxIndex == 1 )`
`841`		`- return; //no area, just a single line`
`842`		`-`
`843`	`840`	`for ( int i = 0; i < maxIndex; ++i )`
`844`	`841`	`{`
`845`	`842`	`sum += 0.5 * ( mX.at( i ) * mY.at( i + 1 ) - mY.at( i ) * mX.at( i + 1 ) );`