From f9d034afb73f3d5f08976ee9692f7a7c8eb09abf Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Tue, 20 Apr 2021 00:23:44 +0200 Subject: Revert "proj_create_crs_to_crs_from_pj(): do not use PROJ_SPATIAL_CRITERION_PARTIAL_INTERSECTION if area is specified" This reverts commit ebe3425bf66287e004958eb53976d3837f88b9e1. It was found to break gdalwarp usage in https://github.com/OSGeo/gdal/issues/3695 when passing a bbox that is quite large. --- src/4D_api.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/4D_api.cpp') 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) ? -- cgit v1.2.3