Adjust previous commits

Author: rouault

scripts/build_db.py

@@ -1166,6 +1166,9 @@ def fill_alias(proj_db_cursor):
     proj_db_cursor.execute("SELECT DISTINCT object_code, alias, coord_op_name FROM epsg.epsg_alias, epsg.epsg_coordoperation ON coord_op_code = object_code WHERE object_table_name = 'epsg_coordoperation' AND epsg_coordoperation.deprecated = 0")
     for row in proj_db_cursor.fetchall():
         code, alt_name, new_name = row
+        # We could potentially ingest all records, but the only use of them for
+        # now is to workaround effects of the creation of national ETRS89-XXX
+        # datums. See https://github.com/OSGeo/PROJ/pull/4736 for more details
         if "ETRS89" not in alt_name:
             # print('Ignoring alias %s for coordinate operation %s %s' % (alt_name, code, new_name))
             continue

src/iso19111/operation/coordinateoperationfactory.cpp

@@ -4280,8 +4280,7 @@ bool CoordinateOperationFactory::Private::createOperationsFromDatabase(
     // "MGI to ETRS89 (8)" operation, that is now "MGI to ETRS89-AUT [2002] (8)"
     const bool srcIsETRS89 = sourceCRS->nameStr() == "ETRS89";
     const bool dstIsETRS89 = targetCRS->nameStr() == "ETRS89";
-    if (geodSrc && geodDst && (srcIsETRS89 || dstIsETRS89) &&
-        !(srcIsETRS89 && dstIsETRS89)) {
+    if (geodSrc && geodDst && (srcIsETRS89 != dstIsETRS89)) {
         const auto &authFactory = context.context->getAuthorityFactory();
         const auto gridAvailabilityUse =
             context.context->getGridAvailabilityUse();