Merge pull request #1368 from rouault/epsg_961_and_operationversion

Database: update to EPSG v9.6.1, IGNF v3.0.3, ESRI 10.7.0 and add operation_version column

2 files changed, 31 insertions, 22 deletions

diff --git a/test/cli/testprojinfo_out.dist b/test/cli/testprojinfo_out.dist
index eaa10689..8698d6c1 100644
--- a/test/cli/testprojinfo_out.dist
+++ b/test/cli/testprojinfo_out.dist
@@ -442,6 +442,7 @@ PROJ string:
 
 WKT2_2018 string:
 COORDINATEOPERATION["NAD27 to NAD83 (5)",
+    VERSION["SGQ-Can QC NT1"],
     SOURCECRS[
         GEOGCRS["NAD27",
             DATUM["North American Datum 1927",
@@ -492,6 +493,7 @@ PROJ string:
 
 WKT2_2018 string:
 COORDINATEOPERATION["NAD27 to NAD83 (6)",
+    VERSION["SGQ-Can QC NT2"],
     SOURCECRS[
         GEOGCRS["NAD27",
             DATUM["North American Datum 1927",
@@ -760,18 +762,18 @@ Candidate operations found: 3
 -------------------------------------
 Operation n°1:
 
-INVERSE(DERIVED_FROM(EPSG)):8371, Inverse of RGF93 to NGF IGN69 height (2), 0.02 m, France - mainland onshore
+INVERSE(DERIVED_FROM(EPSG)):8885, Inverse of RGF93 to NGF IGN69 height (3), 0.01 m, France - mainland onshore
 
 PROJ string:
-+proj=vgridshift +grids=RAF09.gtx +multiplier=1
++proj=vgridshift +grids=RAF18.gtx +multiplier=1
 
 -------------------------------------
 Operation n°2:
 
-INVERSE(EPSG):8885, Inverse of RGF93 to NGF IGN69 height (3), 0.01 m, France - mainland onshore
+INVERSE(DERIVED_FROM(EPSG)):8371, Inverse of RGF93 to NGF IGN69 height (2), 0.02 m, France - mainland onshore
 
 PROJ string:
-+proj=pipeline +step +inv +proj=vgridshift +grids=RAF18.tac +multiplier=1
++proj=vgridshift +grids=RAF09.gtx +multiplier=1
 
 -------------------------------------
 Operation n°3:
diff --git a/test/unit/test_factory.cpp b/test/unit/test_factory.cpp
index f4c560d5..1ceef475 100644
--- a/test/unit/test_factory.cpp
+++ b/test/unit/test_factory.cpp
@@ -150,7 +150,8 @@ TEST(factory, AuthorityFactory_createPrimeMeridian) {
     EXPECT_THROW(factory->createPrimeMeridian("-1"),
                  NoSuchAuthorityCodeException);
     EXPECT_TRUE(nn_dynamic_pointer_cast<PrimeMeridian>(
-                    factory->createObject("8903")) != nullptr);
+                    AuthorityFactory::create(DatabaseContext::create(), "ESRI")
+                        ->createObject("108900")) != nullptr);
     auto pm = factory->createPrimeMeridian("8903");
     ASSERT_EQ(pm->identifiers().size(), 1U);
     EXPECT_EQ(pm->identifiers()[0]->code(), "8903");
@@ -717,6 +718,7 @@ TEST(factory, AuthorityFactory_createCoordinateOperation_helmert_15_CF) {
     auto op = factory->createCoordinateOperation("6276", false);
     auto expected =
         "COORDINATEOPERATION[\"ITRF2008 to GDA94 (1)\",\n"
+        "    VERSION[\"GA-Aus 2010\"],\n"
         "    SOURCECRS[\n"
         "        GEODCRS[\"ITRF2008\",\n"
         "            DATUM[\"International Terrestrial Reference Frame "
@@ -874,6 +876,7 @@ TEST(
     auto op = factory->createCoordinateOperation("1295", false);
     auto expected =
         "COORDINATEOPERATION[\"RGNC91-93 to NEA74 Noumea (4)\",\n"
+        "    VERSION[\"ESRI-Ncl 0.05m\"],\n"
         "    SOURCECRS[\n"
         "        GEOGCRS[\"RGNC91-93\",\n"
         "            DATUM[\"Reseau Geodesique de Nouvelle Caledonie 91-93\",\n"
@@ -943,6 +946,7 @@ TEST(factory, AuthorityFactory_createCoordinateOperation_other_transformation) {
     auto op = factory->createCoordinateOperation("1884", false);
     auto expected =
         "COORDINATEOPERATION[\"S-JTSK (Ferro) to S-JTSK (1)\",\n"
+        "    VERSION[\"EPSG-Cze\"],\n"
         "    SOURCECRS[\n"
         "        GEOGCRS[\"S-JTSK (Ferro)\",\n"
         "            DATUM[\"System of the Unified Trigonometrical Cadastral "
@@ -1471,7 +1475,7 @@ class FactoryWithTmpDatabase : public ::testing::Test {
             "'EPSG','4326','EPSG','1262',44.0,-143."
             "0,-90.0,-294.0,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,"
             "NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,"
-            "NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);"))
+            "NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);"))
             << last_error();
 
         ASSERT_TRUE(execute(
@@ -1480,7 +1484,8 @@ class FactoryWithTmpDatabase : public ::testing::Test {
             "'EPSG','9615'"
             ",'NTv2','EPSG','4326','EPSG','4326','EPSG','1262',1.0,'EPSG','"
             "8656','Latitude and longitude difference "
-            "file','nzgd2kgrid0005.gsb',NULL,NULL,NULL,NULL,NULL,NULL,0);"))
+            "file','nzgd2kgrid0005.gsb',NULL,NULL,NULL,NULL,NULL,NULL,NULL,"
+            "0);"))
             << last_error();
 
         ASSERT_TRUE(execute(
@@ -1497,7 +1502,7 @@ class FactoryWithTmpDatabase : public ::testing::Test {
             "offset',-17.4,'EPSG','9110',NULL,NULL,NULL,NULL,NULL,NULL,"
             "NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,"
             "NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,"
-            "NULL,NULL,NULL,NULL,NULL,NULL,0);"))
+            "NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);"))
             << last_error();
 
         ASSERT_TRUE(execute(
@@ -1505,7 +1510,7 @@ class FactoryWithTmpDatabase : public ::testing::Test {
             "VALUES('EPSG','DUMMY_CONCATENATED','name',NULL,NULL,"
             "'EPSG','4326','EPSG'"
             ",'4326','EPSG','1262',NULL,'EPSG','DUMMY_OTHER_TRANSFORMATION'"
-            ",'EPSG','DUMMY_OTHER_TRANSFORMATION',NULL,NULL,0);"))
+            ",'EPSG','DUMMY_OTHER_TRANSFORMATION',NULL,NULL,NULL,0);"))
             << last_error();
     }
 
@@ -1536,7 +1541,7 @@ class FactoryWithTmpDatabase : public ::testing::Test {
             "','EPSG'"
             ",'1262',1.0,0,0,0,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,"
             "NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,"
-            "NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);"))
+            "NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);"))
             << last_error();
     }
 
@@ -1844,7 +1849,7 @@ TEST_F(FactoryWithTmpDatabase,
         "'EPSG','9615'"
         ",'NTv2','EPSG','4326','OTHER','OTHER_4326','EPSG','1262',1.0,'EPSG','"
         "8656','Latitude and longitude difference "
-        "file','nzgd2kgrid0005.gsb',NULL,NULL,NULL,NULL,NULL,NULL,0);"))
+        "file','nzgd2kgrid0005.gsb',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);"))
         << last_error();
     {
         auto res = factoryGeneral->createFromCoordinateReferenceSystemCodes(
@@ -1876,7 +1881,7 @@ TEST_F(FactoryWithTmpDatabase,
         "'EPSG','9615'"
         ",'NTv2','EPSG','4326','EPSG','4326','EPSG','1262',10.0,'EPSG','"
         "8656','Latitude and longitude difference "
-        "file','nzgd2kgrid0005.gsb',NULL,NULL,NULL,NULL,NULL,NULL,0);"))
+        "file','nzgd2kgrid0005.gsb',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);"))
         << last_error();
 
     ASSERT_TRUE(
@@ -1885,7 +1890,8 @@ TEST_F(FactoryWithTmpDatabase,
                 "TRANSFORMATION_1M_SMALL_EXTENT',NULL,NULL,'EPSG','9615'"
                 ",'NTv2','EPSG','4326','EPSG','4326','EPSG','2060',1.0,'EPSG','"
                 "8656','Latitude and longitude difference "
-                "file','nzgd2kgrid0005.gsb',NULL,NULL,NULL,NULL,NULL,NULL,0);"))
+                "file','nzgd2kgrid0005.gsb',NULL,NULL,NULL,NULL,NULL,NULL,"
+                "NULL,0);"))
         << last_error();
 
     ASSERT_TRUE(execute(
@@ -1894,7 +1900,7 @@ TEST_F(FactoryWithTmpDatabase,
         "'EPSG','9615'"
         ",'NTv2','EPSG','4326','EPSG','4326','EPSG','1262',1.0,'EPSG','"
         "8656','Latitude and longitude difference "
-        "file','nzgd2kgrid0005.gsb',NULL,NULL,NULL,NULL,NULL,NULL,0);"))
+        "file','nzgd2kgrid0005.gsb',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);"))
         << last_error();
 
     ASSERT_TRUE(
@@ -1903,7 +1909,8 @@ TEST_F(FactoryWithTmpDatabase,
                 "TRANSFORMATION_0.5M_DEPRECATED',NULL,NULL,'EPSG','9615'"
                 ",'NTv2','EPSG','4326','EPSG','4326','EPSG','1262',1.0,'EPSG','"
                 "8656','Latitude and longitude difference "
-                "file','nzgd2kgrid0005.gsb',NULL,NULL,NULL,NULL,NULL,NULL,1);"))
+                "file','nzgd2kgrid0005.gsb',NULL,NULL,NULL,NULL,NULL,NULL,"
+                "NULL,1);"))
         << last_error();
 
     auto factoryOTHER =
@@ -2006,7 +2013,7 @@ TEST_F(FactoryWithTmpDatabase, AuthorityFactory_proj_based_transformation) {
         "NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,"
         "NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,"
         "NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,"
-        "NULL,NULL,NULL,NULL,NULL,NULL,0);"))
+        "NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);"))
         << last_error();
 
     auto factoryOTHER =
@@ -2067,7 +2074,7 @@ TEST_F(FactoryWithTmpDatabase, AuthorityFactory_wkt_based_transformation) {
                 "NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,"
                 "NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,"
                 "NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,"
-                "NULL,NULL,NULL,NULL,NULL,NULL,0);"))
+                "NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);"))
         << last_error();
 
     auto factoryOTHER =
@@ -2102,7 +2109,7 @@ TEST_F(FactoryWithTmpDatabase,
                 "NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,"
                 "NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,"
                 "NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,"
-                "NULL,NULL,NULL,NULL,NULL,NULL,0);"))
+                "NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);"))
         << last_error();
 
     auto factoryOTHER =
@@ -2129,7 +2136,7 @@ TEST_F(FactoryWithTmpDatabase,
                 "NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,"
                 "NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,"
                 "NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,"
-                "NULL,NULL,NULL,NULL,NULL,NULL,0);"))
+                "NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);"))
         << last_error();
 
     auto factoryOTHER =
@@ -2619,7 +2626,7 @@ TEST_F(FactoryWithTmpDatabase,
                 "NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,"
                 "NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,"
                 "NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,"
-                "NULL,NULL,NULL,NULL,NULL,NULL,0);"))
+                "NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);"))
         << last_error();
 
     ASSERT_TRUE(
@@ -2631,7 +2638,7 @@ TEST_F(FactoryWithTmpDatabase,
                 "NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,"
                 "NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,"
                 "NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,"
-                "NULL,NULL,NULL,NULL,NULL,NULL,0);"))
+                "NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);"))
         << last_error();
 
     auto dbContext = DatabaseContext::create(m_ctxt);
@@ -2798,7 +2805,7 @@ TEST(factory, getMetadata) {
     EXPECT_EQ(ctxt->getMetadata("i_do_not_exist"), nullptr);
     const char *IGNF_VERSION = ctxt->getMetadata("IGNF.VERSION");
     ASSERT_TRUE(IGNF_VERSION != nullptr);
-    EXPECT_EQ(std::string(IGNF_VERSION), "3.0.2");
+    EXPECT_EQ(std::string(IGNF_VERSION), "3.0.3");
 }
 
 // ---------------------------------------------------------------------------