Publish layer titles and abstracts in WMS capabilities

mhugent · mhugent · commit bea1a4667aa9 · 2011-12-15T17:22:37.000+01:00
diff --git a/src/mapserver/qgsconfigparser.cpp b/src/mapserver/qgsconfigparser.cpp
@@ -363,44 +363,34 @@ void QgsConfigParser::appendCRSElementsToLayer( QDomElement& layerElement, QDomD
 
   //insert the CRS elements after the title element to be in accordance with the WMS 1.3 specification
   QDomElement titleElement = layerElement.firstChildElement( "Title" );
+  QDomElement abstractElement = layerElement.firstChildElement( "Abstract" );
+  QDomElement CRSPrecedingElement = abstractElement.isNull() ? titleElement : abstractElement; //last element before the CRS elements
 
   //In case the number of advertised CRS is constrained
   QStringList constrainedCrsList = supportedOutputCrsList();
   if ( constrainedCrsList.size() > 0 )
   {
     for ( int i = constrainedCrsList.size() - 1; i >= 0; --i )
     {
-      appendCRSElementToLayer( layerElement, titleElement, constrainedCrsList.at( i ), doc );
-#if 0
-      QDomElement crsElement = doc.createElement( "CRS" );
-      QDomText crsText = doc.createTextNode( constrainedCrsList.at( i ) );
-      crsElement.appendChild( crsText );
-      layerElement.insertAfter( crsElement, titleElement );
-#endif
+      appendCRSElementToLayer( layerElement, CRSPrecedingElement, constrainedCrsList.at( i ), doc );
     }
   }
   else //no crs constraint
   {
     foreach( QString crs, crsList )
     {
-      appendCRSElementToLayer( layerElement, titleElement, crs, doc );
-#if 0
-      QDomElement crsElement = doc.createElement( "CRS" );
-      QDomText crsText = doc.createTextNode( *crsIt );
-      crsElement.appendChild( crsText );
-      layerElement.insertAfter( crsElement, titleElement );
-#endif
+      appendCRSElementToLayer( layerElement, CRSPrecedingElement, crs, doc );
     }
   }
 }
 
-void QgsConfigParser::appendCRSElementToLayer( QDomElement& layerElement, const QDomElement& titleElement, const QString& crsText, QDomDocument& doc ) const
+void QgsConfigParser::appendCRSElementToLayer( QDomElement& layerElement, const QDomElement& precedingElement, const QString& crsText, QDomDocument& doc ) const
 {
   QString version = doc.documentElement().attribute( "version" );
   QDomElement crsElement = doc.createElement( version == "1.1.1" ? "SRS" : "CRS" );
   QDomText crsTextNode = doc.createTextNode( crsText );
   crsElement.appendChild( crsTextNode );
-  layerElement.insertAfter( crsElement, titleElement );
+  layerElement.insertAfter( crsElement, precedingElement );
 }
 
 QgsComposition* QgsConfigParser::createPrintComposition( const QString& composerTemplate, QgsMapRenderer* mapRenderer, const QMap< QString, QString >& parameterMap ) const
diff --git a/src/mapserver/qgsconfigparser.h b/src/mapserver/qgsconfigparser.h
@@ -170,7 +170,7 @@ class QgsConfigParser
     @return true in case of success*/
     bool crsSetForLayer( const QDomElement& layerElement, QSet<QString> &crsSet ) const;
     void appendCRSElementsToLayer( QDomElement& layerElement, QDomDocument& doc, const QStringList &crsList ) const;
-    void appendCRSElementToLayer( QDomElement& layerElement, const QDomElement& titleElement, const QString& crsText, QDomDocument& doc ) const;
+    void appendCRSElementToLayer( QDomElement& layerElement, const QDomElement& precedingElement, const QString& crsText, QDomDocument& doc ) const;
 
     void setDefaultLegendSettings();
 };
