Fix raster layer names in GeoPDF exports are lost

Fixes #33306
qgis · Jun 4, 2020 · d864dc8 · d864dc8
1 parent f4e5810
commit d864dc8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/core/qgsmaprenderertask.cpp b/src/core/qgsmaprenderertask.cpp
@@ -184,7 +184,8 @@ bool QgsMapRendererTask::run()
     while ( !job->isFinished() )
     {
       QgsAbstractGeoPdfExporter::ComponentLayerDetail component;
-      component.name = QStringLiteral( "layer_%1" ).arg( outputLayer );
+
+      component.name = mLayerIdToLayerNameMap.value( job->currentLayerId(), QStringLiteral( "layer_%1" ).arg( outputLayer ) );
       component.mapLayerId = job->currentLayerId();
       component.sourcePdfPath = mGeoPdfExporter->generateTemporaryFilepath( QStringLiteral( "layer_%1.pdf" ).arg( outputLayer ) );
       pdfComponents << component;
@@ -445,6 +446,13 @@ void QgsMapRendererTask::prepare()
       mRenderedFeatureHandler = qgis::make_unique< QgsMapRendererTaskRenderedFeatureHandler >( static_cast< QgsMapRendererTaskGeoPdfExporter * >( mGeoPdfExporter.get() ), mMapSettings );
       mMapSettings.addRenderedFeatureHandler( mRenderedFeatureHandler.get() );
     }
+
+    const QList< QgsMapLayer * > layers = mMapSettings.layers();
+    for ( const QgsMapLayer *layer : layers )
+    {
+      mLayerIdToLayerNameMap.insert( layer->id(), layer->name() );
+    }
+
     mJob.reset( new QgsMapRendererStagedRenderJob( mMapSettings, QgsMapRendererStagedRenderJob::RenderLabelsByMapLayer ) );
     mJob->start();
     return;

diff --git a/src/core/qgsmaprenderertask.h b/src/core/qgsmaprenderertask.h
@@ -156,6 +156,7 @@ class CORE_EXPORT QgsMapRendererTask : public QgsTask
 
     QList< QgsAnnotation * > mAnnotations;
     QList< QgsMapDecoration * > mDecorations;
+    QMap< QString, QString> mLayerIdToLayerNameMap;
 
     int mError = 0;