fix using deprecated method for settings exclude fields from WMS/WFS (#…

…40603)
qgis · Dec 15, 2020 · 90c0faf · 90c0faf
1 parent f059703
commit 90c0faf
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 10 deletions.
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -3151,6 +3151,54 @@ QgsStringMap QgsVectorLayer::attributeAliases() const
   return mAttributeAliasMap;
 }
 
+QSet<QString> QgsVectorLayer::excludeAttributesWms() const
+{
+  QSet<QString> excludeList;
+  QMap< QString, QgsField::ConfigurationFlags >::const_iterator flagsIt = mFieldConfigurationFlags.constBegin();
+  for ( ; flagsIt != mFieldConfigurationFlags.constEnd(); ++flagsIt )
+  {
+    if ( flagsIt->testFlag( QgsField::ConfigurationFlag::HideFromWms ) )
+    {
+      excludeList << flagsIt.key();
+    }
+  }
+  return excludeList;
+}
+
+void QgsVectorLayer::setExcludeAttributesWms( const QSet<QString> &att )
+{
+  QMap< QString, QgsField::ConfigurationFlags >::iterator flagsIt = mFieldConfigurationFlags.begin();
+  for ( ; flagsIt != mFieldConfigurationFlags.end(); ++flagsIt )
+  {
+    flagsIt->setFlag( QgsField::ConfigurationFlag::HideFromWms, att.contains( flagsIt.key() ) );
+  }
+  updateFields();
+}
+
+QSet<QString> QgsVectorLayer::excludeAttributesWfs() const
+{
+  QSet<QString> excludeList;
+  QMap< QString, QgsField::ConfigurationFlags >::const_iterator flagsIt = mFieldConfigurationFlags.constBegin();
+  for ( ; flagsIt != mFieldConfigurationFlags.constEnd(); ++flagsIt )
+  {
+    if ( flagsIt->testFlag( QgsField::ConfigurationFlag::HideFromWfs ) )
+    {
+      excludeList << flagsIt.key();
+    }
+  }
+  return excludeList;
+}
+
+void QgsVectorLayer::setExcludeAttributesWfs( const QSet<QString> &att )
+{
+  QMap< QString, QgsField::ConfigurationFlags >::iterator flagsIt = mFieldConfigurationFlags.begin();
+  for ( ; flagsIt != mFieldConfigurationFlags.end(); ++flagsIt )
+  {
+    flagsIt->setFlag( QgsField::ConfigurationFlag::HideFromWfs, att.contains( flagsIt.key() ) );
+  }
+  updateFields();
+}
+
 bool QgsVectorLayer::deleteAttribute( int index )
 {
   if ( index < 0 || index >= fields().count() )

diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h
@@ -1875,25 +1875,25 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte
      * A set of attributes that are not advertised in WMS requests with QGIS server.
      * \deprecated since QGIS 3.16, use fields().configurationFlags() instead
      */
-    Q_DECL_DEPRECATED QSet<QString> excludeAttributesWms() const SIP_DEPRECATED { return mExcludeAttributesWMS; }
+    Q_DECL_DEPRECATED QSet<QString> excludeAttributesWms() const SIP_DEPRECATED;
 
     /**
      * A set of attributes that are not advertised in WMS requests with QGIS server.
      * \deprecated since QGIS 3.16, use setFieldConfigurationFlag instead
      */
-    Q_DECL_DEPRECATED void setExcludeAttributesWms( const QSet<QString> &att ) SIP_DEPRECATED { mExcludeAttributesWMS = att; }
+    Q_DECL_DEPRECATED void setExcludeAttributesWms( const QSet<QString> &att ) SIP_DEPRECATED;
 
     /**
      * A set of attributes that are not advertised in WFS requests with QGIS server.
      * \deprecated since QGIS 3.16, use fields().configurationFlags() instead
      */
-    Q_DECL_DEPRECATED QSet<QString> excludeAttributesWfs() const SIP_DEPRECATED { return mExcludeAttributesWFS; }
+    Q_DECL_DEPRECATED QSet<QString> excludeAttributesWfs() const SIP_DEPRECATED;
 
     /**
      * A set of attributes that are not advertised in WFS requests with QGIS server.
      * \deprecated since QGIS 3.16, use setFieldConfigurationFlag instead
      */
-    Q_DECL_DEPRECATED void setExcludeAttributesWfs( const QSet<QString> &att ) SIP_DEPRECATED { mExcludeAttributesWFS = att; }
+    Q_DECL_DEPRECATED void setExcludeAttributesWfs( const QSet<QString> &att ) SIP_DEPRECATED;
 
     /**
      * Deletes an attribute field (but does not commit it).
@@ -2898,12 +2898,6 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte
     //! Holds the configuration for the edit form
     QgsEditFormConfig mEditFormConfig;
 
-    //! Attributes which are not published in WMS
-    QSet<QString> mExcludeAttributesWMS;
-
-    //! Attributes which are not published in WFS
-    QSet<QString> mExcludeAttributesWFS;
-
     //! Geometry type as defined in enum WkbType (qgis.h)
     QgsWkbTypes::Type mWkbType = QgsWkbTypes::Unknown;