remove deprecated usage in server

qgis · Sep 15, 2020 · 81064f6 · 81064f6
1 parent 9cf85dd
commit 81064f6
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 24 deletions.
diff --git a/src/server/services/landingpage/qgslandingpageutils.cpp b/src/server/services/landingpage/qgslandingpageutils.cpp
@@ -453,34 +453,34 @@ json QgsLandingPageUtils::projectInfo( const QString &projectUri )
           wmsLayer[ "pk" ] = vl->primaryKeyAttributes();
           int fieldIdx { 0 };
           json fieldsData;
-          const auto &cFields { vl->fields() };
-          for ( const auto &f : cFields )
+          const QgsFields &cFields { vl->fields() };
+          for ( const QgsField &field : cFields )
           {
-            if ( vl->excludeAttributesWfs().contains( vl->name() ) )
+            if ( !field.configurationFlags().testFlag( QgsField::ConfigurationFlag::Wfs ) )
             {
               ++fieldIdx;
               continue;
             }
-            const auto &constraints { f.constraints().constraints() };
+            const QgsFieldConstraints::Constraints constraints { field.constraints().constraints() };
             const bool notNull { constraints &QgsFieldConstraints::Constraint::ConstraintNotNull &&
-                                 f.constraints().constraintStrength( QgsFieldConstraints::Constraint::ConstraintNotNull ) == QgsFieldConstraints::ConstraintStrength::ConstraintStrengthHard };
+                                 field.constraints().constraintStrength( QgsFieldConstraints::Constraint::ConstraintNotNull ) == QgsFieldConstraints::ConstraintStrength::ConstraintStrengthHard };
             const bool unique { constraints &QgsFieldConstraints::Constraint::ConstraintUnique &&
-                                f.constraints().constraintStrength( QgsFieldConstraints::Constraint::ConstraintUnique ) == QgsFieldConstraints::ConstraintStrength::ConstraintStrengthHard };
+                                field.constraints().constraintStrength( QgsFieldConstraints::Constraint::ConstraintUnique ) == QgsFieldConstraints::ConstraintStrength::ConstraintStrengthHard };
             const bool hasExpression { constraints &QgsFieldConstraints::Constraint::ConstraintExpression &&
-                                       f.constraints().constraintStrength( QgsFieldConstraints::Constraint::ConstraintExpression ) == QgsFieldConstraints::ConstraintStrength::ConstraintStrengthHard };
+                                       field.constraints().constraintStrength( QgsFieldConstraints::Constraint::ConstraintExpression ) == QgsFieldConstraints::ConstraintStrength::ConstraintStrengthHard };
             const QString &defaultValue { vl->dataProvider()->defaultValueClause( fieldIdx ) };
             const bool isReadOnly( notNull && unique && ! defaultValue.isEmpty() );
-            fieldsData[ f.name().toStdString() ] =
+            fieldsData[ field.name().toStdString() ] =
             {
-              { "type", f.typeName().toStdString() },
-              { "label", f.alias().isEmpty() ? f.name().toStdString() : f.alias().toStdString() },
-              { "precision", f.precision() },
-              { "length", f.length() },
+              { "type", field.typeName().toStdString() },
+              { "label", field.alias().isEmpty() ? field.name().toStdString() : field.alias().toStdString() },
+              { "precision", field.precision() },
+              { "length", field.length() },
               { "unique", unique },
               { "not_null", notNull },
               { "has_expression", hasExpression },
               { "default", defaultValue.toStdString() },
-              { "expression", f.constraints().constraintExpression().toStdString() },
+              { "expression", field.constraints().constraintExpression().toStdString() },
               { "editable", !isReadOnly }
             };
 

diff --git a/src/server/services/wfs/qgswfsdescribefeaturetype.cpp b/src/server/services/wfs/qgswfsdescribefeaturetype.cpp
@@ -262,13 +262,12 @@ namespace QgsWfs
     //Attributes
     QgsFields fields = layer->fields();
     //hidden attributes for this layer
-    const QSet<QString> &layerExcludedAttributes = layer->excludeAttributesWfs();
     for ( int idx = 0; idx < fields.count(); ++idx )
     {
       const QgsField field = fields.at( idx );
       QString attributeName = field.name();
       //skip attribute if excluded from WFS publication
-      if ( layerExcludedAttributes.contains( attributeName ) )
+      if ( !field.configurationFlags().testFlag( QgsField::ConfigurationFlag::Wfs ) )
       {
         continue;
       }

diff --git a/src/server/services/wfs3/qgswfs3handlers.cpp b/src/server/services/wfs3/qgswfs3handlers.cpp
@@ -242,13 +242,12 @@ QgsFields QgsWfs3AbstractItemsHandler::publishedFields( const QgsVectorLayer *vL
   QStringList publishedAttributes = QStringList();
   // Removed attributes
   // WFS excluded attributes for this layer
-  const QSet<QString> &layerExcludedAttributes = vLayer->excludeAttributesWfs();
   const QgsFields &fields = vLayer->fields();
-  for ( int i = 0; i < fields.count(); ++i )
+  for ( const QgsField &field : fields )
   {
-    if ( ! layerExcludedAttributes.contains( fields.at( i ).name() ) )
+    if ( field.configurationFlags().testFlag( QgsField::ConfigurationFlag::Wfs ) )
     {
-      publishedAttributes.push_back( fields.at( i ).name() );
+      publishedAttributes.push_back( field.name() );
     }
   }
 

diff --git a/src/server/services/wms/qgswmsgetcapabilities.cpp b/src/server/services/wms/qgswmsgetcapabilities.cpp
@@ -1862,7 +1862,6 @@ namespace QgsWms
         case QgsMapLayerType::VectorLayer:
         {
           QgsVectorLayer *vLayer = static_cast<QgsVectorLayer *>( currentLayer );
-          const QSet<QString> &excludedAttributes = vLayer->excludeAttributesWms();
 
           int displayFieldIdx = -1;
           QString displayField = QStringLiteral( "maptip" );
@@ -1879,7 +1878,7 @@ namespace QgsWms
           for ( int idx = 0; idx < layerFields.count(); ++idx )
           {
             QgsField field = layerFields.at( idx );
-            if ( excludedAttributes.contains( field.name() ) )
+            if ( !field.configurationFlags().testFlag( QgsField::ConfigurationFlag::Wms ) )
             {
               continue;
             }

diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp
@@ -1447,7 +1447,6 @@ namespace QgsWms
     const QgsFields fields = layer->fields();
     bool addWktGeometry = ( QgsServerProjectUtils::wmsFeatureInfoAddWktGeometry( *mProject ) && mWmsParameters.withGeometry() );
     bool segmentizeWktGeometry = QgsServerProjectUtils::wmsFeatureInfoSegmentizeWktGeometry( *mProject );
-    const QSet<QString> &excludedAttributes = layer->excludeAttributesWms();
 
     bool hasGeometry = QgsServerProjectUtils::wmsFeatureInfoAddWktGeometry( *mProject ) || addWktGeometry || featureBBox || layerFilterGeom;
     fReq.setFlags( ( ( hasGeometry ) ? QgsFeatureRequest::NoFlags : QgsFeatureRequest::NoGeometry ) | QgsFeatureRequest::ExactIntersect );
@@ -1568,7 +1567,7 @@ namespace QgsWms
         for ( int i = 0; i < featureAttributes.count(); ++i )
         {
           //skip attribute if it is explicitly excluded from WMS publication
-          if ( excludedAttributes.contains( fields.at( i ).name() ) )
+          if ( fields.at( i ).configurationFlags().testFlag( QgsField::ConfigurationFlag::Wms ) )
           {
             continue;
           }
@@ -2417,7 +2416,7 @@ namespace QgsWms
     {
       QString attributeName = fields.at( i ).name();
       //skip attribute if it is explicitly excluded from WMS publication
-      if ( layer && layer->excludeAttributesWms().contains( attributeName ) )
+      if ( !fields.at( i ).configurationFlags().testFlag( QgsField::ConfigurationFlag::Wms ) )
       {
         continue;
       }