Fix bad backport

qgis · Jan 28, 2021 · 6e5dfe9 · 6e5dfe9
1 parent b5e410f
commit 6e5dfe9
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp
@@ -2249,9 +2249,22 @@ namespace QgsWms
 
         for ( int j = 0; j < featuresNode.size(); ++j )
         {
+
           const QDomElement featureNode = featuresNode.at( j ).toElement();
-          const QgsFeatureId fid = featureNode.attribute( QStringLiteral( "id" ) ).toLongLong();
-          QgsFeature feature = QgsFeature( vl->getFeature( fid ) );
+          const QString fid = featureNode.attribute( QStringLiteral( "id" ) );
+          QgsFeature feature;
+          const QString expression { QgsServerFeatureId::getExpressionFromServerFid( fid, static_cast<QgsVectorDataProvider *>( layer->dataProvider() ) ) };
+          if ( expression.isEmpty() )
+          {
+            feature = vl->getFeature( fid.toLongLong() );
+          }
+          else
+          {
+            QgsFeatureRequest request { QgsExpression( expression )};
+            request.setFlags( QgsFeatureRequest::Flag::NoGeometry );
+            vl->getFeatures( request ).nextFeature( feature );
+          }
+
 
           fidMap.insert( feature.id(), fid );