Skip to content

Commit

Permalink
Merge pull request #5697 from pblottiere/server_bugfix_getprojectsett…
Browse files Browse the repository at this point in the history
…ings

[server][bugfix]  Fixes #17519 by fixing GetProjectSettings response
  • Loading branch information
pblottiere committed Nov 27, 2017
2 parents 9bfb3f3 + 4aa97d8 commit d147064
Show file tree
Hide file tree
Showing 3 changed files with 333 additions and 322 deletions.
2 changes: 1 addition & 1 deletion src/server/services/wms/qgswmsgetcapabilities.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@ namespace QgsWms
const QgsComposerMap *composerMap = *cmIt;

QDomElement composerMapElem = doc.createElement( QStringLiteral( "ComposerMap" ) );
composerMapElem.setAttribute( QStringLiteral( "name" ), QStringLiteral( "map%s" ).arg( composerMap->id() ) );
composerMapElem.setAttribute( QStringLiteral( "name" ), QStringLiteral( "map%1" ).arg( composerMap->id() ) );
composerMapElem.setAttribute( QStringLiteral( "width" ), composerMap->rect().width() );
composerMapElem.setAttribute( QStringLiteral( "height" ), composerMap->rect().height() );
composerTemplateElem.appendChild( composerMapElem );
Expand Down
6 changes: 6 additions & 0 deletions tests/testdata/qgis_server/getprojectsettings.txt
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,12 @@ Content-Type: text/xml; charset=utf-8
<Format>XML</Format>
</Exception>
<sld:UserDefinedSymbolization SupportSLD="1" RemoteWCS="0" UserLayer="0" InlineFeature="0" RemoteWFS="0" UserStyle="1"/>
<ComposerTemplates>
<ComposerTemplate height="210" width="297" name="mytemplate">
<ComposerMap height="26" width="61" name="map1"/>
<ComposerMap height="103" width="87" name="map0"/>
</ComposerTemplate>
</ComposerTemplates>
<WFSLayers>
<WFSLayer name="testlayer èé"/>
</WFSLayers>
Expand Down
Loading

0 comments on commit d147064

Please sign in to comment.