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

[Fix] round the 'I' and 'J' paramters of WMS GetFeatureInfo service #3972

Merged
merged 1 commit into from
Nov 22, 2023

Conversation

mind84
Copy link
Contributor

@mind84 mind84 commented Nov 22, 2023

Round to integer I and J parameters of WMS GetFeatureInfo service accordingly to OGC Documentation (see section 7.4.3.7)

Ticket : #3971

Funded by Faunalia

@github-actions github-actions bot added this to the 3.7.0 milestone Nov 22, 2023
@Gustry
Copy link
Member

Gustry commented Nov 22, 2023

Thanks for checking in the standard

The mandatory I and J request parameters are integers that indicate a point of interest on the map

@rldhont rldhont added the run end2end If the PR must run end2end tests or not label Nov 22, 2023
@rldhont rldhont merged commit a7fcfbb into 3liz:master Nov 22, 2023
13 checks passed
@3liz-bot
Copy link
Contributor

The backport to release_3_6 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply a9b7c25ee... [Fix] round the 'I' and 'J' paramters of WMS GetFeatureInfo service
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
CONFLICT (modify/delete): assets/src/modules/Popup.js deleted in HEAD and modified in a9b7c25ee ([Fix] round the 'I' and 'J' paramters of WMS GetFeatureInfo service).  Version a9b7c25ee ([Fix] round the 'I' and 'J' paramters of WMS GetFeatureInfo service) of assets/src/modules/Popup.js left in tree.

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

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

@mind84 mind84 deleted the wms_getfeature_decimal_params branch November 22, 2023 16:46
@nboisteault
Copy link
Member

Apparently backport to 3.6 is not needed as GetFeatureInfo depends on old OL2 control which I dropped in Lizmap 3.7.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
QGIS Server run end2end If the PR must run end2end tests or not
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants