Skip to content

Commit

Permalink
Fix check if ATLAS_PK parameter is there
Browse files Browse the repository at this point in the history
  • Loading branch information
mhugent committed Jan 5, 2019
1 parent 179be5a commit 22e54ba
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 8 deletions.
5 changes: 0 additions & 5 deletions src/server/services/wms/qgswmsparameters.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1137,11 +1137,6 @@ namespace QgsWms
return label;
}

bool QgsWmsParameters::atlasPrint() const
{
return mWmsParameters.contains( QgsWmsParameter::ATLAS_PK );
}

QStringList QgsWmsParameters::atlasPk() const
{
return mWmsParameters[ QgsWmsParameter::ATLAS_PK ].toStringList();
Expand Down
2 changes: 0 additions & 2 deletions src/server/services/wms/qgswmsparameters.h
Original file line number Diff line number Diff line change
Expand Up @@ -1149,8 +1149,6 @@ namespace QgsWms
*/
QString layoutParameter( const QString &id, bool &ok ) const;

//! True if ATLAS_ID parameter is set
bool atlasPrint() const;
//! Return ATLAS_ID parameter
QStringList atlasPk() const;

Expand Down
2 changes: 1 addition & 1 deletion src/server/services/wms/qgswmsrenderer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ namespace QgsWms
//atlas print?
QgsLayoutAtlas *atlas = 0;
QStringList atlasPk = mWmsParameters.atlasPk();
if ( mWmsParameters.atlasPrint() )
if ( atlasPk.size() > 0 ) //atlas print requested?
{
atlas = layout->atlas();
if ( !atlas || !atlas->enabled() )
Expand Down

0 comments on commit 22e54ba

Please sign in to comment.