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

qgsnewhttpconnection: Always enable paging options for WFS 1.1 #60145

Merged
merged 1 commit into from
Jan 14, 2025

Conversation

ptitjano
Copy link
Contributor

Description

Paging support is only handled by WFS 2.0. However, some servers handle paging even if they only expose WFS 1.1. At the moment, when changing the version number, it has the following effect on the paging options:

  • "maximum": both options can be enabled
  • "2.0": both options can be enabled
  • "1.1": both options can be enabled
  • "1.0": "feature paging" option is always disabled but the "page size" option can be enabled

With this change, both paging options can be enabled for version 1.1. This allows to try to enable paging for WFS 1.1 if the server handles it.

@rouault I'm not sure what the correct behavior is but I don't understand the current one. At the moment, if the 1.1 version is selected, the feature paging option is disabled but page size is enabled if feature paging != disabled. Why would the page size option be enabled if the feature paging option is not. The following behavior seems more logical to me:

  • always enable the feature paging option
  • enable page size is enabled if feature paging is not disabled

Paging support is only handled by WFS 2.0. However, some servers
handle paging even if they only expose WFS 1.1. At the moment, when
changing the version number, it has the following effect on the paging
options:
- "maximum": both options can be enabled
- "2.0": both options can be enabled
- "1.1": both options can be enabled
- "1.0": "feature paging" option is always disabled but the "page
size" option can be enabled

With this change, both paging options can be enabled for version
1.1. This allows to try to enable paging for WFS 1.1 if the server
handles it.
@github-actions github-actions bot added this to the 3.42.0 milestone Jan 14, 2025
@rouault
Copy link
Contributor

rouault commented Jan 14, 2025

your change look correct and restore the behavior of 3c2022b that was accidentally corrupted in 681229a

Can be backported

Copy link

github-actions bot commented Jan 14, 2025

🪟 Windows builds

Download Windows builds of this PR for testing.
Debug symbols for this build are available here.
(Built from commit f9b3a6c)

🪟 Windows Qt6 builds

Download Windows Qt6 builds of this PR for testing.
(Built from commit f9b3a6c)

@rouault rouault merged commit 8215d14 into qgis:master Jan 14, 2025
42 checks passed
@qgis-bot
Copy link
Collaborator

The backport to release-3_34 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply f9b3a6c5836... qgsnewhttpconnection: Always enable paging options for WFS 1.1
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

stdout
Auto-merging src/gui/qgsnewhttpconnection.cpp
CONFLICT (content): Merge conflict in src/gui/qgsnewhttpconnection.cpp

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release-3_34 release-3_34
# Navigate to the new working tree
cd .worktrees/backport-release-3_34
# Create a new branch
git switch --create backport-60145-to-release-3_34
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick f9b3a6c5836376d45878b7c9b77a9e23ea810d26
# Push it to GitHub
git push --set-upstream origin backport-60145-to-release-3_34
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release-3_34

Then, create a pull request where the base branch is release-3_34 and the compare/head branch is backport-60145-to-release-3_34.

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Jan 14, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release-3_34 backport release-3_40 failed backport The automated backport attempt failed, needs a manual backport
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants