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.

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

Release 6.3.4 #500

Merged
merged 34 commits into from
Oct 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
b9ef420
Point to new dem geojson
AndrewPlayer3 Sep 29, 2023
a896783
Merge branch 'develop' of https://github.com/asfhyp3/hyp3-gamma into …
AndrewPlayer3 Oct 2, 2023
7cfdcb2
Updated Changelog
AndrewPlayer3 Oct 2, 2023
ead4c53
geojson format fixed
AndrewPlayer3 Oct 2, 2023
ecc5692
updated number of features dem should have
AndrewPlayer3 Oct 2, 2023
e3be9b6
Add draft blurbs noting GLO-90 filling
AndrewPlayer3 Oct 2, 2023
9edc0aa
Added GLO-90 filling blurbs
AndrewPlayer3 Oct 3, 2023
a73263d
Added COP-90 filling blurb
AndrewPlayer3 Oct 3, 2023
cec1058
add cop_exemption macro
hjkristenson Oct 3, 2023
2162a6e
add cop_exemption field to dem-cop xml
hjkristenson Oct 3, 2023
aebc1e6
add cop_exemption field to rtc readme template
hjkristenson Oct 3, 2023
de77d1a
import cop_exemption macro to rtc readme template
hjkristenson Oct 3, 2023
c2c773f
consolidate macros import statements
hjkristenson Oct 3, 2023
6fd0eca
add cop_exemption field to rtc product xml template
hjkristenson Oct 3, 2023
1344eec
Update hyp3_gamma/metadata/templates/insar/readme.md.txt.j2
AndrewPlayer3 Oct 3, 2023
5cf76c7
Merge pull request #496 from ASFHyP3/cop30-exemption
hjkristenson Oct 3, 2023
1643954
fix typo in metadata readme file
hjkristenson Oct 3, 2023
772658a
add space
hjkristenson Oct 3, 2023
a3a6531
add missing letter
hjkristenson Oct 3, 2023
aa16145
move cop_exemption blurb to separate line in rtc readme
hjkristenson Oct 3, 2023
d46ff0f
fixed macro if statement
AndrewPlayer3 Oct 3, 2023
1601eba
removed unnecessary file
AndrewPlayer3 Oct 3, 2023
dfd5261
fixe RTC readme whitespace with cop_exemption template
jhkennedy Oct 3, 2023
f6db69e
specify write encoding for windows
jhkennedy Oct 3, 2023
0ad6733
right, xmls. Keep macro just the text
jhkennedy Oct 3, 2023
911bc85
Merge pull request #497 from ASFHyP3/fill-missing-cop30-whitespace
hjkristenson Oct 3, 2023
aef70bb
Merge pull request #498 from ASFHyP3/fill-missing-cop30-unicode
hjkristenson Oct 3, 2023
8120b3e
add additional COP90 information to insar dem xml template
hjkristenson Oct 3, 2023
b2d5815
edit cop exemption wording
hjkristenson Oct 3, 2023
82414f7
edit rtc cop dem description
hjkristenson Oct 3, 2023
ba6a10a
add cop90 caveat to insar readme template
hjkristenson Oct 3, 2023
c8af4bd
Merge pull request #494 from ASFHyP3/fill-missing-cop30
AndrewPlayer3 Oct 5, 2023
060919e
link to dem coverage issue in changelog
asjohnston-asf Oct 5, 2023
2e17939
Merge pull request #499 from ASFHyP3/asjohnston-asf-patch-1
asjohnston-asf Oct 6, 2023
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
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ 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.3.4]

## Added
- New DEM coverage file which allows for jobs over Armenia and Azerbaijan to use COP90.
Fixes [#462](https://github.com/ASFHyP3/hyp3-gamma/issues/462).

## [6.3.3]

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion hyp3_gamma/dem.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

from hyp3_gamma.util import GDALConfigManager

DEM_GEOJSON = '/vsicurl/https://asf-dem-west.s3.amazonaws.com/v2/cop30-2021-us-west-2-mirror.geojson'
DEM_GEOJSON = '/vsicurl/https://asf-dem-west.s3.amazonaws.com/v2/cop30-2021-with-cop90-us-west-2-mirror.geojson'

gdal.UseExceptions()
ogr.UseExceptions()
Expand Down
2 changes: 1 addition & 1 deletion hyp3_gamma/metadata/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ python -m hyp3_gamma.metadata insar --help
```
for usage details.

**Note:** This will generate an *entire* product with pseduo data files
**Note:** This will generate an *entire* product with pseudo data files
(e.g., GeoTIFFs and Browse images), so you don't need to have a HyP3 product on
hand.

Expand Down
2 changes: 1 addition & 1 deletion hyp3_gamma/metadata/insar.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ def create_metadata_file(cls, payload: dict, template: str, reference_file: Path
out_name = payload['product_dir'].name

output_file = reference_file.parent / f'{out_name}.{out_ext}'
with open(output_file, 'w') as f:
with open(output_file, 'w', encoding='utf-8') as f:
f.write(content)

return output_file
Expand Down
2 changes: 1 addition & 1 deletion hyp3_gamma/metadata/rtc.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ def create_metadata_file(cls, payload: dict, template: str, reference_file: Path
if strip_pol:
out_name = util.strip_polarization(out_name)
output_file = reference_file.parent / f'{out_name}.{out_ext}'
with open(output_file, 'w') as f:
with open(output_file, 'w', encoding='utf-8') as f:
f.write(content)

return output_file
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
@@ -1,9 +1,9 @@
{% extends 'dem/dem.xml.j2' %}
{% from 'macros.j2' import dem_pixel_spacing %}
{% from 'macros.j2' import dem_pixel_spacing, cop_exemption %}
{% 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/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>&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) }}. {{ cop_exemption(dem_name)}} This DEM file 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
Loading
Loading