Database query: add AuthorityFactory::ObjectType::DYNAMIC_GEODETIC_REFERENCE_FRAME and DYNAMIC_VERTICAL_REFERENCE_FRAME, and make corresponding C API work

2 files changed, 66 insertions, 0 deletions

diff --git a/test/unit/test_c_api.cpp b/test/unit/test_c_api.cpp
index bd59e2bf..c7053291 100644
--- a/test/unit/test_c_api.cpp
+++ b/test/unit/test_c_api.cpp
@@ -845,6 +845,24 @@ TEST_F(CApi, proj_create_from_database) {
         EXPECT_EQ(proj_get_type(datum), PJ_TYPE_GEODETIC_REFERENCE_FRAME);
     }
     {
+        // International Terrestrial Reference Frame 2008
+        auto datum = proj_create_from_database(
+            m_ctxt, "EPSG", "1061", PJ_CATEGORY_DATUM, false, nullptr);
+        ASSERT_NE(datum, nullptr);
+        ObjectKeeper keeper(datum);
+        EXPECT_EQ(proj_get_type(datum),
+                  PJ_TYPE_DYNAMIC_GEODETIC_REFERENCE_FRAME);
+    }
+    {
+        // Norway Normal Null 2000
+        auto datum = proj_create_from_database(
+            m_ctxt, "EPSG", "1096", PJ_CATEGORY_DATUM, false, nullptr);
+        ASSERT_NE(datum, nullptr);
+        ObjectKeeper keeper(datum);
+        EXPECT_EQ(proj_get_type(datum),
+                  PJ_TYPE_DYNAMIC_VERTICAL_REFERENCE_FRAME);
+    }
+    {
         auto op = proj_create_from_database(m_ctxt, "EPSG", "16031",
                                             PJ_CATEGORY_COORDINATE_OPERATION,
                                             false, nullptr);
@@ -1197,6 +1215,14 @@ TEST_F(CApi, proj_get_codes_from_database) {
         } else {
             ASSERT_NE(list, nullptr) << type;
             ASSERT_NE(list[0], nullptr) << type;
+            if (type == PJ_TYPE_DYNAMIC_GEODETIC_REFERENCE_FRAME ||
+                type == PJ_TYPE_DYNAMIC_VERTICAL_REFERENCE_FRAME) {
+                auto obj = proj_create_from_database(
+                    m_ctxt, "EPSG", list[0], PJ_CATEGORY_DATUM, false, nullptr);
+                ASSERT_NE(obj, nullptr);
+                ObjectKeeper keeper(obj);
+                EXPECT_EQ(proj_get_type(obj), type) << type << " " << list[0];
+            }
         }
     }
 }
diff --git a/test/unit/test_factory.cpp b/test/unit/test_factory.cpp
index 366e3d9b..2a9d2bd2 100644
--- a/test/unit/test_factory.cpp
+++ b/test/unit/test_factory.cpp
@@ -1337,11 +1337,29 @@ TEST(factory, AuthorityFactory_getAuthorityCodes) {
         ASSERT_TRUE(!setGeodeticDatum.empty());
         factory->createGeodeticDatum(*(setGeodeticDatum.begin()));
 
+        auto setDynamicGeodeticDatum = factory->getAuthorityCodes(
+            AuthorityFactory::ObjectType::DYNAMIC_GEODETIC_REFERENCE_FRAME);
+        ASSERT_TRUE(!setDynamicGeodeticDatum.empty());
+        auto dgrf =
+            factory->createGeodeticDatum(*(setDynamicGeodeticDatum.begin()));
+        EXPECT_TRUE(dynamic_cast<DynamicGeodeticReferenceFrame *>(dgrf.get()) !=
+                    nullptr);
+        EXPECT_LT(setDynamicGeodeticDatum.size(), setGeodeticDatum.size());
+
         auto setVerticalDatum = factory->getAuthorityCodes(
             AuthorityFactory::ObjectType::VERTICAL_REFERENCE_FRAME);
         ASSERT_TRUE(!setVerticalDatum.empty());
         factory->createVerticalDatum(*(setVerticalDatum.begin()));
 
+        auto setDynamicVerticalDatum = factory->getAuthorityCodes(
+            AuthorityFactory::ObjectType::DYNAMIC_VERTICAL_REFERENCE_FRAME);
+        ASSERT_TRUE(!setDynamicVerticalDatum.empty());
+        auto dvrf =
+            factory->createVerticalDatum(*(setDynamicVerticalDatum.begin()));
+        EXPECT_TRUE(dynamic_cast<DynamicVerticalReferenceFrame *>(dvrf.get()) !=
+                    nullptr);
+        EXPECT_LT(setDynamicVerticalDatum.size(), setVerticalDatum.size());
+
         std::set<std::string> setMerged;
         for (const auto &v : setGeodeticDatum) {
             setMerged.insert(v);
@@ -3128,12 +3146,34 @@ TEST(factory, createObjectsFromName) {
             .size(),
         1U);
 
+    // Dynamic Geodetic datum
+    EXPECT_EQ(factoryEPSG
+                  ->createObjectsFromName(
+                      "International Terrestrial Reference Frame 2008",
+                      {AuthorityFactory::ObjectType::
+                           DYNAMIC_GEODETIC_REFERENCE_FRAME},
+                      false, 2)
+                  .size(),
+              1U);
+
+    // Dynamic Vertical datum
+    EXPECT_EQ(
+        factoryEPSG
+            ->createObjectsFromName("Norway Normal Null 2000",
+                                    {AuthorityFactory::ObjectType::
+                                         DYNAMIC_VERTICAL_REFERENCE_FRAME},
+                                    false, 2)
+            .size(),
+        1U);
+
     const auto types = std::vector<AuthorityFactory::ObjectType>{
         AuthorityFactory::ObjectType::PRIME_MERIDIAN,
         AuthorityFactory::ObjectType::ELLIPSOID,
         AuthorityFactory::ObjectType::DATUM,
         AuthorityFactory::ObjectType::GEODETIC_REFERENCE_FRAME,
+        AuthorityFactory::ObjectType::DYNAMIC_GEODETIC_REFERENCE_FRAME,
         AuthorityFactory::ObjectType::VERTICAL_REFERENCE_FRAME,
+        AuthorityFactory::ObjectType::DYNAMIC_VERTICAL_REFERENCE_FRAME,
         AuthorityFactory::ObjectType::CRS,
         AuthorityFactory::ObjectType::GEODETIC_CRS,
         AuthorityFactory::ObjectType::GEOCENTRIC_CRS,