diff --git a/CHANGELOG.md b/CHANGELOG.md index 0586534..3504dd7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # Changelog +## [v1.1.1] - 2024-09-16 +### Changed + +- [[TRT-558](https://bugs.earthdata.nasa.gov/browse/TRT-558)] + The Swath Projector has been updated to use `earthdata-varinfo` version 3.0.0. + This update primarily involves the streamlining of the configuration file + schema. Please see the + [earthdata-varinfo release notes](https://github.com/nasa/earthdata-varinfo/releases/tag/3.0.0) + for more information. The configuration file used by the Swath Projector has + also been renamed to `earthdata_varinfo_config.json`. + ## [v1.1.0] - 2024-08-29 ### Changed @@ -33,6 +44,7 @@ Repository structure changes include: For more information on internal releases prior to NASA open-source approval, see legacy-CHANGELOG.md. +[v1.1.1]:(https://github.com/nasa/harmony-swath-projector/releases/tag/1.1.0) [v1.1.0]:(https://github.com/nasa/harmony-swath-projector/releases/tag/1.0.1) [v1.0.1]:(https://github.com/nasa/harmony-swath-projector/releases/tag/1.0.1) [v1.0.0]:(https://github.com/nasa/harmony-swath-projector/releases/tag/1.0.0) diff --git a/docker/service_version.txt b/docker/service_version.txt index 9084fa2..524cb55 100644 --- a/docker/service_version.txt +++ b/docker/service_version.txt @@ -1 +1 @@ -1.1.0 +1.1.1 diff --git a/pip_requirements.txt b/pip_requirements.txt index 4f5cf4c..c74cd7f 100644 --- a/pip_requirements.txt +++ b/pip_requirements.txt @@ -1,5 +1,5 @@ # Open source packages available from PyPI: -earthdata-varinfo ~= 1.0.0 +earthdata-varinfo ~= 3.0.0 harmony-service-lib~=1.0.22 netCDF4 ~= 1.6.4 numpy ~= 1.24.2 diff --git a/swath_projector/cf_config.json b/swath_projector/cf_config.json deleted file mode 100644 index c8575e9..0000000 --- a/swath_projector/cf_config.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "Identification": "Swath Projector VarInfo configuration", - "Version": 2, - "Collection_ShortName_Path": [ - "ShortName" - ], - "Mission": { - "VNP10": "VIIRS" - }, - "CF_Overrides": [ - { - "Applicability": { - "Mission": "VIIRS", - "ShortNamePath": "VNP10", - "Variable_Pattern": "/SnowData/.*" - }, - "Attributes": [ - { - "Name": "coordinates", - "Value": "/GeolocationData/latitude, /GeolocationData/longitude" - } - ], - "_Description": "VNP10 SnowData variables have incorrect relative paths for coordinates." - } - ] -} diff --git a/swath_projector/earthdata_varinfo_config.json b/swath_projector/earthdata_varinfo_config.json new file mode 100644 index 0000000..66e5e23 --- /dev/null +++ b/swath_projector/earthdata_varinfo_config.json @@ -0,0 +1,26 @@ +{ + "Identification": "Swath Projector VarInfo configuration", + "Version": 3, + "CollectionShortNamePath": [ + "ShortName" + ], + "Mission": { + "VNP10": "VIIRS" + }, + "MetadataOverrides": [ + { + "Applicability": { + "Mission": "VIIRS", + "ShortNamePath": "VNP10", + "VariablePattern": "/SnowData/.*" + }, + "Attributes": [ + { + "Name": "coordinates", + "Value": "/GeolocationData/latitude, /GeolocationData/longitude" + } + ], + "_Description": "VNP10 SnowData variables have incorrect relative paths for coordinates." + } + ] +} diff --git a/swath_projector/reproject.py b/swath_projector/reproject.py index 808bf78..b309477 100644 --- a/swath_projector/reproject.py +++ b/swath_projector/reproject.py @@ -20,7 +20,7 @@ ) CRS_DEFAULT = '+proj=longlat +ellps=WGS84' INTERPOLATION_DEFAULT = 'ewa-nn' -CF_CONFIG_FILE = 'swath_projector/cf_config.json' +CF_CONFIG_FILE = 'swath_projector/earthdata_varinfo_config.json' def reproject(