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

Fix duplicate WMS query results #5283

Merged
merged 3 commits into from Nov 7, 2019
Merged

Conversation

adube
Copy link
Contributor

@adube adube commented Nov 6, 2019

This tiny patch fixes the duplicates that we had in the query results due to the fact that the WFS layers were not being pushed in the proper array.

So, if the wms and wfs layers were the same, they were duplicated. In some cases, wms use a layer "group" as name, but wfs uses layer names, so this may explain why there were not duplicates sometimes.

Update: This patch now properly fixes the listing of wms layer names to be used for query result.

@adube adube requested review from fredj and sbrunner November 6, 2019 20:39
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sbrunner sbrunner force-pushed the gsgmf-1143-query-result-duplicates branch from 0362ab9 to 2d9042b Compare November 7, 2019 08:34
@sbrunner
Copy link
Member

sbrunner commented Nov 7, 2019

@adube I rebase your branch to make the CI pass...

@sbrunner
Copy link
Member

sbrunner commented Nov 7, 2019

  • On ESRI it's working correctly :-)
  • On 'OSM scale' and 'OSM open' in 'Function OSM mixed' I get duplicated results...
  • On 'OSM scale' and 'OSM open' in 'Function OSM' I don't get any results...

@adube
Copy link
Contributor Author

adube commented Nov 7, 2019

  • On ESRI it's working correctly :-)
  • On 'OSM scale' and 'OSM open' in 'Function OSM mixed' I get duplicated results...
  • On 'OSM scale' and 'OSM open' in 'Function OSM' I don't get any results...

Yeah, I was thinking about this fix yesterday evening, wondering if this was a typo or intentional.

Turns out it seems to be intentional: with WMS, when using "group" names, the query asks for the group name but the result contains the layer name. Therefore, I think this is why the wfs layer names were added to the wms ones, but caused issues when the WMS layer doesn't use groups.

I'll come with an other fix and make more tests. I'll also leave a comment there, to let devs know that this is not a typo, it is intentionnal.

Copy link
Member

@sbrunner sbrunner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Look good to me :-) Thanks

@adube
Copy link
Contributor Author

adube commented Nov 7, 2019

Thanks. Can I merge this, knowing that the demo is tomorrow?

@sbrunner
Copy link
Member

sbrunner commented Nov 7, 2019

+1 :-)

@adube adube merged commit f699089 into master Nov 7, 2019
@adube adube deleted the gsgmf-1143-query-result-duplicates branch November 7, 2019 16:51
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.

None yet

2 participants