Skip to content

Database: update to EPSG v12.054#4720

Merged
rouault merged 2 commits intoOSGeo:masterfrom
rouault:epsg_12_054
Mar 22, 2026
Merged

Database: update to EPSG v12.054#4720
rouault merged 2 commits intoOSGeo:masterfrom
rouault:epsg_12_054

Conversation

@rouault
Copy link
Member

@rouault rouault commented Mar 20, 2026

Note that I didn't bother implementing the new transformation method "NTv2 & Coordinate Frame rotation (geocentric domain)" that is used by the new transformation "Amersfoort to ETRS89-NLD [AGRS2010] (10)" EPSG:11397 (https://epsg.org/transformation_11397/Amersfoort-to-ETRS89-NLD-AGRS2010-10.html)

CC @Jochem-L

@rouault rouault added funded through GSP Work funded through the GDAL Sponsorship Program backport 9.8 Backport to 9.8 branch labels Mar 20, 2026
Note that I didn't bother implementing the new transformation method
"NTv2 & Coordinate Frame rotation (geocentric domain)" that is used by
the new transformation "Amersfoort to ETRS89-NLD [AGRS2010] (10)" EPSG:11397
(https://epsg.org/transformation_11397/Amersfoort-to-ETRS89-NLD-AGRS2010-10.html)
@rouault
Copy link
Member Author

rouault commented Mar 21, 2026

@himsve This adds a record for HREF2025A_NN2000_EUREF89.bin. I assume you'll add a GTG grid for it ?

@rouault rouault merged commit 90ec7c4 into OSGeo:master Mar 22, 2026
30 checks passed
@rouault
Copy link
Member Author

rouault commented Mar 22, 2026

The backport to 9.8 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 130581b2... Database: update to EPSG v12.054
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 set advice.mergeConflict false"

stdout
Auto-merging data/CMakeLists.txt
CONFLICT (content): Merge conflict in data/CMakeLists.txt
Auto-merging test/unit/test_c_api.cpp
Auto-merging test/unit/test_operationfactory.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-9.8 9.8
# Navigate to the new working tree
cd .worktrees/backport-9.8
# Create a new branch
git switch --create backport-4720-to-9.8
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 130581b204ae1cfa2c91380d039b4cf0272f1530,be91dffc7bea8fd2e947502ecc1b89ec96ade7ff
# Push it to GitHub
git push --set-upstream origin backport-4720-to-9.8
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-9.8

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport 9.8 Backport to 9.8 branch funded through GSP Work funded through the GDAL Sponsorship Program

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant