Simplify code for excluding attributes from WMS server. Works now als…

…o with embedded layers

src/mapserver/qgsconfigparser.h

@@ -112,9 +112,6 @@ class QgsConfigParser
        Default implementation returns an empty map*/
     virtual QMap< QString, QMap< int, QString > > layerAliasInfo() const { return QMap< QString, QMap<int, QString> > (); }
 
-    /**Returns attributes excluded from WMS publication. Key is layer id, value is a set containing the names of the hidden attributes*/
-    virtual QMap< QString, QSet<QString> > wmsExcludedAttributes() const { return QMap< QString, QSet<QString> >(); }
-
     /**Returns attributes excluded from WFS publication. Key is layer id, value is a set containing the names of the hidden attributes*/
     virtual QMap< QString, QSet<QString> > wfsExcludedAttributes() const { return QMap< QString, QSet<QString> >(); }
 

src/mapserver/qgsprojectparser.cpp

@@ -196,7 +196,7 @@ void QgsProjectParser::featureTypeList( QDomElement& parentElement, QDomDocument
         bBoxElement.setAttribute( "maxx", QString::number( layerExtent.xMaximum() ) );
         bBoxElement.setAttribute( "maxy", QString::number( layerExtent.yMaximum() ) );
         layerElem.appendChild( bBoxElement );
-        
+
         //wfs:Operations element
         QDomElement operationsElement = doc.createElement( "Operations"/*wfs:Operations*/ );
         //wfs:Query element
@@ -205,21 +205,21 @@ void QgsProjectParser::featureTypeList( QDomElement& parentElement, QDomDocument
 
         QgsVectorLayer* vlayer = qobject_cast<QgsVectorLayer*>( layer );
         QgsVectorDataProvider* provider = vlayer->dataProvider();
-        if ( ( provider->capabilities() & QgsVectorDataProvider::AddFeatures ) && wfstInsertLayersId.contains( layer->id() ) )
+        if (( provider->capabilities() & QgsVectorDataProvider::AddFeatures ) && wfstInsertLayersId.contains( layer->id() ) )
         {
           //wfs:Insert element
           QDomElement insertElement = doc.createElement( "Insert"/*wfs:Insert*/ );
           operationsElement.appendChild( insertElement );
         }
-        if ( (provider->capabilities() & QgsVectorDataProvider::ChangeAttributeValues ) && 
-             (provider->capabilities() & QgsVectorDataProvider::ChangeGeometries ) && 
-             wfstUpdateLayersId.contains( layer->id() ) )
+        if (( provider->capabilities() & QgsVectorDataProvider::ChangeAttributeValues ) &&
+            ( provider->capabilities() & QgsVectorDataProvider::ChangeGeometries ) &&
+            wfstUpdateLayersId.contains( layer->id() ) )
         {
           //wfs:Update element
           QDomElement updateElement = doc.createElement( "Update"/*wfs:Update*/ );
           operationsElement.appendChild( updateElement );
         }
-        if ( ( provider->capabilities() & QgsVectorDataProvider::DeleteFeatures ) && wfstDeleteLayersId.contains( layer->id() ) )
+        if (( provider->capabilities() & QgsVectorDataProvider::DeleteFeatures ) && wfstDeleteLayersId.contains( layer->id() ) )
         {
           //wfs:Delete element
           QDomElement deleteElement = doc.createElement( "Delete"/*wfs:Delete*/ );
@@ -1204,27 +1204,6 @@ QMap< QString, QMap< int, QString > > QgsProjectParser::layerAliasInfo() const
   return resultMap;
 }
 
-QMap< QString, QSet<QString> > QgsProjectParser::wmsExcludedAttributes() const
-{
-  QMap< QString, QSet<QString> > resultMap;
-  QList<QDomElement>::const_iterator layerIt = mProjectLayerElements.constBegin();
-  for ( ; layerIt != mProjectLayerElements.constEnd(); ++layerIt )
-  {
-    QDomElement excludeWMSElem = layerIt->firstChildElement( "excludeAttributesWMS" );
-    QDomNodeList attributeNodeList = excludeWMSElem.elementsByTagName( "attribute" );
-    if ( attributeNodeList.size() > 0 )
-    {
-      QSet<QString> layerExcludedAttributes;
-      for ( int i = 0; i < attributeNodeList.size(); ++i )
-      {
-        layerExcludedAttributes.insert( attributeNodeList.at( i ).toElement().text() );
-      }
-      resultMap.insert( layerId( *layerIt ), layerExcludedAttributes );
-    }
-  }
-  return resultMap;
-}
-
 /**Returns attributes excluded from WFS publication. Key is layer id, value is a set containing the names of the hidden attributes*/
 QMap< QString, QSet<QString> > QgsProjectParser::wfsExcludedAttributes() const
 {

src/mapserver/qgsprojectparser.h

@@ -90,9 +90,6 @@ class QgsProjectParser: public QgsConfigParser
        Default implementation returns an empty map*/
     virtual QMap< QString, QMap< int, QString > > layerAliasInfo() const;
 
-    /**Returns attributes excluded from WMS publication. Key is layer id, value is a set containing the names of the hidden attributes*/
-    virtual QMap< QString, QSet<QString> > wmsExcludedAttributes() const;
-
     /**Returns attributes excluded from WFS publication. Key is layer id, value is a set containing the names of the hidden attributes*/
     virtual QMap< QString, QSet<QString> > wfsExcludedAttributes() const;
 

src/mapserver/qgswmsserver.cpp

@@ -731,7 +731,6 @@ int QgsWMSServer::getFeatureInfo( QDomDocument& result, QString version )
 
   QStringList nonIdentifiableLayers = mConfigParser->identifyDisabledLayers();
   QMap< QString, QMap< int, QString > > aliasInfo = mConfigParser->layerAliasInfo();
-  QMap< QString, QSet<QString> > excludedAttributes = mConfigParser->wmsExcludedAttributes();
 
   //Render context is needed to determine feature visibility for vector layers
   QgsRenderContext renderContext;
@@ -788,16 +787,8 @@ int QgsWMSServer::getFeatureInfo( QDomDocument& result, QString version )
           layerAliasInfo = aliasIt.value();
         }
 
-        //excluded attributes for this layer
-        QSet<QString> layerExcludedAttributes;
-        QMap< QString, QSet<QString> >::const_iterator excludedIt = excludedAttributes.find( currentLayer->id() );
-        if ( excludedIt != excludedAttributes.constEnd() )
-        {
-          layerExcludedAttributes = excludedIt.value();
-        }
-
         if ( featureInfoFromVectorLayer( vectorLayer, infoPoint, featureCount, result, layerElement, mMapRenderer, renderContext,
-                                         layerAliasInfo, layerExcludedAttributes, version, featuresRect ) != 0 )
+                                         version, featuresRect ) != 0 )
         {
           continue;
         }
