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

Database (and tweaks in core): Add Finland tinshift operations #2392

Merged
merged 4 commits into from
Oct 23, 2020
Merged

Database (and tweaks in core): Add Finland tinshift operations #2392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ef443bd
Database: add interpolation_crs_auth_name and interpolation_crs_code …
rouault Oct 23, 2020
19b4bba
Add logic to handle interpolationCRS in PROJBasedOperation and Concat…
rouault Oct 23, 2020
06162ef
PROJStringFormatter::getUsedGridNames(): recognize +file= parameter o…
rouault Oct 23, 2020
e30be68
Database: add Finland tinshift operations
rouault Oct 23, 2020
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
1 change: 1 addition & 0 deletions data/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ SQL_ORDERED_LIST = sql/begin.sql \
sql/grid_transformation.sql \
sql/grid_transformation_custom.sql \
sql/other_transformation.sql \
sql/other_transformation_custom.sql \
sql/concatenated_operation.sql \
sql/concatenated_operation_step.sql \
sql/alias_name.sql \
Expand Down
7 changes: 4 additions & 3 deletions data/sql/customizations.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ INSERT INTO "usage" VALUES(
'EPSG','1024' -- unknown
);

INSERT INTO "other_transformation" VALUES('PROJ','CRS84_TO_EPSG_4326','OGC:CRS84 to WGS 84',NULL,'EPSG','9843','Axis Order Reversal (2D)','OGC','CRS84','EPSG','4326',0.0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);
INSERT INTO "other_transformation" VALUES('PROJ','CRS84_TO_EPSG_4326','OGC:CRS84 to WGS 84',NULL,'EPSG','9843','Axis Order Reversal (2D)','OGC','CRS84','EPSG','4326',0.0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);
INSERT INTO "usage" VALUES(
'PROJ',
'CRS84_TO_EPSG_4326_USAGE',
Expand All @@ -66,7 +66,7 @@ INSERT INTO "usage" VALUES(
'EPSG','1024' -- unknown
);

INSERT INTO "other_transformation" VALUES('PROJ','CRS27_TO_EPSG_4267','OGC:CRS27 to NAD27',NULL,'EPSG','9843','Axis Order Reversal (2D)','OGC','CRS27','EPSG','4267',0.0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);
INSERT INTO "other_transformation" VALUES('PROJ','CRS27_TO_EPSG_4267','OGC:CRS27 to NAD27',NULL,'EPSG','9843','Axis Order Reversal (2D)','OGC','CRS27','EPSG','4267',0.0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);
INSERT INTO "usage" VALUES(
'PROJ',
'CRS27_TO_EPSG_4267_USAGE',
Expand All @@ -77,7 +77,7 @@ INSERT INTO "usage" VALUES(
'EPSG','1024' -- unknown
);

INSERT INTO "other_transformation" VALUES('PROJ','CRS83_TO_EPSG_4269','OGC:CRS83 to NAD83',NULL,'EPSG','9843','Axis Order Reversal (2D)','OGC','CRS83','EPSG','4269',0.0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);
INSERT INTO "other_transformation" VALUES('PROJ','CRS83_TO_EPSG_4269','OGC:CRS83 to NAD83',NULL,'EPSG','9843','Axis Order Reversal (2D)','OGC','CRS83','EPSG','4269',0.0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);
INSERT INTO "usage" VALUES(
'PROJ',
'CRS83_TO_EPSG_4269_USAGE',
Expand Down Expand Up @@ -110,6 +110,7 @@ INSERT INTO other_transformation VALUES(
NULL,NULL,NULL,NULL,NULL,NULL, -- param5
NULL,NULL,NULL,NULL,NULL,NULL, -- param6
NULL,NULL,NULL,NULL,NULL,NULL, -- param7
NULL,NULL,
'20180701', -- operation version
0);
INSERT INTO "usage" VALUES(
Expand Down
10 changes: 5 additions & 5 deletions data/sql/esri.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16549,7 +16549,7 @@ INSERT INTO "usage" VALUES('ESRI', '108018_USAGE','helmert_transformation','ESRI
INSERT INTO "extent" VALUES('ESRI','144','Israel, Palestine Territory, and Jordan','Israel, Palestine Territory, and Jordan',29.19,33.53,32.99,39.3,0);
INSERT INTO "helmert_transformation" VALUES('ESRI','108021','WGS_1984_To_Israel_CoordFrame',NULL,'EPSG','9607','Coordinate Frame rotation (geog2D domain)','EPSG','4326','EPSG','4141',1.0,-24.0024,-17.1032,-17.8444,'EPSG','9001',-0.33009,-1.85269,1.66969,'EPSG','9104',5.4248,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);
INSERT INTO "usage" VALUES('ESRI', '108021_USAGE','helmert_transformation','ESRI','108021','ESRI','144','EPSG','1024');
INSERT INTO "other_transformation" VALUES('ESRI','108022','NTF_Paris_RGF_To_NTF_2',NULL,'EPSG','9619','Geographic2D offsets','EPSG','4807','EPSG','4275',0.0,'EPSG','8601','Latitude offset',0.0,'EPSG','9104','EPSG','8602','Longitude offset',8413.095,'EPSG','9104',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);
INSERT INTO "other_transformation" VALUES('ESRI','108022','NTF_Paris_RGF_To_NTF_2',NULL,'EPSG','9619','Geographic2D offsets','EPSG','4807','EPSG','4275',0.0,'EPSG','8601','Latitude offset',0.0,'EPSG','9104','EPSG','8602','Longitude offset',8413.095,'EPSG','9104',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);
INSERT INTO "usage" VALUES('ESRI', '108022_USAGE','other_transformation','ESRI','108022','EPSG','3694','EPSG','1024');
INSERT INTO "grid_transformation" VALUES('ESRI','108023','Datum_Lisboa_Hayford_To_WGS_1984_NTv2',NULL,'EPSG','9615','NTv2','ESRI','104106','EPSG','4326',0.1,'EPSG','8656','Latitude and longitude difference file','portugal/DLX_ETRS89_geo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);
INSERT INTO "usage" VALUES('ESRI', '108023_USAGE','grid_transformation','ESRI','108023','EPSG','1294','EPSG','1024');
Expand Down Expand Up @@ -16607,9 +16607,9 @@ INSERT INTO "helmert_transformation" VALUES('ESRI','108051','WGS_1984_To_Xrail84
INSERT INTO "usage" VALUES('ESRI', '108051_USAGE','helmert_transformation','ESRI','108051','ESRI','2','EPSG','1024');
INSERT INTO "helmert_transformation" VALUES('ESRI','108052','ITRF_2005_To_ITRF_2008_2',NULL,'EPSG','9606','Position Vector transformation (geog2D domain)','EPSG','8998','EPSG','8999',0.01,0.002,0.0009,0.0047,'EPSG','9001',0.0,0.0,0.0,'EPSG','9104',-0.00094,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);
INSERT INTO "usage" VALUES('ESRI', '108052_USAGE','helmert_transformation','ESRI','108052','EPSG','1262','EPSG','1024');
INSERT INTO "other_transformation" VALUES('ESRI','108053','JGD_2011_To_WGS_1984',NULL,'EPSG','9619','Geographic2D offsets','EPSG','6668','EPSG','4326',0.0,'EPSG','8601','Latitude offset',0,'EPSG','9104','EPSG','8602','Longitude offset',0,'EPSG','9104',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);
INSERT INTO "other_transformation" VALUES('ESRI','108053','JGD_2011_To_WGS_1984',NULL,'EPSG','9619','Geographic2D offsets','EPSG','6668','EPSG','4326',0.0,'EPSG','8601','Latitude offset',0,'EPSG','9104','EPSG','8602','Longitude offset',0,'EPSG','9104',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);
INSERT INTO "usage" VALUES('ESRI', '108053_USAGE','other_transformation','ESRI','108053','EPSG','3957','EPSG','1024');
INSERT INTO "other_transformation" VALUES('ESRI','108054','MONREF_1997_To_WGS_1984',NULL,'EPSG','9619','Geographic2D offsets','ESRI','104134','EPSG','4326',1.0,'EPSG','8601','Latitude offset',0,'EPSG','9104','EPSG','8602','Longitude offset',0,'EPSG','9104',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);
INSERT INTO "other_transformation" VALUES('ESRI','108054','MONREF_1997_To_WGS_1984',NULL,'EPSG','9619','Geographic2D offsets','ESRI','104134','EPSG','4326',1.0,'EPSG','8601','Latitude offset',0,'EPSG','9104','EPSG','8602','Longitude offset',0,'EPSG','9104',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);
INSERT INTO "usage" VALUES('ESRI', '108054_USAGE','other_transformation','ESRI','108054','EPSG','1164','EPSG','1024');
INSERT INTO "helmert_transformation" VALUES('ESRI','108055','WGS_1984_To_MSK_1942',NULL,'EPSG','9607','Coordinate Frame rotation (geog2D domain)','EPSG','4326','ESRI','104135',NULL,78.0421780299,204.5186132514,77.449861533,'EPSG','9001',-1.7736709695,3.3197917322,-1.0426077127,'EPSG','9104',-4.95105766,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);
INSERT INTO "usage" VALUES('ESRI', '108055_USAGE','helmert_transformation','ESRI','108055','EPSG','1164','EPSG','1024');
Expand All @@ -16624,11 +16624,11 @@ INSERT INTO "grid_transformation" VALUES('ESRI','108059','OSGB_1936_To_Xrail84_N
INSERT INTO "usage" VALUES('ESRI', '108059_USAGE','grid_transformation','ESRI','108059','ESRI','2','EPSG','1024');
INSERT INTO "helmert_transformation" VALUES('ESRI','108060','GDA_1994_To_GDA2020_1',NULL,'EPSG','9607','Coordinate Frame rotation (geog2D domain)','EPSG','4283','EPSG','7844',0.01,0.06155,-0.01087,-0.04019,'EPSG','9001',-0.0394924,-0.0327221,-0.0328979,'EPSG','9104',-0.009994,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);
INSERT INTO "usage" VALUES('ESRI', '108060_USAGE','helmert_transformation','ESRI','108060','EPSG','4177','EPSG','1024');
INSERT INTO "other_transformation" VALUES('ESRI','108061','ITRF_2014_To_GDA2020_Null',NULL,'EPSG','9619','Geographic2D offsets','EPSG','9000','EPSG','7844',0.005,'EPSG','8601','Latitude offset',0,'EPSG','9104','EPSG','8602','Longitude offset',0,'EPSG','9104',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);
INSERT INTO "other_transformation" VALUES('ESRI','108061','ITRF_2014_To_GDA2020_Null',NULL,'EPSG','9619','Geographic2D offsets','EPSG','9000','EPSG','7844',0.005,'EPSG','8601','Latitude offset',0,'EPSG','9104','EPSG','8602','Longitude offset',0,'EPSG','9104',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);
INSERT INTO "usage" VALUES('ESRI', '108061_USAGE','other_transformation','ESRI','108061','EPSG','4177','EPSG','1024');
INSERT INTO "helmert_transformation" VALUES('ESRI','108062','NAD_1927_To_SIRGAS_2000_7Par_Panama',NULL,'EPSG','9607','Coordinate Frame rotation (geog2D domain)','EPSG','4267','EPSG','4674',1.0,-32.3841359,180.4090461,120.8442577,'EPSG','9001',2.1545854,0.1498782,-0.5742915,'EPSG','9104',8.1049164,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);
INSERT INTO "usage" VALUES('ESRI', '108062_USAGE','helmert_transformation','ESRI','108062','EPSG','3290','EPSG','1024');
INSERT INTO "other_transformation" VALUES('ESRI','108063','NAD_1983_HARN_To_HARN_Adjusted_WCCS_Chippewa',NULL,'EPSG','9619','Geographic2D offsets','EPSG','4152','ESRI','104808',0.0,'EPSG','8601','Latitude offset',0,'EPSG','9104','EPSG','8602','Longitude offset',0,'EPSG','9104',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);
INSERT INTO "other_transformation" VALUES('ESRI','108063','NAD_1983_HARN_To_HARN_Adjusted_WCCS_Chippewa',NULL,'EPSG','9619','Geographic2D offsets','EPSG','4152','ESRI','104808',0.0,'EPSG','8601','Latitude offset',0,'EPSG','9104','EPSG','8602','Longitude offset',0,'EPSG','9104',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);
INSERT INTO "usage" VALUES('ESRI', '108063_USAGE','other_transformation','ESRI','108063','EPSG','1418','EPSG','1024');
INSERT INTO "extent" VALUES('ESRI','146','Spain - Peninsula - NTv2 grid','Spain - Peninsula - NTv2 grid',35.5555555555556,44.4444444444444,-10.1833333333333,4.15,0);
INSERT INTO "grid_transformation" VALUES('ESRI','108066','ED_1950_To_ETRS_1989_NTv2_PENR2009',NULL,'EPSG','9615','NTv2','EPSG','4230','EPSG','4258',0.1,'EPSG','8656','Latitude and longitude difference file','spain/PENR2009',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);
Expand Down
6 changes: 5 additions & 1 deletion data/sql/grid_alternatives.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,5 +231,9 @@ VALUES
('CA61_003.gsb','br_ibge_CA61_003.tif',NULL,'GTiff','hgridshift',0,NULL,'https://cdn.proj.org/br_ibge_CA61_003.tif',1,1,NULL),
('CA7072_003.gsb','br_ibge_CA7072_003.tif',NULL,'GTiff','hgridshift',0,NULL,'https://cdn.proj.org/br_ibge_CA7072_003.tif',1,1,NULL),
('SAD69_003.gsb','br_ibge_SAD69_003.tif',NULL,'GTiff','hgridshift',0,NULL,'https://cdn.proj.org/br_ibge_SAD69_003.tif',1,1,NULL),
('SAD96_003.gsb','br_ibge_SAD96_003.tif',NULL,'GTiff','hgridshift',0,NULL,'https://cdn.proj.org/br_ibge_SAD96_003.tif',1,1,NULL)
('SAD96_003.gsb','br_ibge_SAD96_003.tif',NULL,'GTiff','hgridshift',0,NULL,'https://cdn.proj.org/br_ibge_SAD96_003.tif',1,1,NULL),
-- Finland
('fi_nls_ykj_etrs35fin.json','fi_nls_ykj_etrs35fin.json',NULL,'JSON','tinshift',0,NULL,'https://cdn.proj.org/fi_nls_ykj_etrs35fin.json',1,1,NULL),
('fi_nls_n43_n60.json','fi_nls_n43_n60.json',NULL,'JSON','tinshift',0,NULL,'https://cdn.proj.org/fi_nls_n43_n60.json',1,1,NULL),
('fi_nls_n60_n2000.json','fi_nls_n60_n2000.json',NULL,'JSON','tinshift',0,NULL,'https://cdn.proj.org/fi_nls_n60_n2000.json',1,1,NULL)
;
Loading