Fix check if ATLAS_PK parameter is there

mhugent · mhugent · commit 22e54ba1ae38 · 2019-01-05T15:16:38.000+01:00
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() )

Original file line number	Diff line number	Diff line change
`@@ -1137,11 +1137,6 @@ namespace QgsWms`
`1137`	`1137`	`return label;`
`1138`	`1138`	`}`
`1139`	`1139`
`1140`		`- bool QgsWmsParameters::atlasPrint() const`
`1141`		`- {`
`1142`		`- return mWmsParameters.contains( QgsWmsParameter::ATLAS_PK );`
`1143`		`- }`
`1144`		`-`
`1145`	`1140`	`QStringList QgsWmsParameters::atlasPk() const`
`1146`	`1141`	`{`
`1147`	`1142`	`return mWmsParameters[ QgsWmsParameter::ATLAS_PK ].toStringList();`
Original file line number	Diff line number	Diff line change
`@@ -379,7 +379,7 @@ namespace QgsWms`
`379`	`379`	`//atlas print?`
`380`	`380`	`QgsLayoutAtlas *atlas = 0;`
`381`	`381`	`QStringList atlasPk = mWmsParameters.atlasPk();`
`382`		`- if ( mWmsParameters.atlasPrint() )`
	`382`	`+ if ( atlasPk.size() > 0 ) //atlas print requested?`
`383`	`383`	`{`
`384`	`384`	`atlas = layout->atlas();`
`385`	`385`	`if ( !atlas \|\| !atlas->enabled() )`