Skip to content

Commit 630f434

Browse files
author
mhugent
committed
Add element to group composer templates in WMS capabilities
git-svn-id: http://svn.osgeo.org/qgis/trunk@15082 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 17d4074 commit 630f434

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

src/mapserver/qgsprojectparser.cpp

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -951,6 +951,16 @@ void QgsProjectParser::printCapabilities( QDomElement& parentElement, QDomDocume
951951
}
952952

953953
QDomNodeList composerNodeList = mXMLDoc->elementsByTagName( "Composer" );
954+
if ( composerNodeList.size() < 1 )
955+
{
956+
return;
957+
}
958+
959+
QDomElement composerTemplatesElem = doc.createElement( "ComposerTemplates" );
960+
composerTemplatesElem.setAttribute( "xmlns:wms", "http://www.opengis.net/wms" );
961+
composerTemplatesElem.setAttribute( "xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance" );
962+
composerTemplatesElem.setAttribute( "xsi:type", "wms:_ExtendedCapabilities" );
963+
954964
for ( int i = 0; i < composerNodeList.size(); ++i )
955965
{
956966
QDomElement composerTemplateElem = doc.createElement( "ComposerTemplate" );
@@ -961,9 +971,6 @@ void QgsProjectParser::printCapabilities( QDomElement& parentElement, QDomDocume
961971
}
962972

963973
composerTemplateElem.setAttribute( "name", currentComposerElem.attribute( "title" ) );
964-
composerTemplateElem.setAttribute( "xmlns:wms", "http://www.opengis.net/wms" );
965-
composerTemplateElem.setAttribute( "xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance" );
966-
composerTemplateElem.setAttribute( "xsi:type", "wms:_ExtendedCapabilities" );
967974

968975
//get paper width and hight in mm from composition
969976
QDomElement compositionElem = currentComposerElem.firstChildElement( "Composition" );
@@ -1008,8 +1015,9 @@ void QgsProjectParser::printCapabilities( QDomElement& parentElement, QDomDocume
10081015
composerTemplateElem.appendChild( composerLabelElem );
10091016
}
10101017

1011-
parentElement.appendChild( composerTemplateElem );
1018+
composerTemplatesElem.appendChild( composerTemplateElem );
10121019
}
1020+
parentElement.appendChild( composerTemplatesElem );
10131021
}
10141022

10151023
QDomElement QgsProjectParser::composerByName( const QString& composerName ) const

0 commit comments

Comments
 (0)