diff --git a/src/mapserver/qgsprojectparser.cpp b/src/mapserver/qgsprojectparser.cpp
@@ -239,10 +239,24 @@ void QgsProjectParser::addLayers( QDomDocument &doc,
       layerElem.appendChild( nameElem );
 
       QDomElement titleElem = doc.createElement( "Title" );
-      QDomText titleText = doc.createTextNode( currentLayer->name() );
+      QString titleName = currentLayer->title();
+      if ( titleName.isEmpty() )
+      {
+        titleName = currentLayer->name();
+      }
+      QDomText titleText = doc.createTextNode( titleName );
       titleElem.appendChild( titleText );
       layerElem.appendChild( titleElem );
 
+      QString abstract = currentLayer->abstract();
+      if ( !abstract.isEmpty() )
+      {
+        QDomElement abstractElem = doc.createElement( "Abstract" );
+        QDomText abstractText = doc.createTextNode( abstract );
+        abstractElem.appendChild( abstractText );
+        layerElem.appendChild( abstractElem );
+      }
+
       //CRS
       QStringList crsList = createCRSListForLayer( currentLayer );
       appendCRSElementsToLayer( layerElem, doc, crsList );

Original file line number	Diff line number	Diff line change
`@@ -363,44 +363,34 @@ void QgsConfigParser::appendCRSElementsToLayer( QDomElement& layerElement, QDomD`
`363`	`363`
`364`	`364`	`//insert the CRS elements after the title element to be in accordance with the WMS 1.3 specification`
`365`	`365`	`QDomElement titleElement = layerElement.firstChildElement( "Title" );`
	`366`	`+ QDomElement abstractElement = layerElement.firstChildElement( "Abstract" );`
	`367`	`+ QDomElement CRSPrecedingElement = abstractElement.isNull() ? titleElement : abstractElement; //last element before the CRS elements`
`366`	`368`
`367`	`369`	`//In case the number of advertised CRS is constrained`
`368`	`370`	`QStringList constrainedCrsList = supportedOutputCrsList();`
`369`	`371`	`if ( constrainedCrsList.size() > 0 )`
`370`	`372`	`{`
`371`	`373`	`for ( int i = constrainedCrsList.size() - 1; i >= 0; --i )`
`372`	`374`	`{`
`373`		`- appendCRSElementToLayer( layerElement, titleElement, constrainedCrsList.at( i ), doc );`
`374`		`-#if 0`
`375`		`- QDomElement crsElement = doc.createElement( "CRS" );`
`376`		`- QDomText crsText = doc.createTextNode( constrainedCrsList.at( i ) );`
`377`		`- crsElement.appendChild( crsText );`
`378`		`- layerElement.insertAfter( crsElement, titleElement );`
`379`		`-#endif`
	`375`	`+ appendCRSElementToLayer( layerElement, CRSPrecedingElement, constrainedCrsList.at( i ), doc );`
`380`	`376`	`}`
`381`	`377`	`}`
`382`	`378`	`else //no crs constraint`
`383`	`379`	`{`
`384`	`380`	`foreach( QString crs, crsList )`
`385`	`381`	`{`
`386`		`- appendCRSElementToLayer( layerElement, titleElement, crs, doc );`
`387`		`-#if 0`
`388`		`- QDomElement crsElement = doc.createElement( "CRS" );`
`389`		`- QDomText crsText = doc.createTextNode( *crsIt );`
`390`		`- crsElement.appendChild( crsText );`
`391`		`- layerElement.insertAfter( crsElement, titleElement );`
`392`		`-#endif`
	`382`	`+ appendCRSElementToLayer( layerElement, CRSPrecedingElement, crs, doc );`
`393`	`383`	`}`
`394`	`384`	`}`
`395`	`385`	`}`
`396`	`386`
`397`		`-void QgsConfigParser::appendCRSElementToLayer( QDomElement& layerElement, const QDomElement& titleElement, const QString& crsText, QDomDocument& doc ) const`
	`387`	`+void QgsConfigParser::appendCRSElementToLayer( QDomElement& layerElement, const QDomElement& precedingElement, const QString& crsText, QDomDocument& doc ) const`
`398`	`388`	`{`
`399`	`389`	`QString version = doc.documentElement().attribute( "version" );`
`400`	`390`	`QDomElement crsElement = doc.createElement( version == "1.1.1" ? "SRS" : "CRS" );`
`401`	`391`	`QDomText crsTextNode = doc.createTextNode( crsText );`
`402`	`392`	`crsElement.appendChild( crsTextNode );`
`403`		`- layerElement.insertAfter( crsElement, titleElement );`
	`393`	`+ layerElement.insertAfter( crsElement, precedingElement );`
`404`	`394`	`}`
`405`	`395`
`406`	`396`	`QgsComposition* QgsConfigParser::createPrintComposition( const QString& composerTemplate, QgsMapRenderer* mapRenderer, const QMap< QString, QString >& parameterMap ) const`