Skip to content

Commit

Permalink
Merge branch 'release/2.19.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
floeschau committed Feb 19, 2024
2 parents 9b6de36 + 470ef9b commit 89d49ab
Show file tree
Hide file tree
Showing 15 changed files with 283 additions and 17 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -370,3 +370,8 @@ src/global.json

build/
package-lock.json
src/Stars.Data.Tests/Resources/BKA/L1C/data/4089411-0220-PAN-C-1-1-1139831-160712T150120-BR
src/Stars.Data.Tests/Resources/CONAE/SAOCOM-1/L1A/data/286806-EOL1ASARSAO1A3111864/Config
src/Stars.Data.Tests/Resources/CONAE/SAOCOM-1/L1A/data/286806-EOL1ASARSAO1A3111864/Data
src/Stars.Data.Tests/Resources/CONAE/SAOCOM-1/L1A/data/286806-EOL1ASARSAO1A3111864/Images
src/Stars.Data.Tests/Resources/CONAE/SAOCOM-1/L1A/data/286806-EOL1ASARSAO1A3111864/Quality
38 changes: 38 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -852,6 +852,44 @@
// },
"enableStepFiltering": false
},
{
"name": "Copy S3 from CDS",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
// If you have changed target frameworks, make sure to update the program path.
"program": "${workspaceFolder}/src/Stars.Console/bin/Debug/net6.0/Stars.dll",
"args": [
"copy",
"-v",
"-k",
"-r",
"4",
"-nohtml",
"-si",
"CDS",
"--output",
"/tmp/stars",
"https://catalogue.dataspace.copernicus.eu/stac/collections/SENTINEL-3/items/S3B_SL_1_RBT____20240207T082602_20240207T082902_20240207T092904_0179_089_221_0540_PS2_O_NR_004.SEN3"
],
"cwd": "${workspaceFolder}/src",
// For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
"console": "internalConsole",
"stopAtEntry": false,
"logging": {
"moduleLoad": false
},
"justMyCode": false,
"requireExactSource": false,
// "symbolOptions": {
// // "searchPaths": [
// // "/data/workspace/Others/aws-sdk-net/sdk/src"
// // ],
// "searchMicrosoftSymbolServer": true,
// "searchNuGetOrgSymbolServer": true
// },
"enableStepFiltering": false
},
{
"name": ".NET Core Attach",
"type": "coreclr",
Expand Down
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
],
"omnisharp.disableMSBuildDiagnosticWarning": true,
"dotnet-test-explorer.testProjectPath": "**/*Tests.@(csproj|vbproj|fsproj)",
"jira-plugin.workingProject": "DATAAUTHOR",
"jira-plugin.workingProject": "",
"dotnet.defaultSolution": "src/Terradue.Stars.sln"
}
22 changes: 20 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

## [2.18.1](https://github.com/Terradue/Stars/compare/2.18.0...2.18.1)
## [2.19.1](https://github.com/Terradue/Stars/compare/2.19.0...2.19.1)

Improved SAOCOM-1 metadata extraction
### Commits