@@ -1163,8 +1154,6 @@ int QgsWMSServer::featureInfoFromVectorLayer( QgsVectorLayer* layer,
     QDomElement& layerElement,
     QgsMapRenderer* mapRender,
     QgsRenderContext& renderContext,
-    QMap<int, QString>& aliasMap,
-    QSet<QString>& excludedAttributes,
     QString version,
     QgsRectangle* featureBBox ) const
 {
@@ -1208,6 +1197,7 @@ int QgsWMSServer::featureInfoFromVectorLayer( QgsVectorLayer* layer,
   int featureCounter = 0;
   const QgsFieldMap& fields = provider->fields();
   bool addWktGeometry = mConfigParser && mConfigParser->featureInfoWithWktGeometry();
+  const QSet<QString>& excludedAttributes = layer->excludeAttributesWMS();
 
   provider->select( provider->attributeIndexes(), searchRect, addWktGeometry || featureBBox, true );
   while ( provider->nextFeature( feature ) )
@@ -1252,24 +1242,14 @@ int QgsWMSServer::featureInfoFromVectorLayer( QgsVectorLayer* layer,
     featureAttributes = feature.attributeMap();
     for ( QgsAttributeMap::const_iterator it = featureAttributes.begin(); it != featureAttributes.end(); ++it )
     {
-
-      QString attributeName = fields[it.key()].name();
       //skip attribute if it is explicitely excluded from WMS publication
-      if ( excludedAttributes.contains( attributeName ) )
+      if ( excludedAttributes.contains( fields[it.key()].name() ) )
       {
         continue;
       }
 
-      //check if the attribute name should be replaced with an alias
-      QMap<int, QString>::const_iterator aliasIt = aliasMap.find( it.key() );
-      if ( aliasIt != aliasMap.constEnd() )
-      {
-        QString aliasName = aliasIt.value();
-        if ( !aliasName.isEmpty() )
-        {
-          attributeName = aliasName;
-        }
-      }
+      //replace attribute name if there is an attribute alias?
+      QString attributeName = layer->attributeDisplayName( it.key() );
 
       QDomElement attributeElement = infoDocument.createElement( "Attribute" );
       attributeElement.setAttribute( "name", attributeName );

src/mapserver/qgswmsserver.h

@@ -117,7 +117,7 @@ class QgsWMSServer
     @param featureBBox the bounding box of the selected features in output CRS
     @return 0 in case of success*/
     int featureInfoFromVectorLayer( QgsVectorLayer* layer, const QgsPoint* infoPoint, int nFeatures, QDomDocument& infoDocument, QDomElement& layerElement, QgsMapRenderer* mapRender,
-                                    QgsRenderContext& renderContext, QMap<int, QString>& aliasMap, QSet<QString>& excludedAttributes, QString version, QgsRectangle* featureBBox = 0 ) const;
+                                    QgsRenderContext& renderContext, QString version, QgsRectangle* featureBBox = 0 ) const;
     /**Appends feature info xml for the layer to the layer element of the dom document*/
     int featureInfoFromRasterLayer( QgsRasterLayer* layer, const QgsPoint* infoPoint, QDomDocument& infoDocument, QDomElement& layerElement, QString version ) const;