Don't return empty layer names for mdal sublayers

qgis · Jul 12, 2021 · 829ef1f · 829ef1f
1 parent d7d50c5
commit 829ef1f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/providers/mdal/qgsmdalprovider.cpp b/src/providers/mdal/qgsmdalprovider.cpp
@@ -1087,6 +1087,11 @@ QList<QgsProviderSublayerDetails> QgsMdalProviderMetadata::querySublayers( const
 
     // strip the driver name and path from the MDAL uri to get the layer name
     details.setName( layerUri.mid( layerUri.indexOf( uri ) + uri.length() + 2 ) );
+    if ( details.name().isEmpty() )
+    {
+      // use file name as layer name if no layer name available from mdal
+      details.setName( info.completeBaseName() );
+    }
 
     res << details;
 

diff --git a/tests/src/core/testqgsmeshlayer.cpp b/tests/src/core/testqgsmeshlayer.cpp
@@ -1606,7 +1606,7 @@ void TestQgsMeshLayer::testMdalProviderQuerySublayers()
   res = mdalMetadata->querySublayers( mDataDir + "/quad_and_triangle.2dm" );
   QCOMPARE( res.count(), 1 );
   QCOMPARE( res.at( 0 ).layerNumber(), 0 );
-  QCOMPARE( res.at( 0 ).name(), QString( ) );
+  QCOMPARE( res.at( 0 ).name(), QStringLiteral( "quad_and_triangle" ) );
   QCOMPARE( res.at( 0 ).uri(), QStringLiteral( "2DM:\"%1/quad_and_triangle.2dm\"" ).arg( mDataDir ) );
   QCOMPARE( res.at( 0 ).providerKey(), QStringLiteral( "mdal" ) );
   QCOMPARE( res.at( 0 ).type(), QgsMapLayerType::MeshLayer );