Skip to content

Commit d147064

Browse files
authored
Merge pull request #5697 from pblottiere/server_bugfix_getprojectsettings
[server][bugfix] Fixes #17519 by fixing GetProjectSettings response
2 parents 9bfb3f3 + 4aa97d8 commit d147064

File tree

3 files changed

+333
-322
lines changed

3 files changed

+333
-322
lines changed

src/server/services/wms/qgswmsgetcapabilities.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,7 @@ namespace QgsWms
653653
const QgsComposerMap *composerMap = *cmIt;
654654

655655
QDomElement composerMapElem = doc.createElement( QStringLiteral( "ComposerMap" ) );
656-
composerMapElem.setAttribute( QStringLiteral( "name" ), QStringLiteral( "map%s" ).arg( composerMap->id() ) );
656+
composerMapElem.setAttribute( QStringLiteral( "name" ), QStringLiteral( "map%1" ).arg( composerMap->id() ) );
657657
composerMapElem.setAttribute( QStringLiteral( "width" ), composerMap->rect().width() );
658658
composerMapElem.setAttribute( QStringLiteral( "height" ), composerMap->rect().height() );
659659
composerTemplateElem.appendChild( composerMapElem );

tests/testdata/qgis_server/getprojectsettings.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,12 @@ Content-Type: text/xml; charset=utf-8
110110
<Format>XML</Format>
111111
</Exception>
112112
<sld:UserDefinedSymbolization SupportSLD="1" RemoteWCS="0" UserLayer="0" InlineFeature="0" RemoteWFS="0" UserStyle="1"/>
113+
<ComposerTemplates>
114+
<ComposerTemplate height="210" width="297" name="mytemplate">
115+
<ComposerMap height="26" width="61" name="map1"/>
116+
<ComposerMap height="103" width="87" name="map0"/>
117+
</ComposerTemplate>
118+
</ComposerTemplates>
113119
<WFSLayers>
114120
<WFSLayer name="testlayer èé"/>
115121
</WFSLayers>

0 commit comments

Comments
 (0)