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] devicePixelRatio is used by OL to defined tile size #4167

Merged
merged 1 commit into from
Feb 5, 2024

Conversation

rldhont
Copy link
Collaborator

@rldhont rldhont commented Feb 5, 2024

If the devicePixelratio is not 1, OL change the DPI parameter and the tile size. Lizmap has to take it into account to calculate tileSize.

Funded by FMProjet

If the devicePixelratio is not 1, OL change the DPI parameter and the tile size.
Lizmap has to take it into account to calculate tileSize.

Funded by FMProjet
@rldhont rldhont added user interface 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 5, 2024
@rldhont rldhont requested a review from nboisteault February 5, 2024 16:56
@rldhont rldhont added the sponsored development This development has been funded label Feb 5, 2024
@rldhont rldhont requested a review from mdouchin February 5, 2024 16:56
@github-actions github-actions bot added this to the 3.8.0 milestone Feb 5, 2024
@rldhont rldhont merged commit cba7c20 into 3liz:master Feb 5, 2024
15 checks passed
@3liz-bot
Copy link
Contributor

3liz-bot commented Feb 5, 2024

The backport to release_3_7 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply f909a9a94... [Bugfix] devicePixelRatio is used by OL to defined tile size
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/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-4167-to-release_3_7
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick f909a9a9455f1099a9de6c910efe76af2eee3b13
# Push it to GitHub
git push --set-upstream origin backport-4167-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-4167-to-release_3_7.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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 user interface
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants