Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
reduce line length
  • Loading branch information
Koyaani authored and nyalldawson committed Sep 20, 2021
1 parent baa14b5 commit 28e38a6
Showing 1 changed file with 127 additions and 71 deletions.
198 changes: 127 additions & 71 deletions tests/src/core/geometry/testqgsquadrilateral.cpp
Expand Up @@ -43,8 +43,10 @@ class TestQgsQuadrilateral: public QObject
void toPolygonToLineString();
};

void TestQgsQuadrilateral::constructor() {
QgsQuadrilateral quad( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 5, 5 ), QgsPoint( 5, 0 ) );
void TestQgsQuadrilateral::constructor()
{
QgsQuadrilateral quad( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ),
QgsPoint( 5, 5 ), QgsPoint( 5, 0 ) );
QVERIFY( quad.isValid() );

QgsPointSequence pts = quad.points();
Expand All @@ -55,7 +57,8 @@ void TestQgsQuadrilateral::constructor() {
QCOMPARE( pts.at( 3 ), QgsPoint( 5, 0 ) );
}

void TestQgsQuadrilateral::constructorEmpty() {
void TestQgsQuadrilateral::constructorEmpty()
{
QgsQuadrilateral quad;
QgsPointSequence pts = quad.points();

Expand All @@ -66,7 +69,8 @@ void TestQgsQuadrilateral::constructorEmpty() {
QVERIFY( !quad.isValid() );
}

void TestQgsQuadrilateral::constructorWhenColinear() {
void TestQgsQuadrilateral::constructorWhenColinear()
{
QgsQuadrilateral quad( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ),
QgsPoint( 0, 10 ), QgsPoint( 10, 10 ) );
QVERIFY( !quad.isValid() );
Expand All @@ -90,7 +94,8 @@ void TestQgsQuadrilateral::constructorWhenColinear() {
QVERIFY( pts.at( 3 ).isEmpty() );
}

void TestQgsQuadrilateral::constructorWhenAntiParallelogram() {
void TestQgsQuadrilateral::constructorWhenAntiParallelogram()
{
QgsQuadrilateral quad( QgsPoint( 0, 0 ), QgsPoint( 5, 5 ),
QgsPoint( 5, 0 ), QgsPoint( 0, 5 ) );
QVERIFY( !quad.isValid() );
Expand All @@ -113,55 +118,85 @@ void TestQgsQuadrilateral::constructorWhenAntiParallelogram() {
QVERIFY( pts.at( 3 ).isEmpty() );
}

void TestQgsQuadrilateral::fromRectangle() {
QgsQuadrilateral quad( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 5, 5 ), QgsPoint( 5, 0 ) );
void TestQgsQuadrilateral::fromRectangle()
{
QgsQuadrilateral quad( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ),
QgsPoint( 5, 5 ), QgsPoint( 5, 0 ) );

QCOMPARE( QgsQuadrilateral::fromRectangle( QgsRectangle( QgsPointXY( 0, 0 ), QgsPointXY( 0, 0 ) ) ), QgsQuadrilateral() );
QCOMPARE( QgsQuadrilateral::fromRectangle( QgsRectangle( QgsPointXY( 0, 0 ), QgsPointXY( 5, 5 ) ) ), quad ) ;
QCOMPARE( QgsQuadrilateral::fromRectangle( QgsRectangle( QgsPointXY( 5, 5 ), QgsPointXY( 0, 0 ) ) ), quad ) ;
QCOMPARE( QgsQuadrilateral::fromRectangle( QgsRectangle( QgsPointXY( 0, 0 ), QgsPointXY( 0, 0 ) ) ),
QgsQuadrilateral() );
QCOMPARE( QgsQuadrilateral::fromRectangle( QgsRectangle( QgsPointXY( 0, 0 ), QgsPointXY( 5, 5 ) ) ),
quad ) ;
QCOMPARE( QgsQuadrilateral::fromRectangle( QgsRectangle( QgsPointXY( 5, 5 ), QgsPointXY( 0, 0 ) ) ),
quad ) ;
}

void TestQgsQuadrilateral::rectangleFromExtent() {
void TestQgsQuadrilateral::rectangleFromExtent()
{
QgsQuadrilateral quad( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ),
QgsPoint( 5, 5 ), QgsPoint( 5, 0 ) );
QgsQuadrilateral quadZ( QgsPoint( 0, 0, 10 ), QgsPoint( 0, 5, 10 ),
QgsPoint( 5, 5, 10 ), QgsPoint( 5, 0, 10 ) );

QCOMPARE( QgsQuadrilateral::rectangleFromExtent( QgsPoint( 0, 0 ), QgsPoint( 0, 0 ) ), QgsQuadrilateral() );
QCOMPARE( QgsQuadrilateral::rectangleFromExtent( QgsPoint( 0, 0 ), QgsPoint( 0, 10 ) ), QgsQuadrilateral() );

QCOMPARE( QgsQuadrilateral::rectangleFromExtent( QgsPoint( 0, 0 ), QgsPoint( 5, 5 ) ), quad );
QCOMPARE( QgsQuadrilateral::rectangleFromExtent( QgsPoint( 5, 5 ), QgsPoint( 0, 0 ) ), quad );

QCOMPARE( QgsQuadrilateral::rectangleFromExtent( QgsPoint( 0, 0, 10 ), QgsPoint( 5, 5 ) ), quadZ );
QVERIFY( QgsQuadrilateral::rectangleFromExtent( QgsPoint( 0, 0 ), QgsPoint( 5, 5, 10 ) ) != quadZ );
QCOMPARE( QgsQuadrilateral::rectangleFromExtent( QgsPoint( 0, 0 ), QgsPoint( 5, 5, 10 ) ), quad );
QCOMPARE( QgsQuadrilateral::rectangleFromExtent( QgsPoint( 0, 0 ), QgsPoint( 0, 0 ) ),
QgsQuadrilateral() );
QCOMPARE( QgsQuadrilateral::rectangleFromExtent( QgsPoint( 0, 0 ), QgsPoint( 0, 10 ) ),
QgsQuadrilateral() );

QCOMPARE( QgsQuadrilateral::rectangleFromExtent( QgsPoint( 0, 0 ), QgsPoint( 5, 5 ) ),
quad );
QCOMPARE( QgsQuadrilateral::rectangleFromExtent( QgsPoint( 5, 5 ), QgsPoint( 0, 0 ) ),
quad );

QCOMPARE( QgsQuadrilateral::rectangleFromExtent( QgsPoint( 0, 0, 10 ), QgsPoint( 5, 5 ) ),
quadZ );
QVERIFY( QgsQuadrilateral::rectangleFromExtent( QgsPoint( 0, 0 ), QgsPoint( 5, 5, 10 ) )
!= quadZ );
QCOMPARE( QgsQuadrilateral::rectangleFromExtent( QgsPoint( 0, 0 ), QgsPoint( 5, 5, 10 ) ),
quad );
}

void TestQgsQuadrilateral::rectangleFromCenterPoint() {
QgsQuadrilateral quad( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 5, 5 ), QgsPoint( 5, 0 ) );
QgsQuadrilateral quadZ( QgsPoint( 0, 0, 10 ), QgsPoint( 0, 5, 10 ), QgsPoint( 5, 5, 10 ), QgsPoint( 5, 0, 10 ) );

QCOMPARE( QgsQuadrilateral::rectangleFromCenterPoint( QgsPoint( 2.5, 2.5 ), QgsPoint( 2.5, 2.5 ) ), QgsQuadrilateral() ) ;

QCOMPARE( QgsQuadrilateral::rectangleFromCenterPoint( QgsPoint( 2.5, 2.5 ), QgsPoint( 5, 5 ) ), quad ) ;
QCOMPARE( QgsQuadrilateral::rectangleFromCenterPoint( QgsPoint( 2.5, 2.5 ), QgsPoint( 5, 0 ) ), quad ) ;
QCOMPARE( QgsQuadrilateral::rectangleFromCenterPoint( QgsPoint( 2.5, 2.5 ), QgsPoint( 0, 5 ) ), quad ) ;
QCOMPARE( QgsQuadrilateral::rectangleFromCenterPoint( QgsPoint( 2.5, 2.5 ), QgsPoint( 0, 0 ) ), quad ) ;

QCOMPARE( QgsQuadrilateral::rectangleFromCenterPoint( QgsPoint( 2.5, 2.5, 10 ), QgsPoint( 5, 5 ) ), quadZ ) ;
QCOMPARE( QgsQuadrilateral::rectangleFromCenterPoint( QgsPoint( 2.5, 2.5, 10 ), QgsPoint( 5, 0 ) ), quadZ ) ;
QCOMPARE( QgsQuadrilateral::rectangleFromCenterPoint( QgsPoint( 2.5, 2.5, 10 ), QgsPoint( 0, 5 ) ), quadZ ) ;
QCOMPARE( QgsQuadrilateral::rectangleFromCenterPoint( QgsPoint( 2.5, 2.5, 10 ), QgsPoint( 0, 0 ) ), quadZ ) ;
void TestQgsQuadrilateral::rectangleFromCenterPoint()
{
QgsQuadrilateral quad( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ),
QgsPoint( 5, 5 ), QgsPoint( 5, 0 ) );
QgsQuadrilateral quadZ( QgsPoint( 0, 0, 10 ), QgsPoint( 0, 5, 10 ),
QgsPoint( 5, 5, 10 ), QgsPoint( 5, 0, 10 ) );

QCOMPARE( QgsQuadrilateral::rectangleFromCenterPoint( QgsPoint( 2.5, 2.5 ), QgsPoint( 0, 0, 10 ) ), quad ) ;
QCOMPARE( QgsQuadrilateral::rectangleFromCenterPoint( QgsPoint( 2.5, 2.5 ), QgsPoint( 2.5, 2.5 ) ),
QgsQuadrilateral() ) ;

QCOMPARE( QgsQuadrilateral::rectangleFromCenterPoint( QgsPoint( 2.5, 2.5 ), QgsPoint( 5, 5 ) ),
quad ) ;
QCOMPARE( QgsQuadrilateral::rectangleFromCenterPoint( QgsPoint( 2.5, 2.5 ), QgsPoint( 5, 0 ) ),
quad ) ;
QCOMPARE( QgsQuadrilateral::rectangleFromCenterPoint( QgsPoint( 2.5, 2.5 ), QgsPoint( 0, 5 ) ),
quad ) ;
QCOMPARE( QgsQuadrilateral::rectangleFromCenterPoint( QgsPoint( 2.5, 2.5 ), QgsPoint( 0, 0 ) ),
quad ) ;

QCOMPARE( QgsQuadrilateral::rectangleFromCenterPoint( QgsPoint( 2.5, 2.5, 10 ), QgsPoint( 5, 5 ) ),
quadZ ) ;
QCOMPARE( QgsQuadrilateral::rectangleFromCenterPoint( QgsPoint( 2.5, 2.5, 10 ), QgsPoint( 5, 0 ) ),
quadZ ) ;
QCOMPARE( QgsQuadrilateral::rectangleFromCenterPoint( QgsPoint( 2.5, 2.5, 10 ), QgsPoint( 0, 5 ) ),
quadZ ) ;
QCOMPARE( QgsQuadrilateral::rectangleFromCenterPoint( QgsPoint( 2.5, 2.5, 10 ), QgsPoint( 0, 0 ) ),
quadZ ) ;

QCOMPARE( QgsQuadrilateral::rectangleFromCenterPoint( QgsPoint( 2.5, 2.5 ), QgsPoint( 0, 0, 10 ) ),
quad ) ;
}

void TestQgsQuadrilateral::rectangleFrom3points() {
QgsQuadrilateral rectangleFrom3Points( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 5, 5 ), QgsPoint( 5, 0 ) );
void TestQgsQuadrilateral::rectangleFrom3points()
{
QgsQuadrilateral rectangleFrom3Points( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ),
QgsPoint( 5, 5 ), QgsPoint( 5, 0 ) );

QCOMPARE( QgsQuadrilateral::rectangleFrom3Points( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 0, 5 ), QgsQuadrilateral::Distance ), QgsQuadrilateral() );
QCOMPARE( QgsQuadrilateral::rectangleFrom3Points( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 0, 5 ), QgsQuadrilateral::Projected ), QgsQuadrilateral() );
QCOMPARE( QgsQuadrilateral::rectangleFrom3Points( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 0, 5 ), QgsQuadrilateral::Distance ),
QgsQuadrilateral() );
QCOMPARE( QgsQuadrilateral::rectangleFrom3Points( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 0, 5 ), QgsQuadrilateral::Projected ),
QgsQuadrilateral() );

QCOMPARE( QgsQuadrilateral::rectangleFrom3Points( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 5, 5 ), QgsQuadrilateral::Distance ).toLineString()->asWkt( 0 ),
QString( "LineString (0 0, 0 5, 5 5, 5 0, 0 0)" ) );
Expand All @@ -188,27 +223,36 @@ void TestQgsQuadrilateral::rectangleFrom3points() {
QString( "Quadrilateral (Point 1: PointZ (0 0 5), Point 2: PointZ (0 5 5), Point 3: PointZ (5 5 10), Point 4: PointZ (5 0 10))" ) );
}

void TestQgsQuadrilateral::squareFromDiagonal() {
void TestQgsQuadrilateral::squareFromDiagonal()
{
QgsQuadrilateral quad( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ),
QgsPoint( 5, 5 ), QgsPoint( 5, 0 ) );
QgsQuadrilateral quadZ( QgsPoint( 0, 0, 10 ), QgsPoint( 0, 5, 10 ),
QgsPoint( 5, 5, 10 ), QgsPoint( 5, 0, 10 ) );
QgsQuadrilateral quadInv( QgsPoint( 5, 5 ), QgsPoint( 5, 0 ),
QgsPoint( 0, 0 ), QgsPoint( 0, 5 ) );

QCOMPARE( QgsQuadrilateral::squareFromDiagonal( QgsPoint( 0, 0 ), QgsPoint( 0, 0 ) ), QgsQuadrilateral() );
QCOMPARE( QgsQuadrilateral::squareFromDiagonal( QgsPoint( 0, 0 ), QgsPoint( 5, 5 ) ), quad );
QVERIFY( QgsQuadrilateral::squareFromDiagonal( QgsPoint( 5, 5 ), QgsPoint( 0, 0 ) ) != quad );
QCOMPARE( QgsQuadrilateral::squareFromDiagonal( QgsPoint( 0, 0 ), QgsPoint( 0, 0 ) ),
QgsQuadrilateral() );
QCOMPARE( QgsQuadrilateral::squareFromDiagonal( QgsPoint( 0, 0 ), QgsPoint( 5, 5 ) ),
quad );
QVERIFY( QgsQuadrilateral::squareFromDiagonal( QgsPoint( 5, 5 ), QgsPoint( 0, 0 ) )
!= quad );

QVERIFY( QgsQuadrilateral::squareFromDiagonal( QgsPoint( 5, 5 ), QgsPoint( 0, 0 ) ).equals( quadInv, 1E-8 ) );

QCOMPARE( QgsQuadrilateral::squareFromDiagonal( QgsPoint( 0, 0, 10 ), QgsPoint( 5, 5 ) ), quadZ );
QVERIFY( QgsQuadrilateral::squareFromDiagonal( QgsPoint( 0, 0 ), QgsPoint( 5, 5, 10 ) ) != quadZ );
QCOMPARE( QgsQuadrilateral::squareFromDiagonal( QgsPoint( 0, 0 ), QgsPoint( 5, 5, 10 ) ), quad );
QCOMPARE( QgsQuadrilateral::squareFromDiagonal( QgsPoint( 0, 0, 10 ), QgsPoint( 5, 5 ) ),
quadZ );
QVERIFY( QgsQuadrilateral::squareFromDiagonal( QgsPoint( 0, 0 ), QgsPoint( 5, 5, 10 ) )
!= quadZ );
QCOMPARE( QgsQuadrilateral::squareFromDiagonal( QgsPoint( 0, 0 ), QgsPoint( 5, 5, 10 ) ),
quad );
}

