Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Repeat transformation if extent is extreme #5360

Merged
merged 1 commit into from
Nov 13, 2017
Merged

Repeat transformation if extent is extreme #5360

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Repeat transformation if extent is extreme 
Repeat transformation for a rectangle interior to the output requested region. If the latter results in a more extreme y extent, then extend extents in source layer projection to southern/northing bounds and entire x extent. This fix resolves issue #4864.
  • Loading branch information
@dshorthouse
dshorthouse committed Dec 13, 2016
commit bbfa86661216c370fa5e4860ca4d4a9efcbc3a7e
37 changes: 35 additions & 2 deletions mapresample.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1240,14 +1240,47 @@ int msResampleGDALToMap( mapObj *map, layerObj *layer, imageObj *image,
/* -------------------------------------------------------------------- */
if( CSLFetchBoolean( layer->processing, "LOAD_WHOLE_IMAGE", FALSE ) )
bSuccess = FALSE;
else
else {
bSuccess =
msTransformMapToSource( nDstXSize, nDstYSize, adfDstGeoTransform,
&(map->projection),
nSrcXSize, nSrcYSize,adfInvSrcGeoTransform,
&(layer->projection),
&sSrcExtent, FALSE );

if (bSuccess) {
/* -------------------------------------------------------------------- */
/* Repeat transformation for a rectangle interior to the output */
/* requested region. If the latter results in a more extreme y */
/* extent, then extend extents in source layer projection to */
/* southern/northing bounds and entire x extent. */
/* -------------------------------------------------------------------- */
memcpy( &sOrigSrcExtent, &sSrcExtent, sizeof(sSrcExtent) );
adfDstGeoTransform[0] = adfDstGeoTransform[0] + adfDstGeoTransform[1];
adfDstGeoTransform[3] = adfDstGeoTransform[3] + adfDstGeoTransform[5];
bSuccess =
msTransformMapToSource( nDstXSize-2, nDstYSize-2, adfDstGeoTransform,
&(map->projection),
nSrcXSize, nSrcYSize,adfInvSrcGeoTransform,
&(layer->projection),
&sSrcExtent, FALSE );
/* Reset this array to its original value! */
memcpy( adfDstGeoTransform, map->gt.geotransform, sizeof(double)*6 );

if (bSuccess) {
if (sSrcExtent.maxy > sOrigSrcExtent.maxy || sSrcExtent.miny < sOrigSrcExtent.miny) {
msDebug( "msTransformMapToSource(): extending bounds.\n");
sOrigSrcExtent.minx = 0;
sOrigSrcExtent.maxx = nSrcXSize;
if (sSrcExtent.maxy > sOrigSrcExtent.maxy)
sOrigSrcExtent.maxy = nSrcYSize;
if (sSrcExtent.miny < sOrigSrcExtent.miny)
sOrigSrcExtent.miny = 0;
}
}
memcpy( &sSrcExtent, &sOrigSrcExtent, sizeof(sOrigSrcExtent) );
bSuccess = TRUE;
}
}
/* -------------------------------------------------------------------- */
/* If the transformation failed, it is likely that we have such */
/* broad extents that the projection transformation failed at */
Expand Down