Consider attribute aliases and hidden attributes in GetProjectSettings. Don't show WFS layers in GetCapabilities

mhugent · mhugent · commit f0a8c6d5a982 · 2012-10-19T10:40:31.000+02:00
diff --git a/src/mapserver/qgsprojectparser.cpp b/src/mapserver/qgsprojectparser.cpp
@@ -583,6 +583,7 @@ void QgsProjectParser::addLayerProjectSettings( QDomElement& layerElem, QDomDocu
   if ( currentLayer->type() == QgsMapLayer::VectorLayer )
   {
     QgsVectorLayer* vLayer = static_cast<QgsVectorLayer*>( currentLayer );
+    const QSet<QString>& excludedAttributes = vLayer->excludeAttributesWMS();
 
     //displayfield
     layerElem.setAttribute( "displayField", vLayer->displayField() );
@@ -593,8 +594,12 @@ void QgsProjectParser::addLayerProjectSettings( QDomElement& layerElem, QDomDocu
     QgsFieldMap::const_iterator fieldIt = layerFields.constBegin();
     for ( ; fieldIt != layerFields.constEnd(); ++fieldIt )
     {
+      if ( excludedAttributes.contains( fieldIt->name() ) )
+      {
+        continue;
+      }
       QDomElement attributeElem = doc.createElement( "Attribute" );
-      attributeElem.setAttribute( "name", fieldIt->name() );
+      attributeElem.setAttribute( "name", vLayer->attributeDisplayName( fieldIt.key() ) );
       attributeElem.setAttribute( "type", QVariant::typeToName( fieldIt->type() ) );
 
       //edit type to text
diff --git a/src/mapserver/qgswmsserver.cpp b/src/mapserver/qgswmsserver.cpp
@@ -209,7 +209,10 @@ QDomDocument QgsWMSServer::getCapabilities( QString version, bool fullProjectInf
   {
     //Insert <ComposerTemplate> elements derived from wms:_ExtendedCapabilities
     mConfigParser->printCapabilities( capabilityElement, doc );
+  }
 
+  if ( mConfigParser && fullProjectInformation )
+  {
     //WFS layers
     QStringList wfsLayers = mConfigParser->wfsLayerNames();
     if ( wfsLayers.size() > 0 )
