pj_get_suggested_operation(): tune so that NADCON5 grid is used for N…

…AD27->NAD83 on CONUS
OSGeo · Dec 15, 2022 · 66a97e0 · 66a97e0
1 parent 785f6d7
commit 66a97e0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/4D_api.cpp b/src/4D_api.cpp
@@ -258,10 +258,10 @@ int pj_get_suggested_operation(PJ_CONTEXT*,
                  // If two operations have the same accuracy, use the one that
                  // is contained within a larger one
                  (alt.accuracy == bestAccuracy &&
-                  alt.minxSrc > opList[iBest].minxSrc &&
-                  alt.minySrc > opList[iBest].minySrc &&
-                  alt.maxxSrc < opList[iBest].maxxSrc &&
-                  alt.maxySrc < opList[iBest].maxySrc &&
+                  alt.minxSrc >= opList[iBest].minxSrc &&
+                  alt.minySrc >= opList[iBest].minySrc &&
+                  alt.maxxSrc <= opList[iBest].maxxSrc &&
+                  alt.maxySrc <= opList[iBest].maxySrc &&
                   !isSpecialCaseForNAD83_to_NAD83HARN(opList[iBest]))) &&
                 !alt.isOffshore) ) {
                 iBest = i;

diff --git a/test/unit/test_c_api.cpp b/test/unit/test_c_api.cpp
@@ -1747,8 +1747,8 @@ TEST_F(CApi, proj_create_operations) {
         auto op = proj_list_get(m_ctxt, res, idx);
         ASSERT_NE(op, nullptr);
         ObjectKeeper keeper_op(op);
-        // Transformation for USA
-        EXPECT_EQ(proj_get_name(op), std::string("NAD27 to NAD83 (1)"));
+        // Transformation for USA, using NADCON5
+        EXPECT_EQ(proj_get_name(op), std::string("NAD27 to NAD83 (7)"));
     }
 
     {