diff --git a/cmake/ProjTest.cmake b/cmake/ProjTest.cmake
index 5e035917f0..3de3fb4ce1 100644
--- a/cmake/ProjTest.cmake
+++ b/cmake/ProjTest.cmake
@@ -3,10 +3,15 @@
#
function(proj_test_set_properties TESTNAME)
- set_property(TEST ${TESTNAME}
- PROPERTY ENVIRONMENT
- "PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES"
+ set(_env "PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES"
"PROJ_DATA=${PROJ_BINARY_DIR}/data/for_tests")
+ if(TIFF_ENABLED)
+ set(_env ${_env} "TIFF_ENABLED=YES")
+ else()
+ set(_env ${_env} "TIFF_ENABLED=NO")
+ endif()
+ set_property(TEST ${TESTNAME}
+ PROPERTY ENVIRONMENT ${_env})
endfunction()
function(proj_add_test_script_sh SH_NAME BIN_USE)
diff --git a/data/tests/fr_ign_RAGTBT2016.tif b/data/tests/fr_ign_RAGTBT2016.tif
new file mode 100644
index 0000000000..f3479a9aca
Binary files /dev/null and b/data/tests/fr_ign_RAGTBT2016.tif differ
diff --git a/src/4D_api.cpp b/src/4D_api.cpp
index d79fec8fd1..0b47902178 100644
--- a/src/4D_api.cpp
+++ b/src/4D_api.cpp
@@ -328,6 +328,8 @@ int pj_get_suggested_operation(PJ_CONTEXT *,
// the one that has the smallest area
(alt.accuracy == bestAccuracy &&
alt.pseudoArea < opList[iBest].pseudoArea &&
+ !(alt.isUnknownAreaName &&
+ !opList[iBest].isUnknownAreaName) &&
!opList[iBest].isPriorityOp)) &&
!alt.isOffshore)) {
@@ -1693,7 +1695,7 @@ static PJ *add_coord_op_to_list(
int idxInOriginalList, PJ *op, double west_lon, double south_lat,
double east_lon, double north_lat, PJ *pjGeogToSrc, PJ *pjGeogToDst,
const PJ *pjSrcGeocentricToLonLat, const PJ *pjDstGeocentricToLonLat,
- bool isOffshore, std::vector<PJCoordOperation> &altCoordOps) {
+ const char *areaName, std::vector<PJCoordOperation> &altCoordOps) {
/*****************************************************************************/
double minxSrc;
@@ -1742,8 +1744,8 @@ static PJ *add_coord_op_to_list(
const double accuracy = proj_coordoperation_get_accuracy(op->ctx, op);
altCoordOps.emplace_back(
idxInOriginalList, minxSrc, minySrc, maxxSrc, maxySrc, minxDst,
- minyDst, maxxDst, maxyDst, op, name, accuracy, pseudoArea,
- isOffshore, pjSrcGeocentricToLonLat, pjDstGeocentricToLonLat);
+ minyDst, maxxDst, maxyDst, op, name, accuracy, pseudoArea, areaName,
+ pjSrcGeocentricToLonLat, pjDstGeocentricToLonLat);
op = nullptr;
}
return op;
@@ -2018,23 +2020,22 @@ pj_create_prepared_operations(PJ_CONTEXT *ctx, const PJ *source_crs,
north_lat = 90;
}
- const bool isOffshore = areaName && strstr(areaName, "- offshore");
if (west_lon <= east_lon) {
op = add_coord_op_to_list(
i, op, west_lon, south_lat, east_lon, north_lat,
pjGeogToSrc, pjGeogToDst, pjSrcGeocentricToLonLat,
- pjDstGeocentricToLonLat, isOffshore, preparedOpList);
+ pjDstGeocentricToLonLat, areaName, preparedOpList);
} else {
auto op_clone = proj_clone(ctx, op);
op = add_coord_op_to_list(
i, op, west_lon, south_lat, 180, north_lat, pjGeogToSrc,
pjGeogToDst, pjSrcGeocentricToLonLat,
- pjDstGeocentricToLonLat, isOffshore, preparedOpList);
+ pjDstGeocentricToLonLat, areaName, preparedOpList);
op_clone = add_coord_op_to_list(
i, op_clone, -180, south_lat, east_lon, north_lat,
pjGeogToSrc, pjGeogToDst, pjSrcGeocentricToLonLat,
- pjDstGeocentricToLonLat, isOffshore, preparedOpList);
+ pjDstGeocentricToLonLat, areaName, preparedOpList);
proj_destroy(op_clone);
}
@@ -3019,13 +3020,15 @@ PJCoordOperation::PJCoordOperation(
int idxInOriginalListIn, double minxSrcIn, double minySrcIn,
double maxxSrcIn, double maxySrcIn, double minxDstIn, double minyDstIn,
double maxxDstIn, double maxyDstIn, PJ *pjIn, const std::string &nameIn,
- double accuracyIn, double pseudoAreaIn, bool isOffshoreIn,
+ double accuracyIn, double pseudoAreaIn, const char *areaNameIn,
const PJ *pjSrcGeocentricToLonLatIn, const PJ *pjDstGeocentricToLonLatIn)
: idxInOriginalList(idxInOriginalListIn), minxSrc(minxSrcIn),
minySrc(minySrcIn), maxxSrc(maxxSrcIn), maxySrc(maxySrcIn),
minxDst(minxDstIn), minyDst(minyDstIn), maxxDst(maxxDstIn),
maxyDst(maxyDstIn), pj(pjIn), name(nameIn), accuracy(accuracyIn),
- pseudoArea(pseudoAreaIn), isOffshore(isOffshoreIn),
+ pseudoArea(pseudoAreaIn), areaName(areaNameIn ? areaNameIn : ""),
+ isOffshore(areaName.find("- offshore") != std::string::npos),
+ isUnknownAreaName(areaName.empty() || areaName == "unknown"),
isPriorityOp(isSpecialCaseForNAD83_to_NAD83HARN(name) ||
isSpecialCaseForGDA94_to_WGS84(name) ||
isSpecialCaseForWGS84_to_GDA2020(name)),
diff --git a/src/iso19111/c_api.cpp b/src/iso19111/c_api.cpp
index 64da697f8f..c84e829018 100644
--- a/src/iso19111/c_api.cpp
+++ b/src/iso19111/c_api.cpp
@@ -9110,7 +9110,7 @@ PJ *proj_normalize_for_visualization(PJ_CONTEXT *ctx, const PJ *obj) {
alt.idxInOriginalList, minxSrc, minySrc, maxxSrc,
maxySrc, minxDst, minyDst, maxxDst, maxyDst,
pjNormalized, co->nameStr(), alt.accuracy,
- alt.pseudoArea, alt.isOffshore,
+ alt.pseudoArea, alt.areaName.c_str(),
alt.pjSrcGeocentricToLonLat,
alt.pjDstGeocentricToLonLat);
}
diff --git a/src/proj_internal.h b/src/proj_internal.h
index 409b1a5f32..f2a9a9a98b 100644
--- a/src/proj_internal.h
+++ b/src/proj_internal.h
@@ -343,7 +343,9 @@ struct PJCoordOperation {
std::string name{};
double accuracy = -1.0;
double pseudoArea = 0.0;
+ std::string areaName{};
bool isOffshore = false;
+ bool isUnknownAreaName = false;
bool isPriorityOp = false;
bool srcIsLonLatDegree = false;
bool srcIsLatLonDegree = false;
@@ -364,8 +366,8 @@ struct PJCoordOperation {
double minySrcIn, double maxxSrcIn, double maxySrcIn,
double minxDstIn, double minyDstIn, double maxxDstIn,
double maxyDstIn, PJ *pjIn, const std::string &nameIn,
- double accuracyIn, double pseudoAreaIn, bool isOffshoreIn,
- const PJ *pjSrcGeocentricToLonLatIn,
+ double accuracyIn, double pseudoAreaIn,
+ const char *areaName, const PJ *pjSrcGeocentricToLonLatIn,
const PJ *pjDstGeocentricToLonLatIn);
PJCoordOperation(const PJCoordOperation &) = delete;
@@ -377,7 +379,9 @@ struct PJCoordOperation {
minyDst(other.minyDst), maxxDst(other.maxxDst),
maxyDst(other.maxyDst), pj(proj_clone(ctx, other.pj)),
name(std::move(other.name)), accuracy(other.accuracy),
- pseudoArea(other.pseudoArea), isOffshore(other.isOffshore),
+ pseudoArea(other.pseudoArea), areaName(other.areaName),
+ isOffshore(other.isOffshore),
+ isUnknownAreaName(other.isUnknownAreaName),
isPriorityOp(other.isPriorityOp),
srcIsLonLatDegree(other.srcIsLonLatDegree),
srcIsLatLonDegree(other.srcIsLatLonDegree),
@@ -399,7 +403,9 @@ struct PJCoordOperation {
minyDst(other.minyDst), maxxDst(other.maxxDst),
maxyDst(other.maxyDst), name(std::move(other.name)),
accuracy(other.accuracy), pseudoArea(other.pseudoArea),
- isOffshore(other.isOffshore), isPriorityOp(other.isPriorityOp),
+ areaName(std::move(other.areaName)), isOffshore(other.isOffshore),
+ isUnknownAreaName(other.isUnknownAreaName),
+ isPriorityOp(other.isPriorityOp),
srcIsLonLatDegree(other.srcIsLonLatDegree),
srcIsLatLonDegree(other.srcIsLatLonDegree),
dstIsLonLatDegree(other.dstIsLonLatDegree),
@@ -422,7 +428,7 @@ struct PJCoordOperation {
maxxDst == other.maxxDst && maxyDst == other.maxyDst &&
name == other.name &&
proj_is_equivalent_to(pj, other.pj, PJ_COMP_STRICT) &&
- accuracy == other.accuracy && isOffshore == other.isOffshore;
+ accuracy == other.accuracy && areaName == other.areaName;
}
bool operator!=(const PJCoordOperation &other) const {
diff --git a/test/cli/testvarious b/test/cli/testvarious
index 2d6701c3ab..38c5a75686 100755
--- a/test/cli/testvarious
+++ b/test/cli/testvarious
@@ -1338,6 +1338,17 @@ $EXE -d 3 EPSG:3912+EPSG:5779 EPSG:3794+EPSG:8690 -E >>${OUT} 2>&1 <<EOF
477134.28 95134.21 5
EOF
+echo "##############################################################" >> ${OUT}
+echo "Test cs2cs EPSG:5488 (RGAF09) to EPSG:4559+5757 (RRAF 1991 / UTM zone 20N + Guadeloupe 1988 height)" >> ${OUT}
+echo "Check that we use the horizontal transformation for Guadeloupe (RRAF 1991 to RGAF09 (2)), and not the one for Martinique" >> ${OUT}
+#
+if test "${TIFF_ENABLED}" = "yes"; then
+PROJ_DATA=${PROJ_DATA}:${PROJ_DATA}/tests $EXE -d 3 EPSG:5488 EPSG:4559+5757 >> ${OUT} <<EOF
+16.248285304 -61.484212843 53.073
+EOF
+else
+printf "661991.318\t1796999.201 93.846" >> ${OUT}
+fi
# Done!
# do 'diff' with distribution results
diff --git a/test/cli/tv_out.dist b/test/cli/tv_out.dist
index 3fc3cc1f0c..b2418c52f5 100644
--- a/test/cli/tv_out.dist
+++ b/test/cli/tv_out.dist
@@ -640,3 +640,7 @@ Test inverse of Similarity Transformation (example from EPSG Guidance Note 7.2)
Test Similarity Transformation through CompoundCRS
477134.28 95134.21 476763.303 95620.222 0.000
477134.28 95134.21 5 476763.303 95620.222 5.000
+##############################################################
+Test cs2cs EPSG:5488 (RGAF09) to EPSG:4559+5757 (RRAF 1991 / UTM zone 20N + Guadeloupe 1988 height)
+Check that we use the horizontal transformation for Guadeloupe (RRAF 1991 to RGAF09 (2)), and not the one for Martinique
+661991.318 1796999.201 93.846