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

Try to detect geometry type if unknown from DescribeFeatureType for WFS 1.0 #50943

Merged
merged 1 commit into from
Nov 21, 2022

Conversation

pathmapper
Copy link
Contributor

@pathmapper pathmapper commented Nov 20, 2022

Using the same logic as for WFS >= 1.1., but only when we do not know the exact geometry type from DescribeFeatureType.

A test was added.

Fixes #50935

@rouault rouault merged commit bfde785 into qgis:master Nov 21, 2022
@qgis-bot
Copy link
Collaborator

The backport to release-3_28 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply b9409e1f9c... Try to detect geometry type if unknown for WFS 1.0
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/qgswfsprovider.cpp
CONFLICT (content): Merge conflict in src/providers/wfs/qgswfsprovider.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_28 release-3_28
# Navigate to the new working tree
cd .worktrees/backport-release-3_28
# Create a new branch
git switch --create backport-50943-to-release-3_28
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick b9409e1f9cb995f7c05acb4b76ec84ee12ffac49
# Push it to GitHub
git push --set-upstream origin backport-50943-to-release-3_28
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release-3_28

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

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Nov 21, 2022
@rouault
Copy link
Contributor

rouault commented Nov 21, 2022

backport to 3.28 in #50955

@rouault rouault removed failed backport The automated backport attempt failed, needs a manual backport backport release-3_28 labels Nov 21, 2022
@pathmapper pathmapper deleted the fix_50935 branch November 22, 2022 07:36
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.

3.28.0 regression with WFS layers not showing any data
3 participants