- Update file sizes in metadata JSON [`3fd6f4b`](https://github.com/Terradue/Stars/commit/3fd6f4b3086125af5c97083694c0a07c6137533d)
- Add S3 copy launch configuration and update S3ClientFactory [`72d9c46`](https://github.com/Terradue/Stars/commit/72d9c46e32b6e8ff65f76cf2c6c07a60e6593b2a)
- Add CONAE/SAOCOM-1 resources to .gitignore [`a347df7`](https://github.com/Terradue/Stars/commit/a347df70494a2d4b9b1ae52a37e52e7f88baf214)

## [2.19.0](https://github.com/Terradue/Stars/compare/2.18.1...2.19.0) - 2024-02-09

### Merged

- Change for nested BKA MUL/PAN bundles in nested ZIP files [`#43`](https://github.com/Terradue/Stars/pull/43)

### Commits

- Changes for BKA MUL/PAN combined archives [`12162b5`](https://github.com/Terradue/Stars/commit/12162b5c08629edeea7ee169662a43c9de8d6b7d)
- Initial changes for multiple inner asset containers [`bad8552`](https://github.com/Terradue/Stars/commit/bad8552fc59f63d63931ee68d4bdf879dc9bac1a)
- Ready to release 2.19.0 [`271a3e2`](https://github.com/Terradue/Stars/commit/271a3e231aabf6dcddd85335636af686d31c2a6c)

## [2.18.1](https://github.com/Terradue/Stars/compare/2.18.0...2.18.1) - 2023-12-11

### Merged

Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"dependencies": {
"auto-changelog": "^2.4.0"
"auto-changelog": "^2.4.0",
"package.json": "^2.0.1"
},
"auto-changelog": {
"output": "CHANGELOG.md",
Expand Down
2 changes: 1 addition & 1 deletion src/Stars.Console/Terradue.Stars.Console.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0</TargetFrameworks>
<Version>2.19.0</Version>
<Version>2.19.2</Version>
<!-- <VersionSuffix>beta.8</VersionSuffix> -->
<Description>Stars is a CLI for working with Spatio Temporal Catalog such as STAC but not only</Description>
<Version Condition=" '$(VersionSuffix)' != '' ">$(Version)-$(VersionSuffix)</Version>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,196 @@
{
"stac_version": "1.0.0",
"stac_extensions": [
"https://stac-extensions.github.io/eo/v1.0.0/schema.json",
"https://stac-extensions.github.io/processing/v1.0.0/schema.json",
"https://stac-extensions.github.io/projection/v1.0.0/schema.json",
"https://stac-extensions.github.io/raster/v1.0.0/schema.json",
"https://stac-extensions.github.io/sat/v1.0.0/schema.json",
"https://stac-extensions.github.io/view/v1.0.0/schema.json"
],
"type": "Feature",
"id": "4089411-0220-MUL-C-1-1-1139831-160712T150120-BR",
"geometry": {
"type": "Polygon",
"coordinates": [
[
[
-45.93664497,
-23.94659722
],
[
-45.75043403,
-23.91205729
],
[
-45.83607639,
-23.52220486
],
[
-46.02174913,
-23.55666016
],
[
-45.93664497,
-23.94659722
]
]
]
},
"properties": {
"datetime": "2016-07-12T15:01:20.0000000Z",
"created": "2023-02-21T13:53:27.0000000Z",
"platform": "bka",
"constellation": "bka",
"mission": "bka/kanopus-v",
"instruments": [
"mss"
],
"sensor_type": "optical",
"spectral_mode": "MUL",
"sat:platform_international_designator": "2012-039B",
"proj:epsg": 32723,
"proj:shape": [
4441,
2633
],
"view:incidence_angle": 1.65,
"view:sun_azimuth": 2.59,
"view:sun_elevation": 44.38,
"processing:level": "L1C",
"title": "BKA MSS L1C 2016-07-12 15:01:20",
"providers": [
{
"name": "NAS",
"description": "BKA (formerly known as BelKa 2) is a Belarusian remote sensing satellite developed under an agreement between the National Academy of Sciences of Belarus (NAS) and the Federal Space Agency of the Russian Federation. The BKA satellite is almost an exact copy of the Russian Kanopus-Vulkan N1 Environmental Satellite (Kanopus-V 1).",
"roles": [
"producer",
"processor",
"licensor"
],
"url": "https://gis.by/en/tech/bka/"
}
],
"licence": "proprietary",
"gsd": 10.59
},
"bbox": [
-46.02174913,
-23.94659722,
-45.75043403,
-23.52220486
],
"assets": {
"L1C_MUL": {
"type": "image/tiff; application=geotiff",
"roles": [
"data",
"dn"
],
"href": "data/4089411-0220-PAN-C-1-1-1139831-160712T150120-BR/925_bka_1028560/PRODUCT/4089411-0220-MUL-C-1-1-1139831-160712T150120-BR/4089411-0220-MUL-C-1-1-1139831-160712T150120-BR.tif",
"title": "L1C MUL",
"filename": "4089411-0220-MUL-C-1-1-1139831-160712T150120-BR.tif",
"eo:bands": [
{
"name": "MS1",
"common_name": "blue",
"center_wavelength": 0.492,
"full_width_half_max": 0.04
},
{
"name": "MS2",
"common_name": "green",
"center_wavelength": 0.558,
"full_width_half_max": 0.07
},
{
"name": "MS3",
"common_name": "red",
"center_wavelength": 0.675,
"full_width_half_max": 0.09
},
{
"name": "MS4",
"common_name": "nir",
"center_wavelength": 0.782,
"full_width_half_max": 0.1
}
],
"raster:bands": [
{
"data_type": "int8",
"offset": 0.0
},
{
"data_type": "int8",
"offset": 0.0
},
{
"data_type": "int8",
"offset": 0.0
},
{
"data_type": "int8",
"offset": 0.0
}
]
},
"metadata_MUL": {
"type": "application/xml",
"roles": [
"metadata"
],
"href": "data/4089411-0220-PAN-C-1-1-1139831-160712T150120-BR/925_bka_1028560/PRODUCT/4089411-0220-MUL-C-1-1-1139831-160712T150120-BR/4089411-0220-MUL-C-1-1-1139831-160712T150120-BR_pasp-en.xml",
"filename": "4089411-0220-MUL-C-1-1-1139831-160712T150120-BR_pasp-en.xml"
},
"overview_MUL": {
"type": "image/jpeg",
"roles": [
"overview"
],
"href": "data/4089411-0220-PAN-C-1-1-1139831-160712T150120-BR/925_bka_1028560/PRODUCT/4089411-0220-MUL-C-1-1-1139831-160712T150120-BR/4089411-0220-MUL-C-1-1-1139831-160712T150120-BR_preview.jpg",
"filename": "4089411-0220-MUL-C-1-1-1139831-160712T150120-BR_preview.jpg"
},
"L1C_PAN": {
"type": "image/tiff; application=geotiff",
"roles": [
"data",
"dn"
],
"href": "data/4089411-0220-PAN-C-1-1-1139831-160712T150120-BR/925_bka_1028560/PRODUCT/4089411-0220-PAN-C-1-1-1139831-160712T150120-BR/4089411-0220-PAN-C-1-1-1139831-160712T150120-BR.tif",
"title": "L1C PAN",
"filename": "4089411-0220-PAN-C-1-1-1139831-160712T150120-BR.tif",
"eo:bands": [
{
"name": "PAN",
"common_name": "pan",
"center_wavelength": 0.66,
"full_width_half_max": 0.208
}
],
"raster:bands": [
{
"data_type": "int8",
"offset": 0.0
}
]
},
"metadata_PAN": {
"type": "application/xml",
"roles": [
"metadata"
],
"href": "data/4089411-0220-PAN-C-1-1-1139831-160712T150120-BR/925_bka_1028560/PRODUCT/4089411-0220-PAN-C-1-1-1139831-160712T150120-BR/4089411-0220-PAN-C-1-1-1139831-160712T150120-BR_pasp-en.xml",
"filename": "4089411-0220-PAN-C-1-1-1139831-160712T150120-BR_pasp-en.xml"
},
"overview_PAN": {
"type": "image/jpeg",
"roles": [
"overview"
],
"href": "data/4089411-0220-PAN-C-1-1-1139831-160712T150120-BR/925_bka_1028560/PRODUCT/4089411-0220-PAN-C-1-1-1139831-160712T150120-BR/4089411-0220-PAN-C-1-1-1139831-160712T150120-BR_preview.jpg",
"filename": "4089411-0220-PAN-C-1-1-1139831-160712T150120-BR_preview.jpg"
}
},
"links": []
}
Original file line number Diff line number Diff line change
Expand Up @@ -144,4 +144,4 @@
}
},
"links": []
}
}
14 changes: 12 additions & 2 deletions src/Stars.Data/Model/Metadata/Bka/BkaMetadataExtractor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ protected override async Task<StacNode> ExtractMetadata(IItem item, string suffi
var tmpDestination = LocalFileDestination.Create(_fileSystem.Directory.CreateDirectory(Path.GetDirectoryName(topZipArchiveAsset.Uri.AbsolutePath)), item, true);
IAssetsContainer topZipAssets = await topZipArchiveAsset.ExtractToDestinationAsync(tmpDestination, _carrierManager, System.Threading.CancellationToken.None);

IAsset productZipAsset = GetProductZipAsset(topZipAssets);
IAsset productZipAsset = GetProductZipAsset(topZipAsset, topZipAssets);
if (productZipAsset != null)
{
ZipArchiveAsset productZipArchiveAsset = new ZipArchiveAsset(productZipAsset, logger, resourceServiceProvider, _fileSystem);
Expand All @@ -106,6 +106,11 @@ protected override async Task<StacNode> ExtractMetadata(IItem item, string suffi

IAsset[] metadataAssets = GetMetadataAssets(item, innerZipAssetContainers);

if (metadataAssets == null)
{
throw new Exception("No metadata assets found");
}

BkaMetadata[] metadata = await ReadMetadata(metadataAssets);

StacItem stacItem = CreateStacItem(metadata);
Expand Down Expand Up @@ -544,8 +549,13 @@ protected virtual IAsset GetTopZipAsset(IItem item)
return zipAsset;
}

protected virtual IAsset GetProductZipAsset(IAssetsContainer container)
protected virtual IAsset GetProductZipAsset(IAsset topAsset, IAssetsContainer container)
{
if (topAsset.Uri.AbsolutePath.EndsWith("PRODUCT.zip"))
{
return topAsset;
}

IAsset zipAsset = FindFirstAssetFromFileNameRegex(container, @"PRODUCT\.zip");
return zipAsset;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Stars.Data/Terradue.Stars.Data.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<ProjectName>Terradue.Stars.Data</ProjectName>
<Title>Terradue.Stars.Data</Title>
<Description>Collection of data Plugins for Terradue.Stars</Description>
<Version>2.19.0</Version>
<Version>2.19.2</Version>
<!-- <VersionSuffix>beta.8</VersionSuffix> -->
<Version Condition=" '$(VersionSuffix)' != '' ">$(Version)-$(VersionSuffix)</Version>
<NoWarn>NU1603</NoWarn>
Expand Down
1 change: 1 addition & 0 deletions src/Stars.Services/Resources/AmazonCustomS3Config.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ internal void ForceCustomRegion(string region)
internal void SetServiceURL(string serviceURL)
{
_serviceURL = serviceURL;
this.ServiceURL = _serviceURL;
}
}
}
7 changes: 2 additions & 5 deletions src/Stars.Services/Resources/S3ClientFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -350,11 +350,8 @@ private static AmazonCustomS3Config CreateS3Configuration(AWSOptions options)
{
config.RegionEndpoint = options.Region;
}
else
{
config.SetServiceURL(defaultConfig.ServiceURL);
}
}
config.SetServiceURL(defaultConfig.ServiceURL);

return config;
}
Expand All @@ -380,7 +377,7 @@ public async Task<AWSCredentials> GetWebIdentityCredentialsAsync(string serviceU
var assumeRoleResult = await stsClient.AssumeRoleWithWebIdentityAsync(new AssumeRoleWithWebIdentityRequest
{
WebIdentityToken = jwt.RawData,
RoleArn = "arn:aws:iam::123456789012:role/RoleForTerradue",
// RoleArn = "arn:aws:iam::123456789012:role/RoleForTerradue",
RoleSessionName = "MySession",
DurationSeconds = 3600,
Policy = policy
Expand Down
Loading

0 comments on commit 89d49ab

Please sign in to comment.