From 0d3d2cede31f8c18f5ae355db6a6b4e15a4620d2 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Tue, 20 Nov 2018 12:28:20 +0100 Subject: Database: use official IGNF.xml registry to create content from the IGNF authority Up to now, we re-processed the data/IGNF PROJ.4 definition to ingest it into proj.db, but this file originally come from a processing of IGNF.xml ( http://librairies.ign.fr/geoportail/resources/IGNF.xml ) The end result is not strictly equivalent, as data/IGNF has some 'magic' to create towgs84 / nadgrids, since IGNF.xml doesn't necessary contain all transformations from its geodetic systems to WGS84. I've tried to re-add some of those missing transforms (null Helmert transforms), so it can be used for pivoting, but that might be incomplete. --- test/unit/test_crs.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'test/unit/test_crs.cpp') diff --git a/test/unit/test_crs.cpp b/test/unit/test_crs.cpp index 84be1b22..55df5875 100644 --- a/test/unit/test_crs.cpp +++ b/test/unit/test_crs.cpp @@ -4604,14 +4604,14 @@ TEST(crs, crs_createBoundCRSToWGS84IfPossible) { PROJStringFormatter::create( PROJStringFormatter::Convention::PROJ_4) .get()), - "+proj=stere +lat_0=-90 +lat_ts=-67 +lon_0=140 +x_0=300000 " - "+y_0=-2299363.482 +ellps=intl " - "+towgs84=324.912,153.282,172.026,0,0,0,0 +units=m +no_defs"); + "+proj=stere +lat_0=-90 +lon_0=140 +k=0.960272946 " + "+x_0=300000 +y_0=-2299363.482 +ellps=intl " + "+towgs84=324.8,153.6,172.1,0,0,0,0 +units=m +no_defs"); } { auto factoryIGNF = AuthorityFactory::create(DatabaseContext::create(), "IGNF"); - auto crs = factoryIGNF->createCoordinateReferenceSystem("AMST63"); + auto crs = factoryIGNF->createCoordinateReferenceSystem("PGP50"); auto bound = crs->createBoundCRSToWGS84IfPossible(dbContext); EXPECT_NE(bound, crs); auto boundCRS = nn_dynamic_pointer_cast(bound); @@ -4621,8 +4621,7 @@ TEST(crs, crs_createBoundCRSToWGS84IfPossible) { PROJStringFormatter::Convention::PROJ_4) .get()), "+proj=geocent +ellps=intl " - "+towgs84=109.753,-528.133,-362.244,0,0,0,0 +units=m " - "+no_defs"); + "+towgs84=324.8,153.6,172.1,0,0,0,0 +units=m +no_defs"); } } -- cgit v1.2.3