From ea73297ea426eac1dcc0133c4cd730ff029e26a8 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Mon, 30 Dec 2019 00:50:08 +0100 Subject: deformation: add support for +grids= for GeoTIFF grids This option is to load grid(s) that have both the horizontal and vertical velocities in the same file. Can be tested with the following grid https://github.com/rouault/sample_proj_gtiff_grids/blob/master/nkgrf03vel_realigned.tif converted from the original .ct2 and .gtx with ``` gdal_translate nkgrf03vel_realigned.vrt nkgrf03vel_realigned.tif -co COMPRESS=DEFLATE -co PREDICTOR=3 -co BLOCKYSIZE=241 -co INTERLEAVE=BAND ``` where nkgrf03vel_realigned.vrt is ``` GEOGCRS["Unknown based on GRS80", DATUM["Unknown based on GRS80", ELLIPSOID["GRS 1980",6378137,298.257222101, LENGTHUNIT["metre",1]]], PRIMEM["Greenwich",0, ANGLEUNIT["degree",0.0174532925199433]], CS[ellipsoidal,2], AXIS["geodetic latitude (Lat)",north, ORDER[1], ANGLEUNIT["degree",0.0174532925199433]], AXIS["geodetic longitude (Lon)",east, ORDER[2], ANGLEUNIT["degree",0.0174532925199433]]] 2.9166666666666670e+00, 1.6666666666666666e-01, 0.0000000000000000e+00, 7.3041666666666686e+01, 0.0000000000000000e+00, -8.3333333333333329e-02 Nordic and Baltic countries Point The Nordic Geodetic Commission. Creative Commons Attribution 4.0 https://creativecommons.org/licenses/by/4.0/ 2019:12:30 00:00:00 Deformation model covering the Nordic and Baltic countries. Used in transformations between global reference frames and the local realisations of ETRS89 in the Nordic and Baltic countries VELOCITY east_velocity mm/year /home/even/proj/proj-datumgrid/europe/nkgrf03vel_realigned_xy.ct2 2 north_velocity mm/year /home/even/proj/proj-datumgrid/europe/nkgrf03vel_realigned_xy.ct2 1 up_velocity mm/year /home/even/proj/proj-datumgrid/europe/nkgrf03vel_realigned_z.gtx 1 ``` --- data/Makefile.am | 3 +++ data/tests/nkgrf03vel_realigned_extract.tif | Bin 0 -> 1519 bytes data/tests/nkgrf03vel_realigned_xy_extract.ct2 | Bin 0 -> 360 bytes data/tests/nkgrf03vel_realigned_z_extract.gtx | Bin 0 -> 140 bytes 4 files changed, 3 insertions(+) create mode 100644 data/tests/nkgrf03vel_realigned_extract.tif create mode 100644 data/tests/nkgrf03vel_realigned_xy_extract.ct2 create mode 100644 data/tests/nkgrf03vel_realigned_z_extract.gtx (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index 09fa1989..4bba2649 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -82,6 +82,9 @@ EXTRA_DIST = proj.ini GL27 nad.lst nad27 nad83 \ tests/subset_of_gr3df97a.tif \ tests/egm96_15_uncompressed_truncated.tif \ tests/test_vgrid_single_strip_truncated.tif \ + tests/nkgrf03vel_realigned_extract.tif \ + tests/nkgrf03vel_realigned_xy_extract.ct2 \ + tests/nkgrf03vel_realigned_z_extract.gtx \ null \ generate_all_sql_in.cmake sql_filelist.cmake \ $(SQL_ORDERED_LIST) diff --git a/data/tests/nkgrf03vel_realigned_extract.tif b/data/tests/nkgrf03vel_realigned_extract.tif new file mode 100644 index 00000000..70e79e93 Binary files /dev/null and b/data/tests/nkgrf03vel_realigned_extract.tif differ diff --git a/data/tests/nkgrf03vel_realigned_xy_extract.ct2 b/data/tests/nkgrf03vel_realigned_xy_extract.ct2 new file mode 100644 index 00000000..89232b9f Binary files /dev/null and b/data/tests/nkgrf03vel_realigned_xy_extract.ct2 differ diff --git a/data/tests/nkgrf03vel_realigned_z_extract.gtx b/data/tests/nkgrf03vel_realigned_z_extract.gtx new file mode 100644 index 00000000..5ea8aac7 Binary files /dev/null and b/data/tests/nkgrf03vel_realigned_z_extract.gtx differ -- cgit v1.2.3 From 11f63432d39e33a04e1fb0acd8215b86f27dceb8 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Wed, 1 Jan 2020 14:31:04 +0100 Subject: deformation.cpp: check that unit in TIFF file is 'millimetres per year' which is the official name in EPSG --- data/tests/nkgrf03vel_realigned_extract.tif | Bin 1519 -> 1795 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'data') diff --git a/data/tests/nkgrf03vel_realigned_extract.tif b/data/tests/nkgrf03vel_realigned_extract.tif index 70e79e93..6db8eae4 100644 Binary files a/data/tests/nkgrf03vel_realigned_extract.tif and b/data/tests/nkgrf03vel_realigned_extract.tif differ -- cgit v1.2.3