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 identified coordinates when project crs differs from 3d view's crs #59265

Merged
merged 2 commits into from
Nov 8, 2024

Conversation

uclaros
Copy link
Contributor

@uclaros uclaros commented Oct 30, 2024

Description

The 3d view's crs is no longer always the same as the project's crs, as we now default to 3857 when the project has a geographic crs (3d view creation used to be disabled when the project crs was not projected).
Reprojecting the identified coordinates takes care of that.

@github-actions github-actions bot added this to the 3.42.0 milestone Oct 30, 2024
Copy link

github-actions bot commented Oct 30, 2024

🪟 Windows builds

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

🪟 Windows Qt6 builds

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

src/app/3d/qgs3dmaptoolidentify.cpp Show resolved Hide resolved
src/app/3d/qgs3dmaptoolidentify.cpp Outdated Show resolved Hide resolved
@nyalldawson nyalldawson merged commit b251c95 into qgis:master Nov 8, 2024
29 checks passed
@qgis-bot
Copy link
Collaborator

qgis-bot commented Nov 8, 2024

The backport to release-3_40 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply d2ae9c2c881... Fix identified coordinates when project crs differs from 3d view's crs
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/app/3d/qgs3dmaptoolidentify.cpp
CONFLICT (content): Merge conflict in src/app/3d/qgs3dmaptoolidentify.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_40 release-3_40
# Navigate to the new working tree
cd .worktrees/backport-release-3_40
# Create a new branch
git switch --create backport-59265-to-release-3_40
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick d2ae9c2c8817d6384f541e94d718e68445358891,f77dff20e188167c54ffe170b2407fdbccbeec8b
# Push it to GitHub
git push --set-upstream origin backport-59265-to-release-3_40
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release-3_40

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

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Nov 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

4 participants