diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2020-01-01 14:32:36 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2020-01-01 14:32:36 +0100 |
| commit | 08ae5764f57f518d5baf8803d67248bca0fa44fc (patch) | |
| tree | 734f51c78cbe80aba62fb01ce9ed85c2bb97308b | |
| parent | ea106578ee333e0e8cd4ef1d657d3cde5c665fba (diff) | |
| parent | 11f63432d39e33a04e1fb0acd8215b86f27dceb8 (diff) | |
| download | PROJ-08ae5764f57f518d5baf8803d67248bca0fa44fc.tar.gz PROJ-08ae5764f57f518d5baf8803d67248bca0fa44fc.zip | |
Merge branch 'deformation_with_geotiff_file' into rfc4_network_disk_cache
| -rw-r--r-- | data/tests/nkgrf03vel_realigned_extract.tif | bin | 1519 -> 1795 bytes | |||
| -rw-r--r-- | src/transformations/deformation.cpp | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/data/tests/nkgrf03vel_realigned_extract.tif b/data/tests/nkgrf03vel_realigned_extract.tif Binary files differindex 70e79e93..6db8eae4 100644 --- a/data/tests/nkgrf03vel_realigned_extract.tif +++ b/data/tests/nkgrf03vel_realigned_extract.tif diff --git a/src/transformations/deformation.cpp b/src/transformations/deformation.cpp index 031e9eba..eb109826 100644 --- a/src/transformations/deformation.cpp +++ b/src/transformations/deformation.cpp @@ -131,8 +131,8 @@ static bool get_grid_values(PJ* P, } } const auto unit = grid->unit(sampleE); - if( !unit.empty() && unit != "mm/year" ) { - proj_log_error(P, "deformation: Only unit=mm/year currently handled"); + if( !unit.empty() && unit != "millimetres per year" ) { + proj_log_error(P, "deformation: Only unit=millimetres per year currently handled"); return false; } |