[WFS provider] Include typename in sublayers name

qgis · Jan 3, 2023 · dfadba6 · dfadba6
1 parent 541da34
commit dfadba6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/providers/wfs/qgswfsprovidermetadata.cpp b/src/providers/wfs/qgswfsprovidermetadata.cpp
@@ -349,7 +349,7 @@ QList<QgsProviderSublayerDetails> QgsWfsProviderMetadata::querySublayers( const
         details.setType( QgsMapLayerType::VectorLayer );
         details.setProviderKey( QgsWFSProvider::WFS_PROVIDER_KEY );
         details.setUri( uri + QStringLiteral( " " ) + QgsWFSConstants::URI_PARAM_GEOMETRY_TYPE_FILTER + QStringLiteral( "='" ) + QgsWkbTypes::displayString( tuple.wkbType ) + QStringLiteral( "'" ) );
-        details.setName( QgsWkbTypes::translatedDisplayString( tuple.wkbType ) );
+        details.setName( wfsUri.typeName() + QStringLiteral( " " ) + QgsWkbTypes::translatedDisplayString( tuple.wkbType ) );
         details.setWkbType( tuple.wkbType );
         if ( countsAllValid )
           details.setFeatureCount( featureCounts[tuple.index] );

diff --git a/tests/src/python/test_provider_wfs.py b/tests/src/python/test_provider_wfs.py
@@ -5823,6 +5823,7 @@ def testDeegreeServerWithUnknownGeometryType(self):
 
         self.assertEqual(sublayers[0].uri(), uri + " geometryTypeFilter='NoGeometry'")
         self.assertEqual(sublayers[0].type(), QgsMapLayerType.VectorLayer)
+        self.assertEqual(sublayers[0].name(), "my:typename " + QgsWkbTypes.translatedDisplayString(QgsWkbTypes.NoGeometry))
         self.assertEqual(sublayers[0].providerKey(), "WFS")
         self.assertEqual(sublayers[0].wkbType(), QgsWkbTypes.NoGeometry)
         self.assertEqual(sublayers[0].featureCount(), 2)