sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-26 00:02:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Address PR comments

Browse Source
This commit is contained in:
Alessandro Pasotti 2021-10-29 16:50:43 +02:00
parent ce2d58d0a7
commit 6f8bed820b
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/server/services/wms/qgswmsrenderer.cpp
View File

@ -362,13 +362,16 @@ namespace QgsWms
else
{
const QgsAttributeList pkIndexes = cLayer->primaryKeyAttributes();
const int pkIndexesSize {std::max( pkIndexes.size(), 1 )};
if ( pkIndexesSize == 0 )
if ( pkIndexes.size() == 0 )
{
QgsDebugMsgLevel( QStringLiteral( "Atlas print: layer %1 has no primary key attributes" ).arg( cLayer->name() ), 2 );
}
// Handles the pk-less case
const int pkIndexesSize {std::max( pkIndexes.size(), 1 )};
QStringList pkAttributeNames;
for ( int pkIndex : pkIndexes )
for ( int pkIndex : std::as_const( pkIndexes ) )
{
pkAttributeNames.append( cLayer->fields().at( pkIndex ).name() );
}
@ -414,7 +417,7 @@ namespace QgsWms
{
filterString.append( " AND " );
}
filterString.append( QStringLiteral( "\"%1\" = %2" ).arg( pkAttributeNames.at( j ), atlasPk.at( currentAtlasPk ) ) );
filterString.append( QgsExpression::createFieldEqualityExpression( pkAttributeNames.at( j ), atlasPk.at( currentAtlasPk ) ) );
++currentAtlasPk;
}
}