[mapserver-commits] [mapserver/mapserver] 249328: WCS 2.0: special processing for wcs_rangeset_axes=...

[GitHub]

  Branch: refs/heads/branch-7-0
  Home:   https://github.com/mapserver/mapserver
  Commit: 2493287b0e35f54c671d6dae33ebabfc7869bb60
      https://github.com/mapserver/mapserver/commit/2493287b0e35f54c671d6dae33ebabfc7869bb60
  Author: Even Rouault <even.rouault at spatialys.com>
  Date:   2017-11-21 (Tue, 21 Nov 2017)

  Changed paths:
    M mapwcs20.c
    M msautotest/wxs/expected/wcs_10_getcov_bands_name_new.dat
    M msautotest/wxs/expected/wcs_20_desc.txt
    M msautotest/wxs/expected/wcs_20_desc.xml
    M msautotest/wxs/expected/wcs_20_getcov_full.dat
    M msautotest/wxs/expected/wcs_20_getcov_grd_mp.dat
    M msautotest/wxs/expected/wcs_20_getcov_reproj.dat
    M msautotest/wxs/expected/wcs_20_post_desc.xml
    M msautotest/wxs/expected/wcs_20_post_getcov_full_multipart.dat
    M msautotest/wxs/expected/wcs_mask_20_getcov_full.dat
    M msautotest/wxs/expected/wcs_mask_20_getcov_grd_mp.dat
    M msautotest/wxs/expected/wcs_mask_20_getcov_reproj.dat
    M msautotest/wxs/wcs_multi.map

  Log Message:
  -----------
  WCS 2.0: special processing for wcs_rangeset_axes=bands

WCS 2.0 has a special compatibility mode where it can use WCS 1.1 metadata
items. Unfortunately, it does a wrong assumption on how wcs_rangeset_axes works
in WCS 1.0/1.1. The implementation of it is probably not completely right in
WCS 1.0/1.1, but at least a special case that works is when 'bands' is assigned
to wcs_rangeset_axes. So make WCS 2.0 code handle wcs_rangeset_axes=bands
as the special case handled by msWCSSetDefaultBandsRangeSetInfo()
in https://github.com/mapserver/mapserver/blob/branch-7-0/mapwcs.c#L281

Modify wcs_multi.map to use wcs_rangeset_axes=bands. This will also make the
wcs_10_getcov_bands_name_new request to properly return 3 bands. So band
subsetting works in both in WCS 1.0 and 2.0 with the same mapfile.

The "New band related metadata entries" paragraph of
http://mapserver.org/ogc/wcs_server.html
should probably be revised to remove reference to the WCS 1.1 compatibility
mode.


  Commit: 6a09273f4da7486b7f05846c3acb0630f54664dd
      https://github.com/mapserver/mapserver/commit/6a09273f4da7486b7f05846c3acb0630f54664dd
  Author: Even Rouault <even.rouault at spatialys.com>
  Date:   2017-11-30 (Thu, 30 Nov 2017)

  Changed paths:
    M mapwcs20.c
    M msautotest/wxs/expected/wcs_20_desc_bands.xml
    M msautotest/wxs/expected/wcs_20_getcov_bands_name_new.dat
    M msautotest/wxs/expected/wcs_20_getcov_bands_name_new_reproject.dat
    M msautotest/wxs/expected/wcs_20_post_bands_name_new.dat
    M msautotest/wxs/wcs_multi.map

  Log Message:
  -----------
  Add comments to previous commit, and make sure that in msWCSGetCoverage20_GetBands() the WCS 2.0 wcs_band_names get priority over the WCS 1.x wcs_rangeset_axes (to be consistent with msWCSGetCoverageMetadata20())


  Commit: fc06d45fd7c5ecd06562bd4f3edf42436468576a
      https://github.com/mapserver/mapserver/commit/fc06d45fd7c5ecd06562bd4f3edf42436468576a
  Author: Even Rouault <even.rouault at mines-paris.org>
  Date:   2017-11-30 (Thu, 30 Nov 2017)

  Changed paths:
    M mapwcs20.c
    M msautotest/wxs/expected/wcs_10_getcov_bands_name_new.dat
    M msautotest/wxs/expected/wcs_20_desc.txt
    M msautotest/wxs/expected/wcs_20_desc.xml
    M msautotest/wxs/expected/wcs_20_desc_bands.xml
    M msautotest/wxs/expected/wcs_20_getcov_bands_name_new.dat
    M msautotest/wxs/expected/wcs_20_getcov_bands_name_new_reproject.dat
    M msautotest/wxs/expected/wcs_20_getcov_full.dat
    M msautotest/wxs/expected/wcs_20_getcov_grd_mp.dat
    M msautotest/wxs/expected/wcs_20_getcov_reproj.dat
    M msautotest/wxs/expected/wcs_20_post_bands_name_new.dat
    M msautotest/wxs/expected/wcs_20_post_desc.xml
    M msautotest/wxs/expected/wcs_20_post_getcov_full_multipart.dat
    M msautotest/wxs/expected/wcs_mask_20_getcov_full.dat
    M msautotest/wxs/expected/wcs_mask_20_getcov_grd_mp.dat
    M msautotest/wxs/expected/wcs_mask_20_getcov_reproj.dat
    M msautotest/wxs/wcs_multi.map

  Log Message:
  -----------
  Merge pull request #5523 from rouault/wcs20_special_case_for_wcs_rangeset_axes_equal_bands

WCS 2.0: special processing for wcs_rangeset_axes=bands


Compare: https://github.com/mapserver/mapserver/compare/8a949f744eb4...fc06d45fd7c5