aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2021-04-20 11:20:16 +0200
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2021-04-20 09:23:49 +0000
commit3d75435aa978588cf929a57286a2ae13d8ea128c (patch)
tree6307a5cdaa04ede9aa3624df03a025ebe7e85513 /src
parentcedc9789a1bd93e7ce919f99ed8914a9dd18b2a5 (diff)
downloadPROJ-3d75435aa978588cf929a57286a2ae13d8ea128c.tar.gz
PROJ-3d75435aa978588cf929a57286a2ae13d8ea128c.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')
-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 cbcb479a..84f7d27c 100644
--- a/src/4D_api.cpp
+++ b/src/4D_api.cpp
@@ -1350,11 +1350,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) ?