Fix check if ATLAS_PK parameter is there

qgis · Jan 5, 2019 · 22e54ba1ae38a52bc8e1e9e60a92fd64dc268a91 · 22e54ba
1 parent 179be5a
commit 22e54ba1ae38a52bc8e1e9e60a92fd64dc268a91
Unified Split

Showing with 1 addition and 8 deletions.

+0 −5 src/server/services/wms/qgswmsparameters.cpp

+0 −2 src/server/services/wms/qgswmsparameters.h

+1 −1 src/server/services/wms/qgswmsrenderer.cpp
diff --git a/src/server/services/wms/qgswmsparameters.cpp b/src/server/services/wms/qgswmsparameters.cpp
@@ -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();

diff --git a/src/server/services/wms/qgswmsparameters.h b/src/server/services/wms/qgswmsparameters.h
@@ -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;
 

diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp
@@ -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() )