Skip to content

Commit

Permalink
Update tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@nyalldawson
nyalldawson committed Aug 17, 2019
1 parent f4cddb4 commit 36c6dc7
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 74 deletions.
7 changes: 0 additions & 7 deletions src/core/layout/qgslayoutgeopdfexporter.cpp
View file
Expand Up @@ -80,8 +80,6 @@ class QgsGeoPdfRenderedFeatureHandler: public QgsRenderedFeatureHandlerInterface
return QSet< QString >() << QgsFeatureRequest::ALL_ATTRIBUTES;
}

QMap< QString, QVector< QgsLayoutGeoPdfExporter::RenderedFeature > > renderedFeatures;

private:
QTransform mMapToLayoutTransform;
QTransform mLayoutToPdfTransform;
Expand Down Expand Up @@ -113,11 +111,6 @@ QgsLayoutGeoPdfExporter::~QgsLayoutGeoPdfExporter()
}
}

QMap<QString, QVector<QgsLayoutGeoPdfExporter::RenderedFeature> > QgsLayoutGeoPdfExporter::renderedFeatures( QgsLayoutItemMap *map ) const
{
return mMapHandlers.value( map )->renderedFeatures;
}

QgsAbstractGeoPdfExporter::VectorComponentDetail QgsLayoutGeoPdfExporter::componentDetailForLayerId( const QString &layerId )
{
QgsProject *project = mLayout->project();
Expand Down
5 changes: 0 additions & 5 deletions src/core/layout/qgslayoutgeopdfexporter.h
View file
Expand Up @@ -52,11 +52,6 @@ class CORE_EXPORT QgsLayoutGeoPdfExporter : public QgsAbstractGeoPdfExporter

~QgsLayoutGeoPdfExporter() override;

/**
* Returns a dict of rendered features, with layer IDs as dict keys for the specified \a map item.
*/
QMap< QString, QVector< QgsLayoutGeoPdfExporter::RenderedFeature > > renderedFeatures( QgsLayoutItemMap *map ) const;

private:

VectorComponentDetail componentDetailForLayerId( const QString &layerId ) override;
Expand Down
114 changes: 52 additions & 62 deletions tests/src/core/testqgslayoutgeopdfexport.cpp
View file
Expand Up @@ -77,17 +77,26 @@ void TestQgsLayoutGeoPdfExport::cleanup()

void TestQgsLayoutGeoPdfExport::testCollectingFeatures()
{
if ( !QgsAbstractGeoPdfExporter::geoPDFCreationAvailable() )
{
QSKIP( "This test requires GeoPDF creation abilities", SkipSingle );
}

QgsVectorLayer *linesLayer = new QgsVectorLayer( TEST_DATA_DIR + QStringLiteral( "/lines.shp" ),
QStringLiteral( "lines" ), QStringLiteral( "ogr" ) );
QVERIFY( linesLayer->isValid() );
QgsVectorLayer *pointsLayer = new QgsVectorLayer( TEST_DATA_DIR + QStringLiteral( "/points.shp" ),
QStringLiteral( "points" ), QStringLiteral( "ogr" ) );
QVERIFY( pointsLayer->isValid() );
QgsVectorLayer *polygonLayer = new QgsVectorLayer( TEST_DATA_DIR + QStringLiteral( "/polys.shp" ),
QStringLiteral( "polys" ), QStringLiteral( "ogr" ) );
QVERIFY( polygonLayer->isValid() );
pointsLayer->setDisplayExpression( QStringLiteral( "Staff" ) );

QgsProject p;
p.addMapLayer( linesLayer );
p.addMapLayer( pointsLayer );
p.addMapLayer( polygonLayer );

QgsLayout l( &p );
l.initializeDefaults();
Expand All @@ -104,7 +113,7 @@ void TestQgsLayoutGeoPdfExport::testCollectingFeatures()
QgsLayoutItemMap *map2 = new QgsLayoutItemMap( &l );
map2->attemptSetSceneRect( QRectF( 150, 80, 40, 50 ) );
map2->setFrameEnabled( true );
map2->setLayers( QList<QgsMapLayer *>() << pointsLayer );
map2->setLayers( QList<QgsMapLayer *>() << pointsLayer << polygonLayer );
map2->setCrs( linesLayer->crs() );
map2->zoomToExtent( pointsLayer->extent() );
map2->setMapRotation( 45 );
Expand All @@ -116,112 +125,93 @@ void TestQgsLayoutGeoPdfExport::testCollectingFeatures()

// trigger render
QgsLayoutExporter exporter( &l );
QString outputFile = "/home/nyall/Temporary/geopdf/test_src.pdf";

const QString outputFile = geoPdfExporter.generateTemporaryFilepath( QStringLiteral( "test_src.pdf" ) );
QgsLayoutExporter::PdfExportSettings settings;
settings.writeGeoPdf = true;
settings.exportMetadata = false;
exporter.exportToPdf( outputFile, settings );

// check that features were collected
QMap< QString, QVector< QgsLayoutGeoPdfExporter::RenderedFeature > > renderedFeatures = geoPdfExporter.renderedFeatures( map );
QCOMPARE( renderedFeatures.count(), 2 );
QVector< QgsLayoutGeoPdfExporter::RenderedFeature > lineFeatures = renderedFeatures.value( linesLayer->id() );
QgsFeatureList lineFeatures = geoPdfExporter.mCollatedFeatures.value( linesLayer->id() );
QCOMPARE( lineFeatures.count(), 6 );

QgsFeature lineFeature1;
QgsGeometry lineGeometry1;
for ( auto it = lineFeatures.constBegin(); it != lineFeatures.constEnd(); ++it )
{
if ( it->feature.id() == 1 )
if ( it->id() == 1 )
{
lineFeature1 = it->feature;
lineGeometry1 = it->renderedBounds;
lineFeature1 = *it;
lineGeometry1 = it->geometry();
}
}
QVERIFY( lineFeature1.isValid() );
QCOMPARE( lineFeature1.attribute( 0 ).toString(), QStringLiteral( "Highway" ) );
QCOMPARE( lineFeature1.attribute( 1 ).toDouble(), 1.0 );
QgsDebugMsg( lineGeometry1.asWkt( 1 ) );
QCOMPARE( lineGeometry1.asWkt( 1 ), QStringLiteral( "MultiLineString ((99.2 20.4, 99.9 22.2, 100.3 22.9, 100.6 23.5, 101.9 24.6, 105.6 26.4, 109.4 28, 110.5 28.9, 112.3 30.8, 112.5 31.1, 112.9 33.3, 113.1 34.4, 113.6 36.1, 113.8 36.8, 114 38.6, 114.3 39.2, 114.9 40.3, 115.4 41.3, 116.7 42.8, 116.9 43.2, 117.1 44.3, 117.1 45.9, 117.1 46.6, 117.4 48.1, 117.8 48.8, 119.3 49.9, 120.5 50.7, 121.8 51.4, 123.1 51.9, 123.3 53, 123.3 53.8, 122.5 55, 122.2 55.4, 121.6 56.5, 121.1 57.2, 120.5 57.8, 120.4 58.1, 120.2 59, 120 59.8, 120 60.5, 120.5 61.8, 120.9 62.5, 120.9 62.5, 122.7 66.5, 121.8 68.4, 121.1 69.1, 119.8 71.3, 119.8 72.7, 118.2 74.2, 117.6 75.1, 116.7 76.6, 116.7 77.3, 116.7 78.2, 116.7 78.9, 116.7 79.8, 117.3 80.6, 117.4 81.5, 117.8 82.2, 118.5 83, 119.3 84, 120.4 85.3, 122.2 88.8, 122.4 89, 123.6 90.2, 124.2 90.8, 125.5 92.6, 126.4 93.4, 128 94.4, 129.1 95.4, 130.4 96.6, 131.3 97.2, 132.6 98.3, 134.2 99.2, 135.5 100.1, 137.5 101.6, 138.2 102.3, 138.8 103.6, 138.8 104.7, 138.8 105.8, 138.6 106.1, 137.9 107.2, 136.8 108.9, 136 109.6, 135.9 110.3, 135.9 111.2, 136 112, 136.6 113.4, 136.8 114.2, 137.9 115.4, 138.4 116, 139.2 117.1, 140.2 118.7, 143.2 120))" ) );
QCOMPARE( lineGeometry1.asWkt( 1 ), QStringLiteral( "MultiLineString ((281.2 537.3, 283.3 532.1, 284.3 530.1, 285.3 528.5, 289 525.4, 299.3 520.2, 310.2 515.6, 313.3 513, 318.5 507.8, 319 506.8, 320 500.6, 320.5 497.5, 322.1 492.8, 322.6 490.8, 323.1 485.6, 324.1 484, 325.7 480.9, 327.2 477.8, 330.9 473.7, 331.4 472.7, 331.9 469.6, 331.9 464.9, 331.9 462.9, 332.9 458.7, 334 456.6, 338.1 453.5, 341.7 451.5, 345.4 449.4, 349 447.9, 349.5 444.8, 349.5 442.7, 347.4 439.1, 346.4 438, 344.8 434.9, 343.3 432.9, 341.7 431.3, 341.2 430.3, 340.7 427.7, 340.2 425.6, 340.2 423.6, 341.7 419.9, 342.8 417.9, 342.8 417.9, 347.9 406.5, 345.4 401.3, 343.3 399.3, 339.7 393.1, 339.7 388.9, 335 384.8, 333.5 382.2, 330.9 378.1, 330.9 376, 330.9 373.4, 330.9 371.3, 330.9 368.8, 332.4 366.7, 332.9 364.1, 334 362, 336 360, 338.1 356.9, 341.2 353.3, 346.4 343.4, 346.9 342.9, 350.5 339.3, 352.1 337.7, 355.7 332.6, 358.3 330.5, 362.9 327.4, 366 324.8, 369.7 321.2, 372.2 319.6, 375.9 316.5, 380.5 314, 384.1 311.4, 389.8 307.2, 391.9 305.2, 393.5 301.6, 393.5 298.5, 393.5 295.3, 392.9 294.3, 390.9 291.2, 387.8 286.6, 385.7 284.5, 385.2 282.4, 385.2 279.8, 385.7 277.8, 387.3 273.6, 387.8 271.6, 390.9 267.9, 392.4 266.4, 394.5 263.3, 397.6 258.6, 405.9 255))" ) );

QVector< QgsLayoutGeoPdfExporter::RenderedFeature > pointFeatures = renderedFeatures.value( pointsLayer->id() );
QCOMPARE( pointFeatures.count(), 15 );
QgsFeatureList pointFeatures = geoPdfExporter.mCollatedFeatures.value( pointsLayer->id() );
QCOMPARE( pointFeatures.count(), 32 );

QgsFeature pointFeature3;
QgsGeometry pointGeometry3;
for ( auto it = pointFeatures.constBegin(); it != pointFeatures.constEnd(); ++it )
{
if ( it->feature.id() == 3 )
if ( it->id() == 3 )
{
pointFeature3 = it->feature;
pointGeometry3 = it->renderedBounds;
pointFeature3 = *it;
pointGeometry3 = it->geometry();
}
}
QVERIFY( pointFeature3.isValid() );
QCOMPARE( pointFeature3.attribute( 0 ).toString(), QStringLiteral( "Jet" ) );
QCOMPARE( pointFeature3.attribute( 1 ).toInt(), 95 );
QCOMPARE( pointFeature3.attribute( 2 ).toDouble(), 3 );
QCOMPARE( pointFeature3.attribute( 2 ).toDouble(), 3.0 );
QCOMPARE( pointFeature3.attribute( 3 ).toInt(), 1 );
QCOMPARE( pointFeature3.attribute( 4 ).toInt(), 1 );
QCOMPARE( pointFeature3.attribute( 5 ).toInt(), 2 );
QCOMPARE( pointGeometry3.asWkt( 1 ), QStringLiteral( "MultiPolygon (((123.8 63.8, 135.1 63.8, 135.1 75, 123.8 75, 123.8 63.8)))" ) );
QCOMPARE( pointGeometry3.asWkt( 1 ), QStringLiteral( "MultiPolygon (((473.4 305.9, 505.3 305.9, 505.3 274.1, 473.4 274.1, 473.4 305.9)))" ) );

// check second map
pointFeatures = geoPdfExporter.renderedFeatures( map2 ).value( pointsLayer->id() );
QCOMPARE( pointFeatures.count(), 17 );
QgsFeatureList polyFeatures = geoPdfExporter.mCollatedFeatures.value( polygonLayer->id() );
QCOMPARE( polyFeatures.count(), 10 );

QgsFeature pointFeature3b;
QgsGeometry pointGeometry3b;
for ( auto it = pointFeatures.constBegin(); it != pointFeatures.constEnd(); ++it )
QgsFeature polyFeature3b;
QgsGeometry polyGeometry3b;
for ( auto it = polyFeatures.constBegin(); it != polyFeatures.constEnd(); ++it )
{
if ( it->feature.id() == 3 )
if ( it->id() == 3 )
{
pointFeature3b = it->feature;
pointGeometry3b = it->renderedBounds;
polyFeature3b = *it;
polyGeometry3b = it->geometry();
}
}
QVERIFY( pointFeature3b.isValid() );
QCOMPARE( pointFeature3b.attribute( 0 ).toString(), QStringLiteral( "Jet" ) );
QCOMPARE( pointFeature3b.attribute( 1 ).toInt(), 95 );
QCOMPARE( pointFeature3b.attribute( 2 ).toDouble(), 3 );
QCOMPARE( pointFeature3b.attribute( 3 ).toInt(), 1 );
QCOMPARE( pointFeature3b.attribute( 4 ).toInt(), 1 );
QCOMPARE( pointFeature3b.attribute( 5 ).toInt(), 2 );
QCOMPARE( pointGeometry3b.asWkt( 1 ), QStringLiteral( "MultiPolygon (((167 102, 178.2 102, 178.2 113.3, 167 113.3, 167 102)))" ) );
QVERIFY( polyFeature3b.isValid() );
QCOMPARE( polyFeature3b.attribute( 0 ).toString(), QStringLiteral( "Dam" ) );
QCOMPARE( polyFeature3b.attribute( 1 ).toInt(), 8 );
QgsDebugMsg( polyGeometry3b.asWkt( 1 ) );
QCOMPARE( polyGeometry3b.asWkt( 1 ), QStringLiteral( "MultiPolygon (((468.8 306.3, 468.8 305.2, 468.4 305, 467.8 305, 467.1 305, 466.4 304.2, 466.4 303.8, 466.2 303.3, 466.7 302.6, 467.2 302, 467.7 301.6, 468.6 301.5, 469.6 302.1, 470.4 302.5, 470.9 302.7, 472.1 302.7, 472.8 302.9, 473.6 302.7, 474.2 303, 474.9 303.3, 475.7 303.3, 476.5 303, 478 300.3, 478.1 299.3, 478.1 298.7, 477.8 297.5, 477.7 296.3, 477.5 296.1, 476.3 294.8, 475.6 294.4, 475.4 294.3, 473.9 294, 473.7 294.1, 473 294.4, 472.2 295, 471.6 295.6, 470.8 296.4, 469.6 297, 469.5 297.1, 467.8 296.7, 466 296.3, 463.9 296.1, 463.2 296.1, 462.3 296.7, 461.8 297.7, 461.6 298.1, 460.9 298.5, 459.8 299.3, 459.2 299.5, 458.5 300.1, 458.2 300.5, 458.3 301.2, 458.5 301.6, 458.7 302.4, 458.7 302.8, 458.3 303.6, 457.8 304.1, 457.7 305.1, 458 306, 458.2 306.6, 458.5 307.6, 458.5 307.6, 459.4 308.9, 459.7 309.2, 460.5 310, 461.1 310.4, 461.9 311, 462.4 311.4, 463.2 311.6, 464 311.7, 464.6 311.7, 465.3 311.1, 466.6 309.9, 467.3 309.1, 468.3 307.8, 468.9 306.7, 468.8 306.3)))" ) );

// finalize and test collation
// QVERIFY( geoPdfExporter.finalize( outputFile ) );

QMap< QString, QgsFeatureList > collatedFeatures = geoPdfExporter.mCollatedFeatures;
QCOMPARE( collatedFeatures.count(), 2 );
QCOMPARE( collatedFeatures.value( pointsLayer->id() ).count(), 32 );
QCOMPARE( collatedFeatures.value( linesLayer->id() ).count(), 6 );

QVERIFY( geoPdfExporter.saveTemporaryLayers() );
QVERIFY( geoPdfExporter.finalize( QList<QgsAbstractGeoPdfExporter::ComponentLayerDetail>(), outputFile ) );
QVERIFY( geoPdfExporter.errorMessage().isEmpty() );

#if 0
// check layers were written
QCOMPARE( geoPdfExporter.mTemporaryFilePaths.count(), 2 );
std::unique_ptr< QgsVectorLayer > pointTemp = qgis::make_unique< QgsVectorLayer >( geoPdfExporter.mTemporaryFilePaths.value( pointsLayer->id() ) );
QVERIFY( pointTemp->isValid() );
QCOMPARE( pointTemp->featureCount(), 32 );
QCOMPARE( pointTemp->wkbType(), QgsWkbTypes::MultiPolygon );
pointTemp.reset();
std::unique_ptr< QgsVectorLayer > lineTemp = qgis::make_unique< QgsVectorLayer >( geoPdfExporter.mTemporaryFilePaths.value( linesLayer->id() ) );
QVERIFY( lineTemp->isValid() );
QCOMPARE( lineTemp->featureCount(), 6 );
QCOMPARE( lineTemp->wkbType(), QgsWkbTypes::MultiLineString );
lineTemp.reset();

// test creation of the composition xml
QString composition; // = geoPdfExporter.createCompositionXml( outputFile );
QgsDebugMsg( composition );
QVERIFY( composition.contains( QStringLiteral( "id=\"%1\"" ).arg( linesLayer->id() ) ) );
QVERIFY( composition.contains( QStringLiteral( "id=\"%1\"" ).arg( pointsLayer->id() ) ) );
QVERIFY( composition.contains( QStringLiteral( "dataset=\"%1\"" ).arg( geoPdfExporter.mTemporaryFilePaths.value( pointsLayer->id() ) ) ) );
QVERIFY( composition.contains( QStringLiteral( "dataset=\"%1\"" ).arg( geoPdfExporter.mTemporaryFilePaths.value( linesLayer->id() ) ) ) );
#endif
// read in as vector
std::unique_ptr< QgsVectorLayer > layer1 = qgis::make_unique< QgsVectorLayer >( QStringLiteral( "%1|layername=lines" ).arg( outputFile ),
QStringLiteral( "lines" ), QStringLiteral( "ogr" ) );
QVERIFY( layer1->isValid() );
QCOMPARE( layer1->featureCount(), 6 );
std::unique_ptr< QgsVectorLayer > layer2 = qgis::make_unique< QgsVectorLayer >( QStringLiteral( "%1|layername=points" ).arg( outputFile ),
QStringLiteral( "lines" ), QStringLiteral( "ogr" ) );
QVERIFY( layer2->isValid() );
QCOMPARE( layer2->featureCount(), 32 );
std::unique_ptr< QgsVectorLayer > layer3 = qgis::make_unique< QgsVectorLayer >( QStringLiteral( "%1|layername=polys" ).arg( outputFile ),
QStringLiteral( "lines" ), QStringLiteral( "ogr" ) );
QVERIFY( layer3->isValid() );
QCOMPARE( layer3->featureCount(), 10 );

}

QGSTEST_MAIN( TestQgsLayoutGeoPdfExport )
Expand Down

0 comments on commit 36c6dc7

Please sign in to comment.