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

Draw: add button to rotate geometries #5131

Merged
merged 2 commits into from
Jan 3, 2025

Conversation

nboisteault
Copy link
Member

@nboisteault nboisteault commented Dec 16, 2024

Add a new button in the drawing toolbar to allow rotating the selected geometry.

Using https://viglino.github.io/ol-ext/examples/interaction/map.interaction.transform.html
Thanks @Viglino

simplescreenrecorder-2024-12-16_14.54.53.mp4

Funded by 3Liz

@github-actions github-actions bot added this to the 3.10.0 milestone Dec 16, 2024
@nboisteault nboisteault marked this pull request as ready for review December 16, 2024 14:04
@nboisteault nboisteault added the run end2end If the PR must run end2end tests or not label Dec 18, 2024
@nboisteault nboisteault merged commit 9976b1f into 3liz:master Jan 3, 2025
13 checks passed
@nboisteault nboisteault deleted the draw-rotate branch January 3, 2025 09:19
@3liz-bot
Copy link
Contributor

3liz-bot commented Jan 3, 2025

The backport to release_3_9 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 58124f343... Draw: add button to rotate geometries
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 assets/src/components/Digitizing.js
CONFLICT (content): Merge conflict in assets/src/components/Digitizing.js
Auto-merging assets/src/modules/Digitizing.js

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_9 release_3_9
# Navigate to the new working tree
cd .worktrees/backport-release_3_9
# Create a new branch
git switch --create backport-5131-to-release_3_9
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 58124f34362b1d8cb7c21d17cab1de7b0c898881,e6a285f31ce5cb008c73801047e3735a2f86c10e
# Push it to GitHub
git push --set-upstream origin backport-5131-to-release_3_9
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release_3_9

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

@nboisteault
Copy link
Member Author

I've made manual backport for 3.9

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release_3_9 failed backport run end2end If the PR must run end2end tests or not
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants