diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2019-10-16 12:27:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-16 12:27:12 +0200 |
| commit | 5fbcf98c9ac6184a066d66a39d55bd3084926b2f (patch) | |
| tree | 83c506c4927f4282384b6f15ebd0f53b0cc417ab /test | |
| parent | e2abe08de3d213980536944f9aa1d27352447ccd (diff) | |
| parent | 885f0b59eaac1424ed962117bac0f85edc42699b (diff) | |
| download | PROJ-5fbcf98c9ac6184a066d66a39d55bd3084926b2f.tar.gz PROJ-5fbcf98c9ac6184a066d66a39d55bd3084926b2f.zip | |
Merge pull request #1673 from rouault/update_epsg_9_8_3
Database: update to EPSG v9.8.3
Diffstat (limited to 'test')
| -rw-r--r-- | test/cli/testprojinfo_out.dist | 10 | ||||
| -rw-r--r-- | test/unit/test_c_api.cpp | 10 |
2 files changed, 12 insertions, 8 deletions
diff --git a/test/cli/testprojinfo_out.dist b/test/cli/testprojinfo_out.dist index 29eefc6a..f97fde62 100644 --- a/test/cli/testprojinfo_out.dist +++ b/test/cli/testprojinfo_out.dist @@ -841,7 +841,7 @@ COORDINATEOPERATION["RH2000 height to SWEREF99", ID["PROJ","EPSG_5613_TO_EPSG_4977"]] Testing NAD83(2011) + NAVD88 height -> NAD83(2011) : projinfo -s EPSG:6349 -t EPSG:6319 --spatial-test intersects -o PROJ -Candidate operations found: 2 +Candidate operations found: 3 ------------------------------------- Operation n°1: @@ -858,6 +858,14 @@ unknown id, Inverse of NAD83(2011) to NAVD88 height (2), 0.02 m, USA - Alaska PROJ string: +proj=pipeline +step +proj=axisswap +order=2,1 +step +proj=unitconvert +xy_in=deg +xy_out=rad +step +proj=vgridshift +grids=g2012ba0.gtx +multiplier=1 +step +proj=unitconvert +xy_in=rad +xy_out=deg +step +proj=axisswap +order=2,1 +------------------------------------- +Operation n°3: + +unknown id, Inverse of NAD83(2011) to NAVD88 height (3), 0.015 m, USA - CONUS - onshore + +PROJ string: ++proj=pipeline +step +proj=axisswap +order=2,1 +step +proj=unitconvert +xy_in=deg +xy_out=rad +step +inv +proj=vgridshift +grids=g2018u0.bin +multiplier=1 +step +proj=unitconvert +xy_in=rad +xy_out=deg +step +proj=axisswap +order=2,1 + Testing NGF IGN69 height to RGF93: projinfo -s EPSG:5720 -t EPSG:4965 -o PROJ Candidate operations found: 2 ------------------------------------- diff --git a/test/unit/test_c_api.cpp b/test/unit/test_c_api.cpp index e7104fae..f8b447ca 100644 --- a/test/unit/test_c_api.cpp +++ b/test/unit/test_c_api.cpp @@ -3486,13 +3486,9 @@ TEST_F(CApi, proj_get_remarks) { auto remarks = proj_get_remarks(co); ASSERT_NE(remarks, nullptr); - EXPECT_EQ( - remarks, - std::string("Scale difference in ppb where 1/billion = 1E-9. " - "Derivation excluded Cocos, Christmas and Macquarie " - "Islands but is applied there. See codes 8444-46 for " - "equivalents using NTv2 method. See code 8447 for " - "alternative including distortion model for Aus only.")); + EXPECT_TRUE(std::string(remarks).find( + "Scale difference in ppb where 1/billion = 1E-9.") == 0) + << remarks; } // --------------------------------------------------------------------------- |