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

DAS-1601 - Remove PNG and JPEG outputs from HGA capabilities #636

Merged
merged 3 commits into from
Oct 10, 2024
Merged

DAS-1601 - Remove PNG and JPEG outputs from HGA capabilities #636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a8cbd4a
DAS-1601 - Remove PNG and GIF outputs from HGA.
owenlittlejohns Oct 1, 2024
715432c
DAS-1601 - Update tests to account for different service options.
owenlittlejohns Oct 7, 2024
1f61246
Merge branch 'main' into DAS-1601-remove-PNG-JPEG-from-HGA
chris-durbin Oct 10, 2024
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
8 changes: 2 additions & 6 deletions config/services.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ https://cmr.earthdata.nasa.gov:
description: |
Service translating Harmony operations to GDAL commands.
Supports spatial bounding box, temporal, variable, and shapefile, reprojection,
and output to NetCDF4, COG, PNG, and GIF.
and output to NetCDF4 or COG.
Operates on input file types supported by GDAL (most EOSDIS data).
Most operations assume L3 data, though it is likely that some work on L2.
data_operation_version: '0.19.0'
Expand All @@ -370,8 +370,6 @@ https://cmr.earthdata.nasa.gov:
output_formats:
- application/x-netcdf4
- image/tiff
- image/png
- image/gif
reprojection: true
steps:
- image: !Env ${QUERY_CMR_IMAGE}
Expand Down Expand Up @@ -929,7 +927,7 @@ https://cmr.uat.earthdata.nasa.gov:
description: |
Service translating Harmony operations to GDAL commands.
Supports spatial bounding box, temporal, variable, and shapefile, reprojection,
and output to NetCDF4, COG, PNG, and GIF.
and output to NetCDF4 or COG.
Operates on input file types supported by GDAL (most EOSDIS data).
Most operations assume L3 data, though it is likely that some work on L2.
data_operation_version: '0.19.0'
Expand All @@ -951,8 +949,6 @@ https://cmr.uat.earthdata.nasa.gov:
output_formats:
- application/x-netcdf4
- image/tiff
- image/png
- image/gif
reprojection: true
steps:
- image: !Env ${QUERY_CMR_IMAGE}
Expand Down
6 changes: 3 additions & 3 deletions services/harmony/test/collection-capabilities.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ describe('Testing collection capabilities', function () {
it('sets the outputFormats field correctly', function () {
const capabilities = JSON.parse(this.res.text);
const expectedFormats = [
'application/x-netcdf4', 'image/tiff', 'image/png', 'image/gif', 'application/x-zarr',
'application/x-netcdf4', 'image/tiff', 'application/x-zarr', 'image/png', 'image/gif',
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a quick explanation on these updated tests:

Harmony concatenates all the output formats into a single list. The ordering of the list reflects the first time each output is encountered in services.yml. HGA is listed above NetCDF-to-Zarr, which in turn is above harmony-service-example.

Before this change, HGA and harmony-service-example both listed PNGs and GIFs as output options, so those formats were listed before Zarr, because HGA is before NetCDF-to-Zarr. After this change, only harmony-service-example lists PNG and GIF, so these formats are found after NetCDF-to-Zarr and listed after the Zarr output option.

Kind of in-the-weeds, but wanted to explain what looks like a weird test change.

];
expect(capabilities.outputFormats).to.eql(expectedFormats);
});
Expand Down Expand Up @@ -235,7 +235,7 @@ describe('Testing collection capabilities', function () {
it('sets the outputFormats field correctly in the version 1 response', function () {
const capabilities = JSON.parse(this.res.text);
const expectedFormats = [
'application/x-netcdf4', 'image/tiff', 'image/png', 'image/gif', 'application/x-zarr',
'application/x-netcdf4', 'image/tiff', 'application/x-zarr', 'image/png', 'image/gif',
];
expect(capabilities.outputFormats).to.eql(expectedFormats);
});
Expand Down Expand Up @@ -274,4 +274,4 @@ describe('Testing collection capabilities', function () {
});
});
});
});
});
Loading