Skip to content

Commit bb63909

Browse files
committed
Addressing #5047: the coverages CRS is now the default subsettingCrs rather than imageCRS.
1 parent e2d23f5 commit bb63909

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

Diff for: mapwcs20.c

+12-3
Original file line numberDiff line numberDiff line change
@@ -3707,8 +3707,11 @@ static int msWCSGetCoverage20_FinalizeParamsObj(wcs20ParamsObjPtr params, wcs20A
37073707
params->subsetcrs = msStrdup(crs);
37083708
}
37093709
} else if (!params->subsetcrs) {
3710-
/* default to imageCRS */
3711-
params->subsetcrs = msStrdup("imageCRS");
3710+
3711+
3712+
3713+
/* default to CRS of image */
3714+
/*params->subsetcrs = msStrdup("imageCRS");*/
37123715
}
37133716

37143717
return MS_SUCCESS;
@@ -4126,7 +4129,7 @@ this request. Check wcs/ows_enable_request settings.", "msWCSGetCoverage20()", p
41264129
msWCSClearCoverageMetadata20(&cm);
41274130
msSetError(MS_WCSERR,
41284131
"Error loading CRS %s.",
4129-
"msWCSGetCoverage20()", params->subsetcrs);
4132+
"msWCSGetCoverage20()", cm.srs);
41304133
return msWCSException(map, "InvalidParameterValue",
41314134
"projection", params->version);
41324135
}
@@ -4165,6 +4168,12 @@ this request. Check wcs/ows_enable_request settings.", "msWCSGetCoverage20()", p
41654168

41664169
subsets = params->bbox;
41674170

4171+
/* if no subsetCRS was specified use the coverages CRS
4172+
(Requirement 27 of the WCS 2.0 specification) */
4173+
if (!params->subsetcrs) {
4174+
params->subsetcrs = msStrdup(cm.srs);
4175+
}
4176+
41684177
if(EQUAL(params->subsetcrs, "imageCRS")) {
41694178
/* subsets are in imageCRS; reproject them to real coordinates */
41704179
rectObj orig_bbox = subsets;

0 commit comments

Comments
 (0)