Skip to content

Commit df0f97b

Browse files
committed
Adapt numbers in test for QgsLineStringV2::sumUpArea
1 parent be71066 commit df0f97b

1 file changed

Lines changed: 24 additions & 24 deletions

File tree

‎tests/src/core/testqgsgeometry.cpp‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2051,13 +2051,13 @@ void TestQgsGeometry::lineStringV2()
20512051
QCOMPARE( area, 1.0 );
20522052
l36.setPoints( QgsPointSequenceV2() << QgsPointV2( 5, 10 ) << QgsPointV2( 10, 10 ) );
20532053
l36.sumUpArea( area );
2054-
QCOMPARE( area, 1.0 );
2054+
QVERIFY( qgsDoubleNear( area, -24 ) );
20552055
l36.setPoints( QgsPointSequenceV2() << QgsPointV2( 0, 0 ) << QgsPointV2( 2, 0 ) << QgsPointV2( 2, 2 ) );
20562056
l36.sumUpArea( area );
2057-
QVERIFY( qgsDoubleNear( area, 3.0 ) );
2057+
QVERIFY( qgsDoubleNear( area, -22 ) );
20582058
l36.setPoints( QgsPointSequenceV2() << QgsPointV2( 0, 0 ) << QgsPointV2( 2, 0 ) << QgsPointV2( 2, 2 ) << QgsPointV2( 0, 2 ) );
20592059
l36.sumUpArea( area );
2060-
QVERIFY( qgsDoubleNear( area, 7.0 ) );
2060+
QVERIFY( qgsDoubleNear( area, -18 ) );
20612061

20622062
//boundingBox - test that bounding box is updated after every modification to the line string
20632063
QgsLineStringV2 l37;
@@ -2144,27 +2144,27 @@ void TestQgsGeometry::lineStringV2()
21442144

21452145
void TestQgsGeometry::compoundCurveV2()
21462146
{
2147-
//test that area of a compound curve ring is equal to a closed linestring with the same vertices
2148-
QgsCompoundCurveV2 cc;
2149-
QgsLineStringV2* l1 = new QgsLineStringV2();
2150-
l1->setPoints( QgsPointSequenceV2() << QgsPointV2( 1, 1 ) << QgsPointV2( 0, 2 ) );
2151-
cc.addCurve( l1 );
2152-
QgsLineStringV2* l2 = new QgsLineStringV2();
2153-
l2->setPoints( QgsPointSequenceV2() << QgsPointV2( 0, 2 ) << QgsPointV2( -1, 0 ) << QgsPointV2( 0, -1 ) );
2154-
cc.addCurve( l2 );
2155-
QgsLineStringV2* l3 = new QgsLineStringV2();
2156-
l3->setPoints( QgsPointSequenceV2() << QgsPointV2( 0, -1 ) << QgsPointV2( 1, 1 ) );
2157-
cc.addCurve( l3 );
2158-
2159-
double ccArea = 0.0;
2160-
cc.sumUpArea( ccArea );
2161-
2162-
QgsLineStringV2 ls;
2163-
ls.setPoints( QgsPointSequenceV2() << QgsPointV2( 1, 1 ) << QgsPointV2( 0, 2 ) << QgsPointV2( -1, 0 ) << QgsPointV2( 0, -1 )
2164-
<< QgsPointV2( 1, 1 ) );
2165-
double lsArea = 0.0;
2166-
ls.sumUpArea( lsArea );
2167-
QVERIFY( qgsDoubleNear( ccArea, lsArea ) );
2147+
//test that area of a compound curve ring is equal to a closed linestring with the same vertices
2148+
QgsCompoundCurveV2 cc;
2149+
QgsLineStringV2* l1 = new QgsLineStringV2();
2150+
l1->setPoints( QgsPointSequenceV2() << QgsPointV2( 1, 1 ) << QgsPointV2( 0, 2 ) );
2151+
cc.addCurve( l1 );
2152+
QgsLineStringV2* l2 = new QgsLineStringV2();
2153+
l2->setPoints( QgsPointSequenceV2() << QgsPointV2( 0, 2 ) << QgsPointV2( -1, 0 ) << QgsPointV2( 0, -1 ) );
2154+
cc.addCurve( l2 );
2155+
QgsLineStringV2* l3 = new QgsLineStringV2();
2156+
l3->setPoints( QgsPointSequenceV2() << QgsPointV2( 0, -1 ) << QgsPointV2( 1, 1 ) );
2157+
cc.addCurve( l3 );
2158+
2159+
double ccArea = 0.0;
2160+
cc.sumUpArea( ccArea );
2161+
2162+
QgsLineStringV2 ls;
2163+
ls.setPoints( QgsPointSequenceV2() << QgsPointV2( 1, 1 ) << QgsPointV2( 0, 2 ) << QgsPointV2( -1, 0 ) << QgsPointV2( 0, -1 )
2164+
<< QgsPointV2( 1, 1 ) );
2165+
double lsArea = 0.0;
2166+
ls.sumUpArea( lsArea );
2167+
QVERIFY( qgsDoubleNear( ccArea, lsArea ) );
21682168
}
21692169

21702170
void TestQgsGeometry::polygonV2()

0 commit comments

Comments
 (0)