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

[Bug] Include layer opacity info for embedded layers #4964

Merged
merged 1 commit into from
Nov 26, 2024

Conversation

mind84
Copy link
Contributor

@mind84 mind84 commented Nov 12, 2024

Follows #4925

Here I am again with "embedded" stuff 😄

I didn't notice that the opacity for embedded rasters wasn't being taken into account, so I tried to fix this.

Thanks

Funded by Faunalia

@github-actions github-actions bot added this to the 3.10.0 milestone Nov 12, 2024
@Gustry Gustry added run end2end If the PR must run end2end tests or not backport release_3_8 backport release_3_9 sponsored development This development has been funded legend/layer tree Tool which displays the layer tree with legends labels Nov 12, 2024
Copy link
Collaborator

@rldhont rldhont left a comment

Choose a reason for hiding this comment

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

Thanks @mind84 !

It will be easiest to enhance this part of lizmap when #4819 will be merged and backported to 3.9.

@mind84
Copy link
Contributor Author

mind84 commented Nov 20, 2024

Hi @rldhont,

It will be easiest to enhance this part of lizmap when #4819 will be merged and backported to 3.9.

Sorry, should I refactor this part once #4819 has been merged?

Thanks!

@nboisteault nboisteault merged commit 070b0eb into 3liz:master Nov 26, 2024
13 checks passed
@3liz-bot
Copy link
Contributor

The backport to release_3_8 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 4e72f0892... include layer opacity info for embedded layers
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 lizmap/modules/lizmap/lib/Project/QgisProject.php
Auto-merging tests/units/classes/Project/QgisProjectTest.php
CONFLICT (content): Merge conflict in tests/units/classes/Project/QgisProjectTest.php

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

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

@nboisteault
Copy link
Member

Thanks @mind84 !
The backport to 3.8 failed. Could you fix it please?

@mind84 mind84 deleted the embedded_opacity branch November 27, 2024 17:15
nboisteault pushed a commit to nboisteault/lizmap-web-client that referenced this pull request Dec 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release_3_8 backport release_3_9 failed backport legend/layer tree Tool which displays the layer tree with legends 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.

5 participants