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

[Processing] Fix regression in "Generate XYZ tiles (MBTiles)" algorithm (Fix #59986) #60001

Conversation

agiudiceandrea
Copy link
Contributor

@agiudiceandrea agiudiceandrea commented Dec 23, 2024

Description

This PR fixes a regression introduced in the "Generate XYZ tiles (MBTiles)" (native:tilesxyzmbtiles) processing algorithm since QGIS 3.34.0, probably an oversight in #54321 where it was forgotten to add the "description" key to the metadata table.

This PR restores the previous behaviour (which was based on GDAL https://github.com/OSGeo/gdal/blob/f314d4b6bc0b70582fd1cb07f8ae95d01e9c8a86/frmts/mbtiles/mbtilesdataset.cpp#L3070-L3076) just re-adding the missing "description" key to the metadata table.

Fixes #59986.
See also https://www.reddit.com/r/UAVmapping/comments/1c651ze/comment/l014q5n/.

@github-actions github-actions bot added this to the 3.42.0 milestone Dec 23, 2024
@agiudiceandrea agiudiceandrea added Bug Either a bug report, or a bug fix. Let's hope for the latter! backport release-3_34 backport release-3_40 Processing Relating to QGIS Processing framework or individual Processing algorithms labels Dec 23, 2024
@agiudiceandrea agiudiceandrea changed the title [Processing] Fix regression in "Generate XYZ tiles (MBTiles)" algorithm [Processing] Fix regression in "Generate XYZ tiles (MBTiles)" algorithm (Fix #59986) Dec 23, 2024
Copy link

github-actions bot commented Dec 23, 2024

🪟 Windows builds

Download Windows builds of this PR for testing.
Debug symbols for this build are available here.
(Built from commit 62fd011)

🪟 Windows Qt6 builds

Download Windows Qt6 builds of this PR for testing.
(Built from commit 62fd011)

@rouault
Copy link
Contributor

rouault commented Dec 24, 2024

(it seems we have no tests for that algorithm, but that change is obviously OK)

@rouault rouault merged commit 30447c1 into qgis:master Dec 24, 2024
50 checks passed
@qgis-bot
Copy link
Collaborator

The backport to release-3_34 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 62fd01177df... [processing] Fix regression in native:tilesxyzmbtiles alg
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/analysis/processing/qgsalgorithmxyztiles.cpp
CONFLICT (content): Merge conflict in src/analysis/processing/qgsalgorithmxyztiles.cpp

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

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release-3_34 backport release-3_40 Bug Either a bug report, or a bug fix. Let's hope for the latter! failed backport The automated backport attempt failed, needs a manual backport Processing Relating to QGIS Processing framework or individual Processing algorithms
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Generate XYZ tiles (MBTiles): MBTiles 1.1 spec violation
3 participants