From d2a343663080e4231ab40e75e17776d5ab0f3b46 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Fri, 18 Aug 2023 19:18:05 +0200 Subject: [PATCH] Database: grid_alternatives: reference new HT2 Canadian grids added per https://github.com/OSGeo/PROJ-data/pull/106 --- data/sql/grid_alternatives.sql | 7 +++++-- test/unit/test_operationfactory.cpp | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/data/sql/grid_alternatives.sql b/data/sql/grid_alternatives.sql index 39cabc7a1b..3a90d1bf14 100644 --- a/data/sql/grid_alternatives.sql +++ b/data/sql/grid_alternatives.sql @@ -51,9 +51,12 @@ VALUES ('CGG2013an83.byn','ca_nrc_CGG2013an83.tif','CGG2013an83.gtx','GTiff','geoid_like',0,NULL,'https://cdn.proj.org/ca_nrc_CGG2013an83.tif',1,1,NULL), ('CGG2013i08.byn','ca_nrc_CGG2013i08.tif','CGG2013i08.gtx','GTiff','geoid_like',0,NULL,'https://cdn.proj.org/ca_nrc_CGG2013i08.tif',1,1,NULL), ('CGG2013n83.byn','ca_nrc_CGG2013n83.tif','CGG2013n83.gtx','GTiff','geoid_like',0,NULL,'https://cdn.proj.org/ca_nrc_CGG2013n83.tif',1,1,NULL), -('HT2_0.byn','ca_nrc_HT2_2010v70.tif','HT2_2010v70.gtx','GTiff','geoid_like',0,NULL,'https://cdn.proj.org/ca_nrc_HT2_2010v70.tif',1,1,NULL), -- deprecated name. dubious mapping !!! -('HT2_1997.byn','ca_nrc_HT2_2010v70.tif',NULL,'GTiff','geoid_like',0,NULL,'https://cdn.proj.org/ca_nrc_HT2_2010v70.tif',1,1,NULL), -- dubious mapping !!! +('HT2_0.byn','ca_nrc_HT2_1997.tif',NULL,'GTiff','geoid_like',0,NULL,'https://cdn.proj.org/ca_nrc_HT2_1997.tif',1,1,NULL), +('HT2_1997.byn','ca_nrc_HT2_1997.tif',NULL,'GTiff','geoid_like',0,NULL,'https://cdn.proj.org/ca_nrc_HT2_1997.tif',1,1,NULL), +('HT2_2002v70.byn','ca_nrc_HT2_2002v70.tif',NULL,'GTiff','geoid_like',0,NULL,'https://cdn.proj.org/ca_nrc_HT2_2002v70.tif',1,1,NULL), ('HT2_2010v70.byn','ca_nrc_HT2_2010v70.tif','HT2_2010v70.gtx','GTiff','geoid_like',0,NULL,'https://cdn.proj.org/ca_nrc_HT2_2010v70.tif',1,1,NULL), +('HT2_1997_CGG2013a.byn','ca_nrc_HT2_1997_CGG2013a.tif',NULL,'GTiff','vgridshift',0,NULL,'https://cdn.proj.org/ca_nrc_HT2_1997_CGG2013a.tif',1,1,NULL), +('HT2_2002v70_CGG2013a.byn','ca_nrc_HT2_2002v70_CGG2013a.tif',NULL,'GTiff','vgridshift',0,NULL,'https://cdn.proj.org/ca_nrc_HT2_2002v70_CGG2013a.tif',1,1,NULL), ('HT2_2010v70_CGG2013a.byn','ca_nrc_HT2_2010v70_CGG2013a.tif',NULL,'GTiff','vgridshift',0,NULL,'https://cdn.proj.org/ca_nrc_HT2_2010v70_CGG2013a.tif',1,1,NULL), -- the PROJ grid is the reverse way of the EPSG one ('NTv1_0.gsb','ca_nrc_ntv1_can.tif','ntv1_can.dat','GTiff','hgridshift',0,NULL,'https://cdn.proj.org/ca_nrc_ntv1_can.tif',1,1,NULL), diff --git a/test/unit/test_operationfactory.cpp b/test/unit/test_operationfactory.cpp index fa8102ff2b..9b67342a63 100644 --- a/test/unit/test_operationfactory.cpp +++ b/test/unit/test_operationfactory.cpp @@ -5582,7 +5582,7 @@ TEST(operation, compoundCRS_to_compoundCRS_issue_3328) { "+ry=-0.0096500989602704 +rz=-0.0116599432323421 +s=0 " "+convention=coordinate_frame " "+step +inv +proj=cart +ellps=GRS80 " - "+step +inv +proj=vgridshift +grids=ca_nrc_HT2_2010v70.tif " + "+step +inv +proj=vgridshift +grids=ca_nrc_HT2_1997.tif " "+multiplier=1 " "+step +proj=push +v_3 " "+step +proj=cart +ellps=GRS80 "