[Server] Refactoring, removing config parser from WMS

python/server/qgsserverprojectutils.sip

@@ -129,6 +129,14 @@ namespace QgsServerProjectUtils
  :rtype: int
 %End
 
+  int wmsImageQuality( const QgsProject &project );
+%Docstring
+ Returns the quality for WMS images defined in a QGIS project.
+ \param project the QGIS project
+ :return: quality if defined in project, -1 otherwise.
+ :rtype: int
+%End
+
   bool wmsUseLayerIds( const QgsProject &project );
 %Docstring
  Returns if layer ids are used as name in WMS.

src/server/qgsserverprojectutils.cpp

@@ -105,6 +105,11 @@ bool QgsServerProjectUtils::wmsUseLayerIds( const QgsProject &project )
   return project.readBoolEntry( QStringLiteral( "WMSUseLayerIDs" ), QStringLiteral( "/" ), false );
 }
 
+int QgsServerProjectUtils::wmsImageQuality( const QgsProject &project )
+{
+  return project.readNumEntry( QStringLiteral( "WMSImageQuality" ), QStringLiteral( "/" ), -1 );
+}
+
 bool QgsServerProjectUtils::wmsInfoFormatSia2045( const QgsProject &project )
 {
   QString sia2045 = project.readEntry( QStringLiteral( "WMSInfoFormatSIA2045" ), QStringLiteral( "/" ), "" );

src/server/qgsserverprojectutils.h

@@ -120,6 +120,12 @@ namespace QgsServerProjectUtils
     */
   SERVER_EXPORT int wmsMaxHeight( const QgsProject &project );
 
+  /** Returns the quality for WMS images defined in a QGIS project.
+    * \param project the QGIS project
+    * \returns quality if defined in project, -1 otherwise.
+    */
+  SERVER_EXPORT int wmsImageQuality( const QgsProject &project );
+
   /** Returns if layer ids are used as name in WMS.
     * \param project the QGIS project
     * \returns if layer ids are used as name.

src/server/services/wms/qgsdxfwriter.cpp

@@ -54,7 +54,7 @@ namespace QgsWms
     Q_UNUSED( version );
 
     QgsServerRequest::Parameters params = request.parameters();
-    QgsRenderer renderer( serverIface, project, params, getConfigParser( serverIface ) );
+    QgsRenderer renderer( serverIface, project, params );
 
     QMap<QString, QString> formatOptionsMap = parseFormatOptions( params.value( QStringLiteral( "FORMAT_OPTIONS" ) ) );
 

src/server/services/wms/qgswmsgetcontext.cpp

@@ -67,8 +67,6 @@ namespace QgsWms
   {
     Q_UNUSED( version );
 
-    //QgsWmsConfigParser  *configParser = getConfigParser( serverIface );
-
     QDomDocument doc;
     QDomProcessingInstruction xmlDeclaration = doc.createProcessingInstruction( QStringLiteral( "xml" ),
         QStringLiteral( "version=\"1.0\" encoding=\"utf-8\"" ) );

src/server/services/wms/qgswmsgetfeatureinfo.cpp

@@ -31,7 +31,7 @@ namespace QgsWms
   {
     Q_UNUSED( version );
     QgsServerRequest::Parameters params = request.parameters();
-    QgsRenderer renderer( serverIface, project, params, getConfigParser( serverIface ) );
+    QgsRenderer renderer( serverIface, project, params );
 
     QString infoFormat = params.value( QStringLiteral( "INFO_FORMAT" ), QStringLiteral( "text/plain" ) );
 

src/server/services/wms/qgswmsgetlegendgraphics.cpp

@@ -34,7 +34,7 @@ namespace QgsWms
     Q_UNUSED( version );
 
     QgsServerRequest::Parameters params = request.parameters();
-    QgsRenderer renderer( serverIface, project, params, getConfigParser( serverIface ) );
+    QgsRenderer renderer( serverIface, project, params );
 
     std::unique_ptr<QImage> result( renderer.getLegendGraphics() );
 

src/server/services/wms/qgswmsgetmap.cpp

@@ -34,7 +34,7 @@ namespace QgsWms
     Q_UNUSED( version );
 
     QgsServerRequest::Parameters params = request.parameters();
-    QgsRenderer renderer( serverIface, project, params, getConfigParser( serverIface ) );
+    QgsRenderer renderer( serverIface, project, params );
 
     std::unique_ptr<QImage> result( renderer.getMap() );
     if ( result )

src/server/services/wms/qgswmsgetprint.cpp

@@ -32,7 +32,7 @@ namespace QgsWms
 
     Q_UNUSED( version );
 
-    QgsRenderer renderer( serverIface, project, params, getConfigParser( serverIface ) );
+    QgsRenderer renderer( serverIface, project, params );
 
     QString format = params.value( "FORMAT" );
     QString contentType;