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

Grass CRS fixes #58061

Merged
merged 4 commits into from
Jul 11, 2024
Merged

Grass CRS fixes #58061

merged 4 commits into from
Jul 11, 2024

Conversation

nyalldawson
Copy link
Collaborator

Follow up #58049, and fix more situations where CRS information is lost when opening/creating GRASS mapsets

Key_Value* type cannot be cast to a number, and it's meaningless to do so anyway
Directly read the SRID and WKT, instead of trying to construct
a projection from the raw properties. This allows lossless conversion
of GRASS CRS to QGIS CRS, and eg avoids EPSG:3857 mapsets loading
into QGIS as invalid projections
Use the more modern API so that the projection SRID and WKT
are written losslessly to the mapset

Avoids loss of projection information when creating
mapsets
Copy link

github-actions bot commented Jul 11, 2024

🪟 Windows builds ready!

Windows builds of this PR are available for testing here. Debug symbols for this build are available here.

(Built from commit 79618bd)

@nyalldawson nyalldawson merged commit 6e6ab21 into qgis:master Jul 11, 2024
29 checks passed
@nyalldawson nyalldawson deleted the grass_fixes branch July 11, 2024 11:08
@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 391176c8209... Fix compilation when grass plugin is enabled
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/plugins/grass/qgsgrassnewmapset.cpp
CONFLICT (content): Merge conflict in src/plugins/grass/qgsgrassnewmapset.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-58061-to-queued_ltr_backports
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 391176c8209c491b1c83f192b5adba02a0b01731,40e97102e00ea4584b7c0b5dd661c2e183c83eae,88ffe42ad2b7cc0f062514d143d352be596485fb,79618bd92452b647565e6ac01936624049d535ec
# Push it to GitHub
git push --set-upstream origin backport-58061-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-58061-to-queued_ltr_backports.

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Jul 11, 2024
@nyalldawson nyalldawson added backport queued_ltr_backports Queued Backports and removed backport queued_ltr_backports Queued Backports failed backport The automated backport attempt failed, needs a manual backport labels Jul 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants