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

[Bugfix] JS: Axis orientation projection detection #4208

Merged
merged 2 commits into from
Feb 15, 2024

Conversation

rldhont
Copy link
Collaborator

@rldhont rldhont commented Feb 14, 2024

Re-implementation of the projection axis orientation detection method.

Funded by VSB

@rldhont rldhont added map viewer sponsored development This development has been funded javascript Pull requests that update Javascript code run end2end If the PR must run end2end tests or not backport release_3_7 labels Feb 14, 2024
@github-actions github-actions bot added this to the 3.8.0 milestone Feb 14, 2024
@rldhont rldhont force-pushed the fix-proj-axis-orientation-neu branch 2 times, most recently from 1c9fdac to 917c965 Compare February 14, 2024 16:46
Copy link
Member

@Gustry Gustry left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor tweaks, looks easier to understand when it's an acronym

assets/src/modules/Lizmap.js Outdated Show resolved Hide resolved
assets/src/modules/Lizmap.js Outdated Show resolved Hide resolved
assets/src/modules/Lizmap.js Outdated Show resolved Hide resolved
tests/end2end/playwright/axis_orientation.spec.js Outdated Show resolved Hide resolved
tests/end2end/playwright/axis_orientation.spec.js Outdated Show resolved Hide resolved
@rldhont rldhont force-pushed the fix-proj-axis-orientation-neu branch from 917c965 to 7f8c88a Compare February 15, 2024 10:44
assets/src/modules/Lizmap.js Outdated Show resolved Hide resolved
Re-implementation of the projection axis orientation detection method.

Fixes 3liz#4191

Funded by VSB
@rldhont rldhont force-pushed the fix-proj-axis-orientation-neu branch from 95de7bd to 58a9d48 Compare February 15, 2024 11:00
…trols` builder option

Since jelix 1.8.7, we need to add `deprecatedDeclareFormBeforeControls` builder option because in the `outputHeader` we defined `jFormsJQ.declareForm(jFormsJQ.tForm);` and we use `parent::outputFooter($builder);
@rldhont rldhont force-pushed the fix-proj-axis-orientation-neu branch from 58a9d48 to a115c70 Compare February 15, 2024 11:02
@rldhont rldhont merged commit 52b897e into 3liz:master Feb 15, 2024
12 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 3cd9d9369... [Bugfix] JS: Axis orientation projection detection
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
CONFLICT (content): Merge conflict in assets/src/modules/Lizmap.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-4208-to-release_3_7
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 3cd9d93699f5375289ab6a1ff0e6f9ad239c8bf5,a115c70e2f1149f0a4fd55f89bf20f19dc4bcbcb
# Push it to GitHub
git push --set-upstream origin backport-4208-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-4208-to-release_3_7.

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 sponsored development This development has been funded
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants