extra fixes

Author: rouault

data/CMakeLists.txt

@@ -31,7 +31,7 @@ set(ALL_SQL_IN "${CMAKE_CURRENT_BINARY_DIR}/all.sql.in")
 set(PROJ_DB "${CMAKE_CURRENT_BINARY_DIR}/proj.db")
 include(sql_filelist.cmake)
 
-set(PROJ_DB_SQL_EXPECTED_MD5 "955183e53b96c40a87212b7466396cb8")
+set(PROJ_DB_SQL_EXPECTED_MD5 "497ccd15dc1072dce88a5bdc2856d307")
 
 add_custom_command(
   OUTPUT ${PROJ_DB}

src/iso19111/factory.cpp

@@ -4521,6 +4521,10 @@ AuthorityFactory::createObject(const std::string &code) const {
         return util::nn_static_pointer_cast<util::BaseObject>(
             createProjectedCRS(code));
     }
+    if (table_name == "derived_projected_crs") {
+        return util::nn_static_pointer_cast<util::BaseObject>(
+            createDerivedProjectedCRS(code));
+    }
     if (table_name == "compound_crs") {
         return util::nn_static_pointer_cast<util::BaseObject>(
             createCompoundCRS(code));
@@ -9037,6 +9041,7 @@ std::list<AuthorityFactory::CRSInfo> AuthorityFactory::getCRSInfoList() const {
         sql += "WHERE c.auth_name = ? ";
         params.emplace_back(d->authority());
     }
+    // FIXME: we can't handle non-EARTH compound CRS for now
     sql += "UNION ALL SELECT c.auth_name, c.code, c.name, 'derived projected', "
            "c.deprecated, "
            "a.west_lon, a.south_lat, a.east_lon, a.north_lat, "
@@ -9382,10 +9387,10 @@ AuthorityFactory::createObjectsFromNameEx(
             for (const auto &tableName :
                  {"prime_meridian", "ellipsoid", "geodetic_datum",
                   "vertical_datum", "engineering_datum", "geodetic_crs",
-                  "projected_crs", "vertical_crs", "compound_crs",
-                  "engineering_crs", "conversion", "helmert_transformation",
-                  "grid_transformation", "other_transformation",
-                  "concatenated_operation"}) {
+                  "projected_crs", "derived_projected_crs", "vertical_crs",
+                  "compound_crs", "engineering_crs", "conversion",
+                  "helmert_transformation", "grid_transformation",
+                  "other_transformation", "concatenated_operation"}) {
                 if (!(startsWithDUnderscore &&
                       strcmp(tableName, "vertical_datum") == 0)) {
                     res.emplace_back(TableType(tableName, std::string()));
@@ -9438,6 +9443,8 @@ AuthorityFactory::createObjectsFromNameEx(
                     res.emplace_back(TableType("compound_crs", std::string()));
                     res.emplace_back(
                         TableType("engineering_crs", std::string()));
+                    res.emplace_back(
+                        TableType("derived_projected_crs", std::string()));
                     break;
                 case ObjectType::GEODETIC_CRS:
                     res.emplace_back(TableType("geodetic_crs", std::string()));
@@ -9458,6 +9465,10 @@ AuthorityFactory::createObjectsFromNameEx(
                 case ObjectType::PROJECTED_CRS:
                     res.emplace_back(TableType("projected_crs", std::string()));
                     break;
+                case ObjectType::DERIVED_PROJECTED_CRS:
+                    res.emplace_back(
+                        TableType("derived_projected_crs", std::string()));
+                    break;
                 case ObjectType::VERTICAL_CRS:
                     res.emplace_back(TableType("vertical_crs", std::string()));
                     break;

test/cli/test_projinfo.yaml

@@ -1732,7 +1732,7 @@ tests:
   tail: 4
   out: |
     INSERT INTO metadata VALUES('DATABASE.LAYOUT.VERSION.MAJOR',1);
-    INSERT INTO metadata VALUES('DATABASE.LAYOUT.VERSION.MINOR',6);
+    INSERT INTO metadata VALUES('DATABASE.LAYOUT.VERSION.MINOR',7);
     INSERT INTO geodetic_crs VALUES('HOBU','XXXX','WGS 84','','geographic 2D','EPSG','6422','EPSG','6326',NULL,0);
     INSERT INTO usage VALUES('HOBU','USAGE_GEODETIC_CRS_XXXX','geodetic_crs','HOBU','XXXX','EPSG','1262','EPSG','1183');
 - args: -s EPSG:23030 -t EPSG:25830 --bbox -6,40,-5,41 --grid-check known_available --hide-ballpark --summary