Small fixes

qgis · Aug 17, 2019 · b3d4faa · b3d4faa
1 parent ed077f9
commit b3d4faa
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/src/core/layout/qgslayoutexporter.cpp b/src/core/layout/qgslayoutexporter.cpp
@@ -531,6 +531,8 @@ QgsLayoutExporter::ExportResult QgsLayoutExporter::exportToPdf( const QString &f
 
   mLayout->renderContext().setFlag( QgsLayoutRenderContext::FlagForceVectorOutput, settings.forceVectorOutput );
 
+  mLayout->renderContext().setFlag( QgsLayoutRenderContext::FlagRenderLabelsByMapLayer, true );
+
   mLayout->renderContext().setTextRenderFormat( settings.textRenderFormat );
 
   ExportResult result = Success;

diff --git a/src/core/layout/qgslayoutgeopdfexporter.cpp b/src/core/layout/qgslayoutgeopdfexporter.cpp
@@ -263,13 +263,28 @@ QString QgsLayoutGeoPdfExporter::createCompositionXml( const QList<ComponentLaye
   // layertree
   QDomElement layerTree = doc.createElement( QStringLiteral( "LayerTree" ) );
   //layerTree.setAttribute( QStringLiteral("displayOnlyOnVisiblePages"), QStringLiteral("true"));
+  QSet< QString > createdLayerIds;
   for ( const VectorComponentDetail &component : qgis::as_const( mVectorComponents ) )
   {
     QDomElement layer = doc.createElement( QStringLiteral( "Layer" ) );
     layer.setAttribute( QStringLiteral( "id" ), component.mapLayerId );
     layer.setAttribute( QStringLiteral( "name" ), component.name );
     layer.setAttribute( QStringLiteral( "initiallyVisible" ), QStringLiteral( "true" ) );
     layerTree.appendChild( layer );
+    createdLayerIds.insert( component.mapLayerId );
+  }
+  // some PDF components may not be linked to vector components - e.g. layers with labels but no features
+  for ( const ComponentLayerDetail &component : components )
+  {
+    if ( component.mapLayerId.isEmpty() || createdLayerIds.contains( component.mapLayerId ) )
+      continue;
+
+    QDomElement layer = doc.createElement( QStringLiteral( "Layer" ) );
+    layer.setAttribute( QStringLiteral( "id" ), component.mapLayerId );
+    layer.setAttribute( QStringLiteral( "name" ), component.name );
+    layer.setAttribute( QStringLiteral( "initiallyVisible" ), QStringLiteral( "true" ) );
+    layerTree.appendChild( layer );
+    createdLayerIds.insert( component.mapLayerId );
   }
   compositionElem.appendChild( layerTree );