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

JS: Enhancing the way Map is managed #4203

Merged
merged 5 commits into from
Feb 14, 2024

Conversation

rldhont
Copy link
Collaborator

@rldhont rldhont commented Feb 13, 2024

  • Extent in permalink use precision 6
  • target has been added to the event object
  • MapState and map are synchronizing
  • MapState fires map.state.ready

@rldhont rldhont added map viewer javascript Pull requests that update Javascript code run end2end If the PR must run end2end tests or not backport release_3_7 labels Feb 13, 2024
@github-actions github-actions bot added this to the 3.8.0 milestone Feb 13, 2024
To be notified that the map is ready a new event `map.state.ready` is fired by MapState.
And a new property `isReady` has been added.
@rldhont rldhont force-pushed the fix-permalink-extent-precision branch from fabebed to b6e3f8b Compare February 14, 2024 08:10
@rldhont rldhont marked this pull request as ready for review February 14, 2024 08:53
@rldhont rldhont merged commit 26286b6 into 3liz:master Feb 14, 2024
9 checks passed
@3liz-bot
Copy link
Contributor

The backport to release_3_7 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 66f80648b... Bugfix JS: synchronization beetwen MapState and map
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 assets/src/modules/Lizmap.js
[backport-4203-to-release_3_7 9ab43dce7] Fix JS Permalink : Use precision 6 for extent in 4326
 Author: rldhont <[email protected]>
 Date: Tue Feb 13 16:14:10 2024 +0100
 3 files changed, 30 insertions(+), 11 deletions(-)
[backport-4203-to-release_3_7 6701f27dc] JS EventDispatcher events : Add not writable target property to event object
 Author: rldhont <[email protected]>
 Date: Tue Feb 13 16:16:25 2024 +0100
 1 file changed, 8 insertions(+)
Auto-merging assets/src/modules/BaseLayersMap.js
CONFLICT (content): Merge conflict in assets/src/modules/BaseLayersMap.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_7 release_3_7
# Navigate to the new working tree
cd .worktrees/backport-release_3_7
# Create a new branch
git switch --create backport-4203-to-release_3_7
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 03ffb738425326dcc18c5ee5c8220b5d2617bbe0,1c9d3e87c5cb32ce858c0b06775c1c3a42a24553,66f80648b66507afa8db034f5846791a51230607,b6e3f8ba135cda5f88e9f7e7f7602a2d4c7ad098,2b43af04f0bf8fa6a5a7a6a1e54a35bb8cee177b
# Push it to GitHub
git push --set-upstream origin backport-4203-to-release_3_7
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release_3_7

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

@rldhont rldhont deleted the fix-permalink-extent-precision branch February 15, 2024 15:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release_3_7 failed backport javascript Pull requests that update Javascript code map viewer run end2end If the PR must run end2end tests or not
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants