[Bugfix][Server] WMS: Use QGIS Style instead of SLD to restore layer …

…style
qgis · Oct 24, 2019 · e1840c9 · e1840c9
1 parent 7f728ba
commit e1840c9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/src/server/services/wms/qgslayerrestorer.cpp b/src/server/services/wms/qgslayerrestorer.cpp
@@ -21,6 +21,7 @@
 #include "qgsrasterlayer.h"
 #include "qgsrasterrenderer.h"
 #include "qgsmaplayerstylemanager.h"
+#include "qgsreadwritecontext.h"
 
 QgsLayerRestorer::QgsLayerRestorer( const QList<QgsMapLayer *> &layers )
 {
@@ -36,9 +37,11 @@ QgsLayerRestorer::QgsLayerRestorer( const QList<QgsMapLayer *> &layers )
     layer->setCustomProperty( "readSLD", false );
 
     QString errMsg;
-    QDomDocument sldDoc;
-    layer->exportSldStyle( sldDoc, errMsg );
-    ( void )settings.mSldStyle.setContent( sldDoc.toString(), true ); // for namespace processing
+    QDomDocument styleDoc( QStringLiteral( "style" ) );
+    QDomElement styleXml = styleDoc.createElement( QStringLiteral( "style" ) );
+    styleDoc.appendChild( styleXml );
+    layer->writeStyle( styleXml, styleDoc, errMsg, QgsReadWriteContext() );
+    ( void )settings.mQgisStyle.setContent( styleDoc.toString() );
 
     switch ( layer->type() )
     {
@@ -82,13 +85,13 @@ QgsLayerRestorer::~QgsLayerRestorer()
     layer->styleManager()->setCurrentStyle( settings.mNamedStyle );
     layer->setName( mLayerSettings[layer].name );
 
-    // if a SLD file has been loaded for rendering, we restore the previous one
-    QString errMsg;
-    QDomElement root = settings.mSldStyle.firstChildElement( "StyledLayerDescriptor" );
-    QDomElement el = root.firstChildElement( "NamedLayer" );
+    // if a SLD file has been loaded for rendering, we restore the previous style
     if ( layer->customProperty( "readSLD", false ).toBool() )
     {
-      layer->readSld( el, errMsg );
+      QString errMsg;
+      QDomElement root = settings.mQgisStyle.documentElement();
+      QgsReadWriteContext context = QgsReadWriteContext();
+      layer->readStyle( root, errMsg, context );
     }
     layer->removeCustomProperty( "readSLD" );
 

diff --git a/src/server/services/wms/qgslayerrestorer.h b/src/server/services/wms/qgslayerrestorer.h
@@ -56,7 +56,7 @@ class QgsLayerRestorer
       QString name;
       double mOpacity;
       QString mNamedStyle;
-      QDomDocument mSldStyle;
+      QDomDocument mQgisStyle;
       QString mFilter;
       QgsFeatureIds mSelectedFeatureIds;
     };