void TestQgsQuadrilateral::setPoint() {
QgsQuadrilateral quad( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 5, 5 ), QgsPoint( 5, 0 ) );
void TestQgsQuadrilateral::setPoint()
{
QgsQuadrilateral quad( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ),
QgsPoint( 5, 5 ), QgsPoint( 5, 0 ) );

QVERIFY( quad.setPoint( QgsPoint( -1, -1 ), QgsQuadrilateral::Point1 ) );
QVERIFY( quad.setPoint( QgsPoint( -1, 6 ), QgsQuadrilateral::Point2 ) );
Expand Down Expand Up @@ -250,39 +294,48 @@ void TestQgsQuadrilateral::setPoint() {
QVERIFY( !quad.setPoint( QgsPoint( 7, 6 ), QgsQuadrilateral::Point4 ) );
}

void TestQgsQuadrilateral::equals() {
QVERIFY( QgsQuadrilateral() == QgsQuadrilateral());
void TestQgsQuadrilateral::equals()
{
QgsQuadrilateral quad1;
QgsQuadrilateral quad2;

QVERIFY( QgsQuadrilateral() == QgsQuadrilateral() );

QVERIFY( QgsQuadrilateral( ) !=
QgsQuadrilateral( QgsPoint( 0.01, 0.01 ), QgsPoint( 0.01, 5.01 ), QgsPoint( 5.01, 5.01 ), QgsPoint( 5.01, 0.01 ) ) );
quad1 = QgsQuadrilateral( QgsPoint( 0.01, 0.01 ), QgsPoint( 0.01, 5.01 ), QgsPoint( 5.01, 5.01 ), QgsPoint( 5.01, 0.01 ) );
QVERIFY( QgsQuadrilateral() != quad1 );

QVERIFY( QgsQuadrilateral( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ),QgsPoint( 5, 5 ), QgsPoint( 5, 0 ) ) !=
QgsQuadrilateral( QgsPoint( 0.01, 0.01 ), QgsPoint( 0.01, 5.01 ), QgsPoint( 5.01, 5.01 ), QgsPoint( 5.01, 0.01 ) ) );
quad1 = QgsQuadrilateral( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 5, 5 ), QgsPoint( 5, 0 ) );
quad2 = QgsQuadrilateral( QgsPoint( 0.01, 0.01 ), QgsPoint( 0.01, 5.01 ), QgsPoint( 5.01, 5.01 ), QgsPoint( 5.01, 0.01 ) );
QVERIFY( quad1 != quad2 );

QVERIFY( QgsQuadrilateral( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 5, 5 ), QgsPoint( 5, 0 ) ).equals(
QgsQuadrilateral( QgsPoint( 0.01, 0.01 ), QgsPoint( 0.01, 5.01 ), QgsPoint( 5.01, 5.01 ), QgsPoint( 5.01, 0.01 ) ), 1e-1 ) );
quad1 = QgsQuadrilateral( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 5, 5 ), QgsPoint( 5, 0 ) );
quad2 = QgsQuadrilateral( QgsPoint( 0.01, 0.01 ), QgsPoint( 0.01, 5.01 ), QgsPoint( 5.01, 5.01 ), QgsPoint( 5.01, 0.01 ) );
QVERIFY( quad1.equals( quad2, 1e-1 ) );

QVERIFY( QgsQuadrilateral( QgsPoint( 0, 0, 0 ), QgsPoint( 0, 5, -0.02 ), QgsPoint( 5, 5, 0 ), QgsPoint( 5, 0, -0.02 ) ).equals(
QgsQuadrilateral( QgsPoint( 0.01, 0.01, 0.01 ), QgsPoint( 0.01, 5.01, 0 ), QgsPoint( 5.01, 5.01, -0.01 ), QgsPoint( 5.01, 0.01, 0.04 ) ), 1e-1 ) );
quad1 = QgsQuadrilateral( QgsPoint( 0, 0, 0 ), QgsPoint( 0, 5, -0.02 ), QgsPoint( 5, 5, 0 ), QgsPoint( 5, 0, -0.02 ) );
quad2 = QgsQuadrilateral( QgsPoint( 0.01, 0.01, 0.01 ), QgsPoint( 0.01, 5.01, 0 ), QgsPoint( 5.01, 5.01, -0.01 ), QgsPoint( 5.01, 0.01, 0.04 ) );
QVERIFY( quad1.equals( quad2, 1e-1 ) );

QgsQuadrilateral quadM1( QgsPoint( QgsWkbTypes::PointM, 0, 0, 0, 1 ), QgsPoint( QgsWkbTypes::PointM, 0, 5, 0, 1 ),
QgsPoint( QgsWkbTypes::PointM, 5, 5, 0, 1 ), QgsPoint( QgsWkbTypes::PointM, 5, 0, 0, 1 ));
QgsQuadrilateral quadM2( QgsPoint( QgsWkbTypes::PointM, 0.01, 0.01, 0, 1.01 ), QgsPoint( QgsWkbTypes::PointM, 0.01, 5.01, 0, 1.01 ),
QgsPoint( QgsWkbTypes::PointM, 5.01, 5.01, 0, 1.01 ), QgsPoint( QgsWkbTypes::PointM, 5.01, 0.01, 0, 1.01 ));
QVERIFY( quadM1.equals(quadM2, 1e-1 ) );
quad1 = QgsQuadrilateral( QgsPoint( QgsWkbTypes::PointM, 0, 0, 0, 1 ), QgsPoint( QgsWkbTypes::PointM, 0, 5, 0, 1 ),
QgsPoint( QgsWkbTypes::PointM, 5, 5, 0, 1 ), QgsPoint( QgsWkbTypes::PointM, 5, 0, 0, 1 ) );
quad2 = QgsQuadrilateral( QgsPoint( QgsWkbTypes::PointM, 0.01, 0.01, 0, 1.01 ), QgsPoint( QgsWkbTypes::PointM, 0.01, 5.01, 0, 1.01 ),
QgsPoint( QgsWkbTypes::PointM, 5.01, 5.01, 0, 1.01 ), QgsPoint( QgsWkbTypes::PointM, 5.01, 0.01, 0, 1.01 ) );
QVERIFY( quad1.equals( quad2, 1e-1 ) );
}

