Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[server][bugfix] Fix OGC test recommendations #5566

Merged
merged 5 commits into from
Nov 16, 2017

Conversation

pblottiere
Copy link
Member

@pblottiere pblottiere commented Nov 8, 2017

Description

This PR fixes the OGC test recommendations (abstracts, keywordlists and metadataurls) which is currently failing: http://test.qgis.org/ogc_cite/2017_11_08_18_00_wms_1_3_0.html#fa4d94ab-1902-41e8-b5d9-738d7c52eac0/d1e17382_1

I took a look on GetCapabilities response from geoserver (http://cite.demo.opengeo.org:8080/geoserver_wms13/wms?service=wms&request=getcapabilities&version=1.3.0) and it seems that the root layer has <Title/> and <Abstract/> fields. But in QGIS Server, we currently have <Name/> and <Title/> instead.

By replacing <Name/> field with <Abstract/> for the root layer, OGC tests are green.

Checklist

  • Commit messages are descriptive and explain the rationale for changes
  • Commits which fix bugs include fixes #11111 in the commit message next to the description
  • Commits which add new features are tagged with [FEATURE] in the commit message
  • Commits which change the UI or existing user workflows are tagged with [needs-docs] in the commit message and containt sufficient information in the commit message to be documented
  • I have read the QGIS Coding Standards and this PR complies with them
  • This PR passes all existing unit tests (test results will be reported by travis-ci after opening this PR)
  • New unit tests have been added for core changes
  • I have run the scripts/prepare-commit.sh script before each commit

@rldhont rldhont self-requested a review November 9, 2017 13:25
@rldhont rldhont added the Server label Nov 9, 2017
@rldhont rldhont added this to the QGIS 3 milestone Nov 9, 2017
@rldhont
Copy link
Contributor

rldhont commented Nov 9, 2017

If you removed <Name> from the root layer, you have to update the UI and the server to remove the capability to defined and use a shortName for the project.
If you removed <Name> from the root layer, you removed the ability to use the root layer in other request like GetLegendGraphics or GetMap.
Can we conserved <Name> and add <Abstract> to passed the test ?

@pblottiere
Copy link
Member Author

Can we conserved and add to passed the test ?

I just tested and yes we can.

However, if i keep the <Name>, then it's still considered as a layer as such and I have to add a <MetadataURL> and a <KeywordList> entry for the root layer to have every OGC tests green.

@rldhont What do you think? What kind of data can I indicated for metadata and keywords for the root layer?

@rldhont
Copy link
Contributor

rldhont commented Nov 15, 2017

Does the <MetadataUrl/> has to have a value ?
The <KeywordList> could be the same as the service.

@pblottiere
Copy link
Member Author

pblottiere commented Nov 15, 2017

Does the <MetadataUrl/> has to have a value ?

Nope.

The <KeywordList> could be the same as the service.

OK.

@pblottiere
Copy link
Member Author

pblottiere commented Nov 15, 2017

@rldhont I updated code accordingly. Let me know what you think.

If you're OK with my changes, I'll update unit tests too.

@pblottiere pblottiere merged commit 15c32c2 into qgis:master Nov 16, 2017
@pblottiere
Copy link
Member Author

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants