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

[server][wmts][fix] updated constant to correct resolution in WMTS tile grid initialization #43418

Merged
merged 6 commits into from
Jun 8, 2021

Conversation

andreassteffens
Copy link
Contributor

@andreassteffens andreassteffens commented May 27, 2021

Constant needed to be updated in order to match the standard rendering pixel size of 0.28mm x 0.28mm defined by the OGC resulting in DPI of 90.71428571429.

Should fix #34826, fix #42942, fix #39040

…le grid initialization

Constant needed to be updated in order to match the standard rendering pixel size of 0.28mm x 0.28mm defined by the OGC resulting in DPI of 90.71428571429.
…tile_grid_initialization

[server][wmts][fix] updated constant to correct resolution in WMTS ti…
@github-actions github-actions bot added this to the 3.20.0 milestone May 27, 2021
@pblottiere pblottiere requested a review from rldhont May 27, 2021 07:48
@pblottiere pblottiere added Bug Either a bug report, or a bug fix. Let's hope for the latter! Server Related to QGIS server labels May 27, 2021
Copy link
Contributor

@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 @andreassteffens can you also const tileSize ?

Co-authored-by: Alessandro Pasotti <elpaso@itopen.it>
@DelazJ
Copy link
Contributor

DelazJ commented May 27, 2021

Should fix #34826, #42942, #39040

@andreassteffens if you want the three to be closed, the "fix" mention should be added for all, ie Should fix #34826, fix #42942, fix #39040

@andreassteffens andreassteffens requested a review from rldhont May 27, 2021 17:52
@rldhont rldhont added the backport queued_ltr_backports Queued Backports label May 28, 2021
@rldhont rldhont requested a review from elpaso May 28, 2021 07:13
@rldhont
Copy link
Contributor

rldhont commented May 31, 2021

@andreassteffens can you run the tests and update the WMTS GetCapabilities that failed.

@andreassteffens
Copy link
Contributor Author

will take a look at the test case ASAP

@pblottiere pblottiere merged commit cd94bfa into qgis:master Jun 8, 2021
@qgis-bot
Copy link
Collaborator

qgis-bot commented Jun 8, 2021

The backport to queued_ltr_backports failed:

The process '/usr/bin/git' failed with exit code 128

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-43418-to-queued_ltr_backports
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 09d2ca8e4f14583a64bd26b9ab05b930ba318fad,94c2194f43cbeef3cea1d56324e0ddf794354b63,63f47db145c1a2c06ca4fd59f321ea5518783bf3,4b4748c7fae108a29b7e6faa21319eb76a08f378,18bbfa9af4eb1a0e8e948f5e641a8d3e56c1a966,b9ab1b701836890708b95dced60e4ae2360cbb11
# Push it to GitHub
git push --set-upstream origin backport-43418-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-43418-to-queued_ltr_backports.

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 Bug Either a bug report, or a bug fix. Let's hope for the latter! Server Related to QGIS server
Projects
None yet
6 participants