From 33c4535ef155a4b9f76204e87712012d937b7700 Mon Sep 17 00:00:00 2001 From: Frederico Liporace Date: Fri, 23 Jun 2023 17:11:28 -0300 Subject: [PATCH 1/2] Fixed asset HREF parsing (#9) --- CHANGELOG.md | 2 +- src/stactools/amazonia_1/stac.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e7f5c95..2e1d286 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,7 +23,7 @@ number as needed. ### Fixed -- Nothing. +- Fixed HREF asset parsing ([#9](https://github.com/stactools-packages/amazonia-1/issues/9)). ## [0.1.0] - 2023-06-01 diff --git a/src/stactools/amazonia_1/stac.py b/src/stactools/amazonia_1/stac.py index 90b70ff..34c5dfd 100644 --- a/src/stactools/amazonia_1/stac.py +++ b/src/stactools/amazonia_1/stac.py @@ -27,6 +27,7 @@ from pystac.extensions.sat import OrbitState, SatExtension from pystac.extensions.view import ViewExtension from pystac.summaries import Summaries +from stactools.core.io import read_text from stactools.amazonia_1.constants import ( BASE_CAMERA, @@ -75,7 +76,7 @@ def _get_keys_from_cbers_am(cb_am_metadata: str) -> Dict[str, Any]: """Extract keys from Amazonia-1 INPE's metadata. Args: - cb_am_metadata: CBERS/AM metadata file location + cb_am_metadata: CBERS/AM metadata HREF Returns: Item: STAC Item object @@ -87,19 +88,18 @@ def _get_keys_from_cbers_am(cb_am_metadata: str) -> Dict[str, Any]: match = TIF_XML_REGEX.match(cb_am_metadata.split("/")[-1]) assert match, f"Can't match {cb_am_metadata}" - tree = ET.parse(cb_am_metadata) - original_root = tree.getroot() + tree = ET.fromstring(text=read_text(href=cb_am_metadata)) # satellite node information, checking for CBERS-04A/AMAZONIA1 WFI # special case - left_root = original_root.find("x:leftCamera", nsp) + left_root = tree.find("x:leftCamera", nsp) if left_root: - right_root = original_root.find("x:rightCamera", nsp) + right_root = tree.find("x:rightCamera", nsp) # We use the left camera for fields that are not camera # specific or are not used for STAC fields computation root = left_root else: - root = original_root + root = tree satellite = root.find("x:satellite", nsp) From b194d1796b25b8e95cdec85b1fb8e17bde92425c Mon Sep 17 00:00:00 2001 From: Frederico Liporace Date: Fri, 23 Jun 2023 17:17:25 -0300 Subject: [PATCH 2/2] v0.1.1 release --- CHANGELOG.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e1d286..cdfd41b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,24 @@ number as needed. ### Fixed +- Nothing. + +## [0.1.1] - 2023-06-23 + +### Added + +- Nothing. + +### Deprecated + +- Nothing. + +### Removed + +- Nothing. + +### Fixed + - Fixed HREF asset parsing ([#9](https://github.com/stactools-packages/amazonia-1/issues/9)). ## [0.1.0] - 2023-06-01 @@ -31,4 +49,7 @@ number as needed. - First version +[0.1.1]: [0.1.0]: + +