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.

Sign up for GitHub

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

Backport NKG unique names #4111

Merged
merged 2 commits into from
Apr 4, 2024
Merged

Backport NKG unique names #4111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2beb416
Make NKG Transformation names unique
kbevers Mar 21, 2024
92de8aa
nkg.sql: fix remaining duplicated transformation names
rouault Apr 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions data/sql/nkg.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
INSERT INTO "metadata" VALUES('NKG.SOURCE', '/~https://github.com/NordicGeodesy/NordicTransformations');
INSERT INTO "metadata" VALUES('NKG.VERSION', '1.0.0');
INSERT INTO "metadata" VALUES('NKG.DATE', '2020-12-21');
INSERT INTO "metadata" VALUES('NKG.VERSION', '1.0.1');
INSERT INTO "metadata" VALUES('NKG.DATE', '2024-04-02');

-- extent for NKG2008 transformations
INSERT INTO "extent" VALUES(
Expand Down Expand Up @@ -311,7 +311,7 @@ INSERT INTO "usage" VALUES (
-- EE
INSERT INTO "helmert_transformation" VALUES (
'NKG','P1_2008_EE', -- operation auth+code
'NKG_ETRF00 to ETRF96@2000.0', -- name
'NKG_ETRF00 to ETRF96@2000.0 (Estonia)', -- name
'Transformation from NKG_ETRF00 to ETRF96, at transformation reference epoch 2000.0', -- description / remark
'EPSG','1033', -- method auth+code
'Position Vector transformation (geocentric domain)',
Expand Down Expand Up @@ -345,7 +345,7 @@ INSERT INTO "usage" VALUES (
-- FI
INSERT INTO "helmert_transformation" VALUES (
'NKG','P1_2008_FI', -- operation auth+code
'NKG_ETRF00 to ETRF96@2000.0', -- name
'NKG_ETRF00 to ETRF96@2000.0 (Finland)', -- name
'Transformation from NKG_ETRF00 to ETRF96, at transformation reference epoch 2000.0', -- description / remark
'EPSG','1033', -- method auth+code
'Position Vector transformation (geocentric domain)',
Expand Down Expand Up @@ -553,7 +553,7 @@ INSERT INTO "usage" VALUES (
-- EE
INSERT INTO "helmert_transformation" VALUES (
'NKG','PAR_2020_EE', -- operation auth+code
'NKG_ETRF14 to ETRF96@2000.0', -- name
'NKG_ETRF14 to ETRF96@2000.0 (Estonia)', -- name
'Transformation from NKG_ETRF14 to ETRF96, at transformation reference epoch 2000.0', -- description / remark
'EPSG','1033', -- method auth+code
'Position Vector transformation (geocentric domain)',
Expand Down Expand Up @@ -587,7 +587,7 @@ INSERT INTO "usage" VALUES (
-- FI
INSERT INTO "helmert_transformation" VALUES (
'NKG','PAR_2020_FI', -- operation auth+code
'NKG_ETRF14 to ETRF96@2000.0', -- name
'NKG_ETRF14 to ETRF96@2000.0 (Finland)', -- name
'Transformation from NKG_ETRF14 to ETRF96, at transformation reference epoch 2000.0', -- description / remark
'EPSG','1033', -- method auth+code
'Position Vector transformation (geocentric domain)',
Expand Down Expand Up @@ -687,7 +687,7 @@ INSERT INTO "usage" VALUES (
-- NO
INSERT INTO "helmert_transformation" VALUES (
'NKG','PAR_2020_NO', -- operation auth+code
'NKG_ETRF14 to ETRF93@2000.0', -- name
'NKG_ETRF14 to ETRF93@2000.0 (Helmert)', -- name
'Transformation from NKG_ETRF14 to ETRF93, at transformation reference epoch 2000.0', -- description / remark
'EPSG','1033', -- method auth+code
'Position Vector transformation (geocentric domain)',
Expand Down Expand Up @@ -735,9 +735,9 @@ INSERT INTO "other_transformation" (
)
VALUES(
'NKG', 'NKG_ETRF14_ETRF93_2000', -- object auth+code
'NKG_ETRF14 to ETRF93@2000.0', -- name
'NKG_ETRF14 to ETRF93@2000.0 (Gridshift)', -- name
'Transformation from NKG_ETRF14 to ETRF93, at transformation reference epoch 2000.0', -- description / remark
'PROJ', 'PROJString',
'PROJ', 'PROJString',
'+proj=xyzgridshift +grids=no_kv_NKGETRF14_EPSG7922_2000.tif',
'NKG','ETRF14', -- source auth+code
'EPSG','7922', -- target auth+code
Expand Down Expand Up @@ -812,7 +812,7 @@ INSERT INTO "other_transformation" (
)
VALUES(
'NKG', 'ETRF92_2000_TO_ETRF92_1994',-- object auth+code
'ETRF92@2000.0 to ETRF92@1994.704', -- name
'ETRF92@2000.0 to ETRF92@1994.704 using nkgrf03vel_realigned', -- name
NULL, -- description
'PROJ', 'PROJString', -- method auth+cod
'+proj=deformation +dt=-5.296 +grids=eur_nkg_nkgrf03vel_realigned.tif',
Expand Down Expand Up @@ -917,7 +917,7 @@ INSERT INTO "other_transformation" (
)
VALUES(
'NKG', 'ETRF96_2000_TO_ETRF96_1997_56',-- object auth+code
'ETRF96@2000.0 to ETRF96@1997.56', -- name
'ETRF96@2000.0 to ETRF96@1997.56 using nkgrf03vel_realigned', -- name
NULL, -- description
'PROJ', 'PROJString', -- method auth+cod
'+proj=deformation +dt=-2.44 +grids=eur_nkg_nkgrf03vel_realigned.tif',
Expand Down Expand Up @@ -1025,7 +1025,7 @@ INSERT INTO "other_transformation" (
)
VALUES(
'NKG', 'ETRF96_2000_TO_ETRF96_1997',-- object auth+code
'ETRF96@2000.0 to ETRF96@1997.0', -- name
'ETRF96@2000.0 to ETRF96@1997.0 using nkgrf03vel_realigned', -- name
NULL, -- description
'PROJ', 'PROJString', -- method auth+cod
'+proj=deformation +dt=-3.0 +grids=eur_nkg_nkgrf03vel_realigned.tif',
Expand Down Expand Up @@ -1133,7 +1133,7 @@ INSERT INTO "other_transformation" (
)
VALUES(
'NKG', 'ETRF89_2000_TO_ETRF89_1992',-- object auth+code
'ETRF89@2000.0 to ETRF89@1992.75', -- name
'ETRF89@2000.0 to ETRF89@1992.75 using nkgrf03vel_realigned', -- name
NULL, -- description
'PROJ', 'PROJString', -- method auth+cod
'+proj=deformation +dt=-7.25 +grids=eur_nkg_nkgrf03vel_realigned.tif',
Expand Down Expand Up @@ -1240,7 +1240,7 @@ INSERT INTO "other_transformation" (
)
VALUES(
'NKG', 'ETRF2000_2000_TO_ETRF_2000_2003',-- object auth+code
'ETRF2000@2000.0 to ETRF2000@2003.75', -- name
'ETRF2000@2000.0 to ETRF2000@2003.75 using nkgrf03vel_realigned', -- name
NULL, -- description
'PROJ', 'PROJString', -- method auth+cod
'+proj=deformation +dt=3.75 +grids=eur_nkg_nkgrf03vel_realigned.tif',
Expand Down Expand Up @@ -1347,7 +1347,7 @@ INSERT INTO "other_transformation" (
)
VALUES(
'NKG', 'ETRF93_2000_TO_ETRF93_1995',-- object auth+code
'ETRF93@2000.0 to ETRF93@1995.0', -- name
'ETRF93@2000.0 to ETRF93@1995.0 using nkgrf03vel_realigned', -- name
NULL, -- description
'PROJ', 'PROJString', -- method auth+cod
'+proj=deformation +dt=-5 +grids=eur_nkg_nkgrf03vel_realigned.tif',
Expand Down Expand Up @@ -1454,7 +1454,7 @@ INSERT INTO "other_transformation" (
)
VALUES(
'NKG', 'ETRF97_2000_TO_ETRF97_1999',-- object auth+code
'ETRF97@2000.0 to ETRF97@1999.5', -- name
'ETRF97@2000.0 to ETRF97@1999.5 using nkgrf03vel_realigned', -- name
NULL, -- description
'PROJ', 'PROJString', -- method auth+cod
'+proj=deformation +dt=-0.5 +grids=eur_nkg_nkgrf03vel_realigned.tif',
Expand Down Expand Up @@ -1559,7 +1559,7 @@ INSERT INTO "other_transformation" (
)
VALUES(
'NKG', 'DK_2020_INTRAPLATE', -- object auth+code
'ETRF92@2000.0 to ETRF92@1994.704', -- name
'ETRF92@2000.0 to ETRF92@1994.704 using nkgrf17vel', -- name
NULL, -- description
'PROJ', 'PROJString', -- method auth+cod
'+proj=deformation +dt=15.829 +grids=eur_nkg_nkgrf17vel.tif',
Expand Down Expand Up @@ -1673,7 +1673,7 @@ INSERT INTO "other_transformation" (
)
VALUES(
'NKG', 'EE_2020_INTRAPLATE',-- object auth+code
'ETRF96@2000.0 to ETRF96@1997.56', -- name
'ETRF96@2000.0 to ETRF96@1997.56 using nkgrf17vel', -- name
NULL, -- description
'PROJ', 'PROJString', -- method auth+cod
'+proj=deformation +dt=-2.44 +grids=eur_nkg_nkgrf17vel.tif',
Expand Down Expand Up @@ -1789,7 +1789,7 @@ INSERT INTO "other_transformation" (
)
VALUES(
'NKG', 'FI_2020_INTRAPLATE',-- object auth+code
'ETRF96@2000.0 to ETRF96@1997.0', -- name
'ETRF96@2000.0 to ETRF96@1997.0 using nkgrf17vel', -- name
NULL, -- description
'PROJ', 'PROJString', -- method auth+cod
'+proj=deformation +dt=-3 +grids=eur_nkg_nkgrf17vel.tif',
Expand Down Expand Up @@ -1905,7 +1905,7 @@ INSERT INTO "other_transformation" (
)
VALUES(
'NKG', 'LV_2020_INTRAPLATE', -- object auth+code
'ETRF89@2000.0 to ETRF89@1992.75 (LKS-92)', -- name
'ETRF89@2000.0 to ETRF89@1992.75 (LKS-92) using nkgrf17vel', -- name
NULL, -- description
'PROJ', 'PROJString', -- method auth+cod
'+proj=deformation +dt=-7.25 +grids=eur_nkg_nkgrf17vel.tif',
Expand Down Expand Up @@ -2021,7 +2021,7 @@ INSERT INTO "other_transformation" (
)
VALUES(
'NKG', 'LT_2020_INTRAPLATE', -- object auth+code
'ETRF2000@2000.0 to ETRF2000@2003.75 (LKS94)', -- name
'ETRF2000@2000.0 to ETRF2000@2003.75 (LKS94) using nkgrf17vel', -- name
NULL, -- description
'PROJ', 'PROJString', -- method auth+cod
'+proj=deformation +dt=3.75 +grids=eur_nkg_nkgrf17vel.tif',
Expand Down Expand Up @@ -2137,7 +2137,7 @@ INSERT INTO "other_transformation" (
)
VALUES(
'NKG', 'NO_2020_INTRAPLATE', -- object auth+code
'ETRF93@2000.0 to ETRF93@1995.0', -- name
'ETRF93@2000.0 to ETRF93@1995.0 using nkgrf17vel', -- name
NULL, -- description
'PROJ', 'PROJString', -- method auth+cod
'+proj=deformation +dt=-5 +grids=eur_nkg_nkgrf17vel.tif',
Expand Down Expand Up @@ -2202,7 +2202,7 @@ INSERT INTO "concatenated_operation_step" (
operation_auth_name, operation_code, step_number, step_auth_name, step_code
) VALUES
('NKG', 'ITRF2014_TO_NO', 1, 'EPSG', '8366'), -- ITRF2014 -> ETRF2014
('NKG', 'ITRF2014_TO_NO', 2, 'NKG', 'NKG_ETRF14_TO_ETRF2014'),
('NKG', 'ITRF2014_TO_NO', 2, 'NKG', 'NKG_ETRF14_TO_ETRF2014'),
('NKG', 'ITRF2014_TO_NO', 3, 'NKG', 'NKG_ETRF14_ETRF93_2000'),
('NKG', 'ITRF2014_TO_NO', 4, 'NKG', 'NO_2020_INTRAPLATE')
;
Expand Down Expand Up @@ -2247,7 +2247,7 @@ INSERT INTO "other_transformation" (
)
VALUES(
'NKG', 'SE_2020_INTRAPLATE',-- object auth+code
'ETRF97@2000.0 to ETRF97@1999.5', -- name
'ETRF97@2000.0 to ETRF97@1999.5 using nkgrf17vel', -- name
NULL, -- description
'PROJ', 'PROJString', -- method auth+cod
'+proj=deformation +dt=-0.5 +grids=eur_nkg_nkgrf17vel.tif',
Expand Down
4 changes: 2 additions & 2 deletions test/unit/test_operationfactory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1970,8 +1970,8 @@ TEST(operation, geogCRS_to_geogCRS_with_intermediate_no_ids) {
"Conversion from ITRF2014 (geog3D) to ITRF2014 (geocentric) + "
"ITRF2014 to ETRF2014 (1) + "
"Inverse of NKG_ETRF14 to ETRF2014 + "
"NKG_ETRF14 to ETRF96@2000.0 + "
"ETRF96@2000.0 to ETRF96@1997.56 + "
"NKG_ETRF14 to ETRF96@2000.0 (Estonia) + "
"ETRF96@2000.0 to ETRF96@1997.56 using nkgrf17vel + "
"Conversion from ETRS89 (geocentric) to ETRS89 (geog2D) + "
"Inverse of EST97 to ETRS89 (1) + "
"Null geographic offset from EST97 (geog2D) to EST97 (geog3D) + "
Expand Down
Loading