Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Version 1.3.0 is always used in case of GetProjectSettings request
  • Loading branch information
pblottiere committed Mar 9, 2021
1 parent 0e9edb9 commit d5e805e
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 13 deletions.
3 changes: 1 addition & 2 deletions src/server/services/wms/qgswms.cpp
Expand Up @@ -107,8 +107,7 @@ namespace QgsWms
}
else if ( QSTR_COMPARE( req, "GetProjectSettings" ) )
{
//getProjectSettings extends WMS 1.3.0 capabilities
writeGetCapabilities( mServerIface, project, QStringLiteral( "1.3.0" ), request, response, true );
writeGetCapabilities( mServerIface, project, version, request, response, true );
}
else if ( QSTR_COMPARE( req, "GetMap" ) )
{
Expand Down
24 changes: 13 additions & 11 deletions src/server/services/wms/qgswmsparameters.cpp
Expand Up @@ -755,37 +755,39 @@ namespace QgsWms

QString QgsWmsParameters::version() const
{
QString vStr = QgsServerParameters::version();
QString version = QgsServerParameters::version();

QgsProjectVersion version;

if ( vStr.isEmpty() )
if ( request().compare( QLatin1String( "GetProjectSettings" ), Qt::CaseInsensitive ) == 0 )
{
version = QStringLiteral( "1.3.0" );
}
else if ( version.isEmpty() )
{
if ( ! wmtver().isEmpty() )
{
vStr = wmtver();
version = wmtver();
}
else
{
vStr = QStringLiteral( "1.3.0" );
version = QStringLiteral( "1.3.0" );
}
}
else if ( !mVersions.contains( QgsProjectVersion( vStr ) ) )
else if ( !mVersions.contains( QgsProjectVersion( version ) ) )
{
// WMS 1.3.0 specification: If a version lower than any of those
// known to the server is requested, then the server shall send the
// lowest version it supports.
if ( QgsProjectVersion( 1, 1, 1 ) > QgsProjectVersion( vStr ) )
if ( QgsProjectVersion( 1, 1, 1 ) > QgsProjectVersion( version ) )
{
vStr = QStringLiteral( "1.1.1" );
version = QStringLiteral( "1.1.1" );
}
else
{
vStr = QStringLiteral( "1.3.0" );
version = QStringLiteral( "1.3.0" );
}
}

return vStr;
return version;
}

QgsProjectVersion QgsWmsParameters::versionAsNumber() const
Expand Down

0 comments on commit d5e805e

Please sign in to comment.