void TestQgsQuadrilateral::areaPerimeter() {
void TestQgsQuadrilateral::areaPerimeter()
{
QCOMPARE( QgsQuadrilateral().area(), 0.0 );
QCOMPARE( QgsQuadrilateral().perimeter(), 0.0 );

QgsQuadrilateral quad = QgsQuadrilateral::rectangleFrom3Points( QgsPoint( 0, 0, 10 ), QgsPoint( 0, 5 ), QgsPoint( 5, 4 ), QgsQuadrilateral::Projected );
QgsQuadrilateral quad = QgsQuadrilateral::rectangleFrom3Points( QgsPoint( 0, 0, 10 ), QgsPoint( 0, 5 ), QgsPoint( 5, 4 ),
QgsQuadrilateral::Projected );
QVERIFY( qgsDoubleNear( quad.area(), 25.0 ) );
QVERIFY( qgsDoubleNear( quad.perimeter(), 20 ) );

}

void TestQgsQuadrilateral::toString() {
void TestQgsQuadrilateral::toString()
{
QCOMPARE( QgsQuadrilateral( ).toString(), QString( "Empty" ) );
QCOMPARE( QgsQuadrilateral::rectangleFromCenterPoint( QgsPoint( 2.5, 2.5 ), QgsPoint( 2.5, 2.5 ) ).toString(), QString( "Empty" ) );
QCOMPARE( QgsQuadrilateral::rectangleFromCenterPoint( QgsPoint( 2.5, 2.5 ), QgsPoint( 5, 0 ) ).toString(),
Expand All @@ -291,15 +344,18 @@ void TestQgsQuadrilateral::toString() {
QString( "Quadrilateral (Point 1: PointZ (0 0 10), Point 2: PointZ (0 5 10), Point 3: PointZ (5 5 10), Point 4: PointZ (5 0 10))" ) );
}

void TestQgsQuadrilateral::toPolygonToLineString() {
void TestQgsQuadrilateral::toPolygonToLineString()
{
QgsQuadrilateral quad;
QCOMPARE( quad.toPolygon()->asWkt(), QgsPolygon().asWkt() );
QCOMPARE( quad.toLineString()->asWkt(), QgsLineString().asWkt() );

QgsLineString ext, extZ;
QgsPolygon polyg, polygZ;
QgsQuadrilateral quadZ( QgsPoint( 0, 0, 10 ), QgsPoint( 0, 5, 10 ), QgsPoint( 5, 5, 10 ), QgsPoint( 5, 0, 10 ) );
quad = QgsQuadrilateral( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 5, 5 ), QgsPoint( 5, 0 ) );
QgsQuadrilateral quadZ( QgsPoint( 0, 0, 10 ), QgsPoint( 0, 5, 10 ),
QgsPoint( 5, 5, 10 ), QgsPoint( 5, 0, 10 ) );
quad = QgsQuadrilateral( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ),
QgsPoint( 5, 5 ), QgsPoint( 5, 0 ) );

ext.fromWkt( "LineString (0 0, 0 5, 5 5, 5 0, 0 0)" );
QCOMPARE( quad.toLineString()->asWkt(), ext.asWkt() );
Expand Down

0 comments on commit 28e38a6

Please sign in to comment.