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

[mvt] support concat expression #58623

Merged
merged 1 commit into from
Sep 9, 2024
Merged

[mvt] support concat expression #58623

merged 1 commit into from
Sep 9, 2024

Conversation

3nids
Copy link
Member

@3nids 3nids commented Sep 9, 2024

fixes #58364

Regarding the layer from the ticket, it is now loaded in QGIS but nothing appears on the map. I didn't investigate more for now.
Worth mentionning that clicking on the layer toponyme - parcellaire - adresse in maputnik (web) makes it crash.

@3nids 3nids requested a review from nirvn September 9, 2024 16:24
@github-actions github-actions bot added this to the 3.40.0 milestone Sep 9, 2024
Copy link
Contributor

@nirvn nirvn left a comment

Choose a reason for hiding this comment

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

Nice, I had a similar fix in mind.

@nicogodet
Copy link
Member

@3nids May thanks for the fix !

Without
image

With (expression manually added)
image

Copy link

github-actions bot commented Sep 9, 2024

🪟 Windows builds ready!

Windows builds of this PR are available for testing here. Debug symbols for this build are available here.

(Built from commit 07a3d0a)

@3nids 3nids merged commit e6e4484 into qgis:master Sep 9, 2024
32 of 33 checks passed
@3nids 3nids deleted the fix55823171b20 branch September 9, 2024 21:16
@qgis-bot
Copy link
Collaborator

The backport to queued_ltr_backports failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 07a3d0ac881... [mvt] support concat expression
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 src/core/vectortile/qgsmapboxglstyleconverter.cpp
CONFLICT (content): Merge conflict in src/core/vectortile/qgsmapboxglstyleconverter.cpp
Auto-merging tests/src/python/test_qgsmapboxglconverter.py
CONFLICT (content): Merge conflict in tests/src/python/test_qgsmapboxglconverter.py

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

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

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Sep 10, 2024
@qgis-bot
Copy link
Collaborator

The backport to release-3_38 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 07a3d0ac881... [mvt] support concat expression
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 src/core/vectortile/qgsmapboxglstyleconverter.cpp
CONFLICT (content): Merge conflict in src/core/vectortile/qgsmapboxglstyleconverter.cpp
Auto-merging tests/src/python/test_qgsmapboxglconverter.py
CONFLICT (content): Merge conflict in tests/src/python/test_qgsmapboxglconverter.py

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

Then, create a pull request where the base branch is release-3_38 and the compare/head branch is backport-58623-to-release-3_38.

velle pushed a commit to velle/QGIS that referenced this pull request Sep 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport queued_ltr_backports Queued Backports failed backport The automated backport attempt failed, needs a manual backport Vector tiles
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Fail to parse layout text-field with expression
4 participants