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] losing WFS DCP endpoints upon cloning WFS URI #52648

Merged
merged 3 commits into from Apr 20, 2023

Conversation

andreassteffens
Copy link
Contributor

When the WFS datasource URI is cloned (e. g. when applying an additional filter to a WFS layer) Get/Post DCP endpoints which have been originally parsed from the capabilities document are lost and all WFS operations fall back to using the capabilities URL.

This commit introduces two new getters to the QgsWFSDataSourceURI class which are used to transfer the stored endpoint informationen to a new instance upon cloning.

@github-actions github-actions bot added this to the 3.32.0 milestone Apr 12, 2023
@rouault rouault merged commit 9112a82 into qgis:master Apr 20, 2023
33 checks passed
@qgis-bot
Copy link
Collaborator

The backport to queued_ltr_backports failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply c50f78488b... added assign operator and copy constructor for copying all datasource properties to a another/new instance
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".

stdout
Auto-merging src/providers/wfs/qgswfsdatasourceuri.cpp
Auto-merging src/providers/wfs/qgswfsdatasourceuri.h
Auto-merging src/providers/wfs/qgswfsshareddata.cpp
[backport-52648-to-queued_ltr_backports d54c5c2a29] [fix] fixed losing WFS Get/Post DCP endpoints upon cloning WFS datasource URI
 Author: andreassteffens <a.steffens@gds-team.de>
 Date: Wed Apr 12 05:47:07 2023 +0200
 3 files changed, 18 insertions(+)
Auto-merging src/providers/wfs/qgswfsdatasourceuri.cpp
CONFLICT (content): Merge conflict in src/providers/wfs/qgswfsdatasourceuri.cpp
Auto-merging src/providers/wfs/qgswfsdatasourceuri.h
CONFLICT (content): Merge conflict in src/providers/wfs/qgswfsdatasourceuri.h
Auto-merging src/providers/wfs/qgswfsshareddata.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-queued_ltr_backports queued_ltr_backports
# Navigate to the new working tree
cd .worktrees/backport-queued_ltr_backports
# Create a new branch
git switch --create backport-52648-to-queued_ltr_backports
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 7aefbc15a7c1a9f35dfdad7e26d810228ea2276e,c50f78488b4dce62fbbd3b037abdf6670dd4d489,ab13ece4dc175f67b8a7203869c2aecb5e0a467a
# Push it to GitHub
git push --set-upstream origin backport-52648-to-queued_ltr_backports
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-queued_ltr_backports

Then, create a pull request where the base branch is queued_ltr_backports and the compare/head branch is backport-52648-to-queued_ltr_backports.

@rouault
Copy link
Contributor

rouault commented Apr 20, 2023

backport to queued_ltr_backports in #52801

@andreassteffens andreassteffens deleted the fix-losing_WFS_DCP_endpoints branch May 4, 2023 06:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport queued_ltr_backports Queued Backports failed backport The automated backport attempt failed, needs a manual backport
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants