aboutsummaryrefslogtreecommitdiff
path: root/src/4D_api.cpp
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2021-04-20 11:20:16 +0200
committerGitHub <noreply@github.com>2021-04-20 11:20:16 +0200
commit8d0c7cef4b5e9687382519400380847587edc6cb (patch)
tree5eab068c02e4ba45336c36885c86beda90dd19db /src/4D_api.cpp
parentbd1d3d9a790266092dbbe3e440ebb00e2e25b700 (diff)
parentf9d034afb73f3d5f08976ee9692f7a7c8eb09abf (diff)
downloadPROJ-8d0c7cef4b5e9687382519400380847587edc6cb.tar.gz
PROJ-8d0c7cef4b5e9687382519400380847587edc6cb.zip
Merge pull request #2678 from rouault/revert_ebe3425bf
Revert "proj_create_crs_to_crs_from_pj(): do not use PROJ_SPATIAL_CRITERION_PARTIAL_INTERSECTION if area is specified"
Diffstat (limited to 'src/4D_api.cpp')
-rw-r--r--src/4D_api.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/4D_api.cpp b/src/4D_api.cpp
index 45f1f59e..8b676f9b 100644
--- a/src/4D_api.cpp
+++ b/src/4D_api.cpp
@@ -1358,11 +1358,9 @@ PJ *proj_create_crs_to_crs_from_pj (PJ_CONTEXT *ctx, const PJ *source_crs, cons
area->east_lon_degree,
area->north_lat_degree);
}
- else {
- proj_operation_factory_context_set_spatial_criterion(
- ctx, operation_ctx, PROJ_SPATIAL_CRITERION_PARTIAL_INTERSECTION);
- }
+ proj_operation_factory_context_set_spatial_criterion(
+ ctx, operation_ctx, PROJ_SPATIAL_CRITERION_PARTIAL_INTERSECTION);
proj_operation_factory_context_set_grid_availability_use(
ctx, operation_ctx,
proj_context_is_network_enabled(ctx) ?