Merge pull request #42100 from elpaso/bugfix-unreported-wms-cascading…

…-fid

WMS cascading: fix unreported issue wih missing fids

src/providers/wms/qgswmsprovider.cpp

@@ -3490,6 +3490,23 @@ QgsRasterIdentifyResult QgsWmsProvider::identify( const QgsPointXY &point, QgsRa
             params.insert( QStringLiteral( "getFeatureInfoUrl" ), requestUrl.toString() );
             featureStore.setParams( params );
 
+            // Try to parse and set feature id if matches "<some string>.<integer>"
+            if ( f.value( QLatin1String( "id" ) ).isString() )
+            {
+              const thread_local QRegularExpression re{ R"raw(\.(\d+)$)raw" };
+              const QString idVal { f.value( QLatin1String( "id" ) ).toString() };
+              const QRegularExpressionMatch match { re.match( idVal ) };
+              if ( match.hasMatch() )
+              {
+                bool ok;
+                QgsFeatureId id { match.captured( 1 ).toLongLong( &ok ) };
+                if ( ok )
+                {
+                  feature.setId( id );
+                }
+              }
+            }
+
             feature.setValid( true );
             featureStore.addFeature( feature );
 

src/server/services/wms/qgswmsrenderer.cpp

@@ -2508,7 +2508,7 @@ namespace QgsWms
     if ( layer && layer->dataProvider() )
       fid = QgsServerFeatureId::getServerFid( *feat, layer->dataProvider()->pkAttributeIndexes() );
     else
-      fid = feat->id();
+      fid = FID_TO_STRING( feat->id() );
 
     typeNameElement.setAttribute( QStringLiteral( "fid" ), QStringLiteral( "%1.%2" ).arg( typeName, fid ) );