Skip to content

Commit

Permalink
Merge pull request #443 from ASFHyP3/develop
Browse files Browse the repository at this point in the history
Release v6.0.1-- fixing broken Copernicus GLO-30 DEM links in product metadata
  • Loading branch information
jhkennedy authored Feb 15, 2023
2 parents 205e264 + 1c3122c commit 76faf94
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 13 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/test-and-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
tar -zxvf GAMMA_SOFTWARE-20220630_MSP_ISP_DIFF_LAT.linux64_ubuntu2204.tar.gz
- name: Build, tag, and push image to Amazon ECR
uses: docker/build-push-action@v3
uses: docker/build-push-action@v4
with:
context: .
no-cache: true
Expand All @@ -76,14 +76,14 @@ jobs:
- name: Add test tag
if: github.ref == 'refs/heads/develop'
uses: akhilerm/tag-push-action@v2.0.0
uses: akhilerm/tag-push-action@v2.1.0
with:
src: ${{ env.HYP3_REGISTRY }}/${{ github.event.repository.name }}:${{ env.SDIST_VERSION }}
dst: ${{ env.HYP3_REGISTRY }}/${{ github.event.repository.name }}:test

- name: Add latest tag
if: github.ref == 'refs/heads/main'
uses: akhilerm/tag-push-action@v2.0.0
uses: akhilerm/tag-push-action@v2.1.0
with:
src: ${{ env.HYP3_REGISTRY }}/${{ github.event.repository.name }}:${{ env.SDIST_VERSION }}
dst: ${{ env.HYP3_REGISTRY }}/${{ github.event.repository.name }}:latest
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [PEP 440](https://www.python.org/dev/peps/pep-0440/)
and uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [6.0.1]

### Fixed

- Broken Copernicus DEM links.

## [6.0.0]

Expand Down
4 changes: 2 additions & 2 deletions hyp3_gamma/metadata/templates/dem/dem-cop.xml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{% block dataIdInfo %}
<dataIdInfo>
<idPurp>This file is the DEM used in the radiometric terrain correction process (using GAMMA software) for a granule of {{ granule_type }} SAR data from the Sentinel-1 mission. Cell values indicate the elevation in meters, and have been resampled to a pixel spacing of {{ pixel_spacing|int }} m. To access actual {{ scale }} values, refer to the VV/VH/HV/HH TIFF files included in the same folder as this image.</idPurp>
<idAbs>&lt;DIV STYLE="text-align:Left;"&gt;&lt;DIV&gt;&lt;DIV&gt;&lt;P&gt;&lt;SPAN&gt;This is the Digital Elevation Model (DEM) used in the Radiometric Terrain Correction (RTC) process for a granule of {{ granule_description }} ({{ granule_type }}) Synthetic Aperture Radar (SAR) data from the Copernicus Sentinel-1 mission of the European Space Agency (ESA). The granule was processed by ASF DAAC HyP3 {{ processing_date.year }} using the {{ plugin_name }} plugin version {{ plugin_version }} running {{ processor_name }} release {{ processor_version }}, and the extent of the DEM is clipped to the size needed for full granule coverage, or to the extent of the available DEM data if full coverage is not available. &lt;/SPAN&gt;&lt;/P&gt;&lt;P&gt;&lt;SPAN&gt;This DEM was generated from the Copernicus DEM GLO-30 dataset, which has a native pixel spacing of {{ dem_pixel_spacing(dem_name) }}. It was reprojected to {{ projection }}, and the pixel spacing was resampled from the native DEM pixel spacing to {{ pixel_spacing|int }} m. &lt;/SPAN&gt;&lt;/P&gt;&lt;P&gt;&lt;SPAN&gt;The source DEM tiles were downloaded from the Copernicus Digital Elevation Model (DEM) GLO-30 Public collection managed by Sinergise, which is available for download at &lt;/SPAN&gt;&lt;A href="https://registry.opendata.aws:443/copernicus-dem/" target="_blank" &gt;&lt;SPAN&gt;https://registry.opendata.aws/copernicus-dem/&lt;/SPAN&gt;&lt;/A&gt;&lt;SPAN&gt;. A geoid correction is applied to the source DEM values in preparation for RTC processing, so the height values in this file will differ from the source DEM values. This file is a 16-bit signed integer version of the 32-bit float DEM used for processing.&lt;/SPAN&gt;&lt;/P&gt;&lt;P&gt;&lt;SPAN&gt;The Copernicus DEM GLO-30 is a global Digital Surface Model (DSM) at 30-m pixel spacing derived from the WorldDEM. The WorldDEM is based on radar satellite data acquired by the TanDEM-X mission, which was funded by the German Aerospace Center (DLR) and Airbus Defence and Space, and edited to flatten water bodies, provide consistent flow of rivers, and apply corrections to shore/coastlines and special features. &lt;/SPAN&gt;&lt;/P&gt;&lt;P&gt;&lt;SPAN&gt;For an overview of this DEM resource, visit &lt;/SPAN&gt;&lt;A href="https://spacedata.copernicus.eu/explore-more/news-archive/-/asset_publisher/Ye8egYeRPLEs/blog/id/434960" target="_blank" &gt;&lt;SPAN&gt;https://spacedata.copernicus.eu/explore-more/news-archive/-/asset_publisher/Ye8egYeRPLEs/blog/id/434960&lt;/SPAN&gt;&lt;/A&gt;&lt;SPAN&gt;. The product handbook is available at &lt;/SPAN&gt;&lt;A href="https://spacedata.copernicus.eu/documents/20126/0/GEO1988-CopernicusDEM-SPE-002_ProductHandbook_I1.00.pdf" target="_blank" &gt;&lt;SPAN&gt;https://spacedata.copernicus.eu/documents/20126/0/GEO1988-CopernicusDEM-SPE-002_ProductHandbook_I1.00.pdf&lt;/SPAN&gt;&lt;/A&gt;&lt;SPAN&gt;.&lt;/SPAN&gt;&lt;/P&gt;&lt;P&gt;&lt;SPAN&gt;The actual {{ scale }} data is contained in the VV/HH (primary polarization) and/or VH/HV (cross-polarization) TIFF files included in the same downloaded folder as this file. The name of the SAR granule used to generate the files in this folder is: {{ granule_name }}. For a detailed description of the Sentinel-1 file naming convention, refer to &lt;/SPAN&gt;&lt;A href="https://asf.alaska.edu/data-sets/sar-data-sets/sentinel-1/sentinel-1-data-and-imagery/#Naming_Convention" target="_blank" &gt;&lt;SPAN&gt;https://asf.alaska.edu/data-sets/sar-data-sets/sentinel-1/sentinel-1-data-and-imagery/#Naming_Convention&lt;/SPAN&gt;&lt;/A&gt;&lt;SPAN&gt;.&lt;/SPAN&gt;&lt;/P&gt;&lt;P&gt;&lt;SPAN&gt;Refer to ASF's &lt;/SPAN&gt;&lt;A href="https://hyp3-docs.asf.alaska.edu/guides/rtc_product_guide/" target="_blank" &gt;&lt;SPAN&gt;RTC Product Guide&lt;/SPAN&gt;&lt;/A&gt;&lt;SPAN&gt; for more information about On Demand RTC products.&lt;/SPAN&gt;&lt;/P&gt;&lt;P&gt;&lt;SPAN&gt;The Sentinel-1 mission is designed to be a two-satellite constellation. Sentinel-1A was launched April 3, 2014, and remains active. Sentinel-1B was launched April 25, 2016, and was active until December 23, 2021. The satellites each have a 12-day repeat cycle and use the same orbit pattern, but are offset 180 degrees to allow repeat passes every 6 days while both are active.&lt;/SPAN&gt;&lt;/P&gt;&lt;P&gt;&lt;SPAN&gt;Since the mission ended for S1B, there are some significant gaps in coverage. A reduced acquisition plan will be in place until Sentinel-1C is launched (expected in 2023) to replace Sentinel-1B. Visit &lt;/SPAN&gt;&lt;A href="https://hyp3-docs.asf.alaska.edu/sentinel1/" target="_blank" &gt;&lt;SPAN&gt;https://hyp3-docs.asf.alaska.edu/sentinel1&lt;/SPAN&gt;&lt;/A&gt;&lt;SPAN&gt; for more information.&lt;/SPAN&gt;&lt;/P&gt;&lt;P&gt;&lt;SPAN&gt;More information about the Sentinel-1 mission is available at &lt;/SPAN&gt;&lt;A href="https://sentinels.copernicus.eu/web/sentinel/missions/sentinel-1" target="_blank" &gt;&lt;SPAN&gt;https://sentinels.copernicus.eu/web/sentinel/missions/sentinel-1&lt;/SPAN&gt;&lt;/A&gt;&lt;SPAN&gt;.&lt;/SPAN&gt;&lt;/P&gt;&lt;P&gt;&lt;SPAN&gt;Additional information about Sentinel-1 data, imagery, tools and applications is available at &lt;/SPAN&gt;&lt;A href="https://asf.alaska.edu/data-sets/sar-data-sets/sentinel-1/" target="_blank" &gt;&lt;SPAN&gt;https://asf.alaska.edu/data-sets/sar-data-sets/sentinel-1&lt;/SPAN&gt;&lt;/A&gt;&lt;SPAN&gt;.&lt;/SPAN&gt;&lt;/P&gt;&lt;/DIV&gt;&lt;/DIV&gt;&lt;/DIV&gt;
<idAbs>&lt;DIV STYLE="text-align:Left;"&gt;&lt;DIV&gt;&lt;DIV&gt;&lt;P&gt;&lt;SPAN&gt;This is the Digital Elevation Model (DEM) used in the Radiometric Terrain Correction (RTC) process for a granule of {{ granule_description }} ({{ granule_type }}) Synthetic Aperture Radar (SAR) data from the Copernicus Sentinel-1 mission of the European Space Agency (ESA). The granule was processed by ASF DAAC HyP3 {{ processing_date.year }} using the {{ plugin_name }} plugin version {{ plugin_version }} running {{ processor_name }} release {{ processor_version }}, and the extent of the DEM is clipped to the size needed for full granule coverage, or to the extent of the available DEM data if full coverage is not available. &lt;/SPAN&gt;&lt;/P&gt;&lt;P&gt;&lt;SPAN&gt;This DEM was generated from the Copernicus DEM GLO-30 dataset, which has a native pixel spacing of {{ dem_pixel_spacing(dem_name) }}. It was reprojected to {{ projection }}, and the pixel spacing was resampled from the native DEM pixel spacing to {{ pixel_spacing|int }} m. &lt;/SPAN&gt;&lt;/P&gt;&lt;P&gt;&lt;SPAN&gt;The source DEM tiles were downloaded from the Copernicus Digital Elevation Model (DEM) GLO-30 Public collection managed by Sinergise, which is available for download at &lt;/SPAN&gt;&lt;A href="https://registry.opendata.aws:443/copernicus-dem/" target="_blank" &gt;&lt;SPAN&gt;https://registry.opendata.aws/copernicus-dem/&lt;/SPAN&gt;&lt;/A&gt;&lt;SPAN&gt;. A geoid correction is applied to the source DEM values in preparation for RTC processing, so the height values in this file will differ from the source DEM values. This file is a 16-bit signed integer version of the 32-bit float DEM used for processing.&lt;/SPAN&gt;&lt;/P&gt;&lt;P&gt;&lt;SPAN&gt;The Copernicus DEM GLO-30 is a global Digital Surface Model (DSM) at 30-m pixel spacing derived from the WorldDEM. The WorldDEM is based on radar satellite data acquired by the TanDEM-X mission, which was funded by the German Aerospace Center (DLR) and Airbus Defence and Space, and edited to flatten water bodies, provide consistent flow of rivers, and apply corrections to shore/coastlines and special features. &lt;/SPAN&gt;&lt;/P&gt;&lt;P&gt;&lt;SPAN&gt;For an overview of this DEM resource, visit &lt;/SPAN&gt;&lt;A href="https://spacedata.copernicus.eu/collections/copernicus-digital-elevation-model" target="_blank" &gt;&lt;SPAN&gt;https://spacedata.copernicus.eu/collections/copernicus-digital-elevation-model&lt;/SPAN&gt;&lt;/A&gt;&lt;SPAN&gt;. The actual {{ scale }} data is contained in the VV/HH (primary polarization) and/or VH/HV (cross-polarization) TIFF files included in the same downloaded folder as this file. The name of the SAR granule used to generate the files in this folder is: {{ granule_name }}. For a detailed description of the Sentinel-1 file naming convention, refer to &lt;/SPAN&gt;&lt;A href="https://asf.alaska.edu/data-sets/sar-data-sets/sentinel-1/sentinel-1-data-and-imagery/#Naming_Convention" target="_blank" &gt;&lt;SPAN&gt;https://asf.alaska.edu/data-sets/sar-data-sets/sentinel-1/sentinel-1-data-and-imagery/#Naming_Convention&lt;/SPAN&gt;&lt;/A&gt;&lt;SPAN&gt;.&lt;/SPAN&gt;&lt;/P&gt;&lt;P&gt;&lt;SPAN&gt;Refer to ASF's &lt;/SPAN&gt;&lt;A href="https://hyp3-docs.asf.alaska.edu/guides/rtc_product_guide/" target="_blank" &gt;&lt;SPAN&gt;RTC Product Guide&lt;/SPAN&gt;&lt;/A&gt;&lt;SPAN&gt; for more information about On Demand RTC products.&lt;/SPAN&gt;&lt;/P&gt;&lt;P&gt;&lt;SPAN&gt;The Sentinel-1 mission is designed to be a two-satellite constellation. Sentinel-1A was launched April 3, 2014, and remains active. Sentinel-1B was launched April 25, 2016, and was active until December 23, 2021. The satellites each have a 12-day repeat cycle and use the same orbit pattern, but are offset 180 degrees to allow repeat passes every 6 days while both are active.&lt;/SPAN&gt;&lt;/P&gt;&lt;P&gt;&lt;SPAN&gt;Since the mission ended for S1B, there are some significant gaps in coverage. A reduced acquisition plan will be in place until Sentinel-1C is launched (expected in 2023) to replace Sentinel-1B. Visit &lt;/SPAN&gt;&lt;A href="https://hyp3-docs.asf.alaska.edu/sentinel1/" target="_blank" &gt;&lt;SPAN&gt;https://hyp3-docs.asf.alaska.edu/sentinel1&lt;/SPAN&gt;&lt;/A&gt;&lt;SPAN&gt; for more information.&lt;/SPAN&gt;&lt;/P&gt;&lt;P&gt;&lt;SPAN&gt;More information about the Sentinel-1 mission is available at &lt;/SPAN&gt;&lt;A href="https://sentinels.copernicus.eu/web/sentinel/missions/sentinel-1" target="_blank" &gt;&lt;SPAN&gt;https://sentinels.copernicus.eu/web/sentinel/missions/sentinel-1&lt;/SPAN&gt;&lt;/A&gt;&lt;SPAN&gt;.&lt;/SPAN&gt;&lt;/P&gt;&lt;P&gt;&lt;SPAN&gt;Additional information about Sentinel-1 data, imagery, tools and applications is available at &lt;/SPAN&gt;&lt;A href="https://asf.alaska.edu/data-sets/sar-data-sets/sentinel-1/" target="_blank" &gt;&lt;SPAN&gt;https://asf.alaska.edu/data-sets/sar-data-sets/sentinel-1&lt;/SPAN&gt;&lt;/A&gt;&lt;SPAN&gt;.&lt;/SPAN&gt;&lt;/P&gt;&lt;/DIV&gt;&lt;/DIV&gt;&lt;/DIV&gt;
</idAbs>
<idCredit>Produced using Copernicus WorldDEM-30 Copr. DLR e.V. 2010-2014 and Copr. Airbus Defence and Space GmbH 2014-2018 provided under COPERNICUS by the European Union and ESA; all rights reserved.</idCredit>
<idCitation xmlns="">
Expand Down Expand Up @@ -87,7 +87,7 @@
<cntPhone><voiceNum tddtty="">+386 (1) 320-61-50</voiceNum></cntPhone>
</rpCntInfo>
</idPoC>
<suppInfo>https://spacedata.copernicus.eu/explore-more/news-archive/-/asset_publisher/Ye8egYeRPLEs/blog/id/434960</suppInfo>
<suppInfo>https://spacedata.copernicus.eu/collections/copernicus-digital-elevation-model</suppInfo>
<tpCat>
<TopicCatCd value="006"/>
</tpCat>
Expand Down
Loading

0 comments on commit 76faf94

Please sign in to comment.