From 5bea552240ea6d949d31b0de0983a158f7b08a5a Mon Sep 17 00:00:00 2001 From: mlongobardo-gituname Date: Wed, 20 Mar 2024 12:41:17 +0100 Subject: [PATCH 1/6] tryAdd additional handlings --- .../Gaofen1-2-4/GaofenMetadataExtractor.cs | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Stars.Data/Model/Metadata/Gaofen1-2-4/GaofenMetadataExtractor.cs b/src/Stars.Data/Model/Metadata/Gaofen1-2-4/GaofenMetadataExtractor.cs index d38fc63b..3a5a1147 100644 --- a/src/Stars.Data/Model/Metadata/Gaofen1-2-4/GaofenMetadataExtractor.cs +++ b/src/Stars.Data/Model/Metadata/Gaofen1-2-4/GaofenMetadataExtractor.cs @@ -245,8 +245,8 @@ private async Task AddAssetAsync(StacItem stacItem, string satelliteId, IAsset a // overview if (filename.EndsWith("-MSS1.jpg", true, CultureInfo.InvariantCulture) || filename.EndsWith("-MSS2.jpg", true, CultureInfo.InvariantCulture)) { - stacItem.Assets.TryAdd("MSS-overview", - GetGenericAsset(stacItem, asset.Uri, "overview")); + if (stacItem.Assets.TryAdd("MSS-overview", + GetGenericAsset(stacItem, asset.Uri, "overview"))) stacItem.Assets["MSS-overview"].Properties.AddRange(asset.Properties); return; } @@ -263,16 +263,16 @@ private async Task AddAssetAsync(StacItem stacItem, string satelliteId, IAsset a if (satelliteImagery == null && filename.StartsWith("GF1", true, CultureInfo.InvariantCulture) && filename.EndsWith(".jpg", true, CultureInfo.InvariantCulture)) { - stacItem.Assets.TryAdd("MSS-overview", - GetGenericAsset(stacItem, asset.Uri, "overview")); + if (stacItem.Assets.TryAdd("MSS-overview", + GetGenericAsset(stacItem, asset.Uri, "overview"))) stacItem.Assets["MSS-overview"].Properties.AddRange(asset.Properties); return; } if (filename.StartsWith("GF4", true, CultureInfo.InvariantCulture) && filename.EndsWith(".jpg", true, CultureInfo.InvariantCulture)) { - stacItem.Assets.TryAdd($"{type}-overview", - GetGenericAsset(stacItem, asset.Uri, "overview")); + if(stacItem.Assets.TryAdd($"{type}-overview", + GetGenericAsset(stacItem, asset.Uri, "overview"))) stacItem.Assets[$"{type}-overview"].Properties.AddRange(asset.Properties); return; } @@ -305,8 +305,8 @@ private async Task AddAssetAsync(StacItem stacItem, string satelliteId, IAsset a if (filename.StartsWith("GF4", true, CultureInfo.InvariantCulture) && filename.EndsWith(".xml", true, CultureInfo.InvariantCulture)) { - stacItem.Assets.TryAdd($"{type}-metadata", - GetGenericAsset(stacItem, asset.Uri, "metadata")); + if(stacItem.Assets.TryAdd($"{type}-metadata", + GetGenericAsset(stacItem, asset.Uri, "metadata"))) stacItem.Assets[$"{type}-metadata"].Properties.AddRange(asset.Properties); return; } @@ -339,8 +339,8 @@ private async Task AddAssetAsync(StacItem stacItem, string satelliteId, IAsset a if (filename.StartsWith("GF4", true, CultureInfo.InvariantCulture) && filename.EndsWith(".rpb", true, CultureInfo.InvariantCulture)) { - stacItem.Assets.TryAdd($"{type}-rpb", - GetGenericAsset(stacItem, asset.Uri, "metadata")); + if(stacItem.Assets.TryAdd($"{type}-rpb", + GetGenericAsset(stacItem, asset.Uri, "metadata"))) stacItem.Assets[$"{type}-rpb"].Properties.AddRange(asset.Properties); return; } From 095b77c8dfce0417aecda2b5844be1d7c1d584a8 Mon Sep 17 00:00:00 2001 From: mlongobardo-gituname Date: Wed, 20 Mar 2024 13:17:18 +0100 Subject: [PATCH 2/6] + adds vi --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 27731c54..7e47af1f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,9 +18,9 @@ RUN dotnet publish -c release -o /app -r linux-x64 -f net6.0 --self-contained tr # final stage/image FROM mcr.microsoft.com/dotnet/runtime-deps:6.0-bullseye-slim-amd64 -RUN apt-get update \ +RUN apt-get update -qy \ && apt-get upgrade -y \ - && apt-get install -y hdf5-tools libssl1.1 libgssapi-krb5-2 ca-certificates jq curl \ + && apt-get install -y hdf5-tools libssl1.1 libgssapi-krb5-2 ca-certificates jq curl vi \ && rm -rf /var/lib/apt/lists/* /tmp/* WORKDIR /app From 3055aed021f668f62f7129280b4478dd61f4fe00 Mon Sep 17 00:00:00 2001 From: mlongobardo-gituname Date: Wed, 20 Mar 2024 13:20:29 +0100 Subject: [PATCH 3/6] bim pkg --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7e47af1f..8b4634af 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ FROM mcr.microsoft.com/dotnet/runtime-deps:6.0-bullseye-slim-amd64 RUN apt-get update -qy \ && apt-get upgrade -y \ - && apt-get install -y hdf5-tools libssl1.1 libgssapi-krb5-2 ca-certificates jq curl vi \ + && apt-get install -y hdf5-tools libssl1.1 libgssapi-krb5-2 ca-certificates jq curl vim \ && rm -rf /var/lib/apt/lists/* /tmp/* WORKDIR /app From 7ab812139a21af94c2722867aa5472db4b4985b7 Mon Sep 17 00:00:00 2001 From: mlongobardo-gituname Date: Wed, 20 Mar 2024 13:54:03 +0100 Subject: [PATCH 4/6] also for metadata --- .../Model/Metadata/Gaofen1-2-4/GaofenMetadataExtractor.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Stars.Data/Model/Metadata/Gaofen1-2-4/GaofenMetadataExtractor.cs b/src/Stars.Data/Model/Metadata/Gaofen1-2-4/GaofenMetadataExtractor.cs index 3a5a1147..2d3fe1eb 100644 --- a/src/Stars.Data/Model/Metadata/Gaofen1-2-4/GaofenMetadataExtractor.cs +++ b/src/Stars.Data/Model/Metadata/Gaofen1-2-4/GaofenMetadataExtractor.cs @@ -280,8 +280,8 @@ private async Task AddAssetAsync(StacItem stacItem, string satelliteId, IAsset a // metadata if (filename.EndsWith("-MSS1.xml", true, CultureInfo.InvariantCulture) || filename.EndsWith("-MSS2.xml", true, CultureInfo.InvariantCulture)) { - stacItem.Assets.Add("MSS-metadata", - GetGenericAsset(stacItem, asset.Uri, "metadata")); + if (stacItem.Assets.TryAdd("MSS-metadata", + GetGenericAsset(stacItem, asset.Uri, "metadata"))) stacItem.Assets["MSS-metadata"].Properties.AddRange(asset.Properties); return; } @@ -297,8 +297,8 @@ private async Task AddAssetAsync(StacItem stacItem, string satelliteId, IAsset a if (satelliteImagery == null && filename.StartsWith("GF1", true, CultureInfo.InvariantCulture) && filename.EndsWith(".xml", true, CultureInfo.InvariantCulture)) { - stacItem.Assets.Add("MSS-metadata", - GetGenericAsset(stacItem, asset.Uri, "metadata")); + if (stacItem.Assets.TryAdd("MSS-metadata", + GetGenericAsset(stacItem, asset.Uri, "metadata"))) stacItem.Assets["MSS-metadata"].Properties.AddRange(asset.Properties); return; } From 0ed774d373717a362c2793f3e0013dccaacd5392 Mon Sep 17 00:00:00 2001 From: mlongobardo-gituname Date: Thu, 21 Mar 2024 11:56:16 +0100 Subject: [PATCH 5/6] cosmetics --- .../Model/Metadata/Gaofen1-2-4/GaofenMetadataExtractor.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Stars.Data/Model/Metadata/Gaofen1-2-4/GaofenMetadataExtractor.cs b/src/Stars.Data/Model/Metadata/Gaofen1-2-4/GaofenMetadataExtractor.cs index 2d3fe1eb..a56effce 100644 --- a/src/Stars.Data/Model/Metadata/Gaofen1-2-4/GaofenMetadataExtractor.cs +++ b/src/Stars.Data/Model/Metadata/Gaofen1-2-4/GaofenMetadataExtractor.cs @@ -116,7 +116,7 @@ private StacItem GetStacItemWithProperties(ProductMetaData productMetadata, stri private void AddProjStacExtension(ProductMetaData productMetaData, StacItem stacItem) { ProjectionStacExtension proj = stacItem.ProjectionExtension(); - if(!string.IsNullOrEmpty(productMetaData.MapProjection) && productMetaData.MapProjection == "WGS84"){ + if (!string.IsNullOrEmpty(productMetaData.MapProjection) && productMetaData.MapProjection == "WGS84") { proj.SetCoordinateSystem(ProjNet.CoordinateSystems.GeocentricCoordinateSystem.WGS84); } else { @@ -271,7 +271,7 @@ private async Task AddAssetAsync(StacItem stacItem, string satelliteId, IAsset a if (filename.StartsWith("GF4", true, CultureInfo.InvariantCulture) && filename.EndsWith(".jpg", true, CultureInfo.InvariantCulture)) { - if(stacItem.Assets.TryAdd($"{type}-overview", + if (stacItem.Assets.TryAdd($"{type}-overview", GetGenericAsset(stacItem, asset.Uri, "overview"))) stacItem.Assets[$"{type}-overview"].Properties.AddRange(asset.Properties); return; @@ -305,7 +305,7 @@ private async Task AddAssetAsync(StacItem stacItem, string satelliteId, IAsset a if (filename.StartsWith("GF4", true, CultureInfo.InvariantCulture) && filename.EndsWith(".xml", true, CultureInfo.InvariantCulture)) { - if(stacItem.Assets.TryAdd($"{type}-metadata", + if (stacItem.Assets.TryAdd($"{type}-metadata", GetGenericAsset(stacItem, asset.Uri, "metadata"))) stacItem.Assets[$"{type}-metadata"].Properties.AddRange(asset.Properties); return; @@ -339,7 +339,7 @@ private async Task AddAssetAsync(StacItem stacItem, string satelliteId, IAsset a if (filename.StartsWith("GF4", true, CultureInfo.InvariantCulture) && filename.EndsWith(".rpb", true, CultureInfo.InvariantCulture)) { - if(stacItem.Assets.TryAdd($"{type}-rpb", + if (stacItem.Assets.TryAdd($"{type}-rpb", GetGenericAsset(stacItem, asset.Uri, "metadata"))) stacItem.Assets[$"{type}-rpb"].Properties.AddRange(asset.Properties); return; From 3c6eae698a6b69d8bae8ab57a1f7f76130549ee1 Mon Sep 17 00:00:00 2001 From: floeschau Date: Thu, 21 Mar 2024 12:34:40 +0100 Subject: [PATCH 6/6] Corrected indentation in if execution block --- .../Gaofen1-2-4/GaofenMetadataExtractor.cs | 87 +++++++++---------- 1 file changed, 41 insertions(+), 46 deletions(-) diff --git a/src/Stars.Data/Model/Metadata/Gaofen1-2-4/GaofenMetadataExtractor.cs b/src/Stars.Data/Model/Metadata/Gaofen1-2-4/GaofenMetadataExtractor.cs index a56effce..8de9dfca 100644 --- a/src/Stars.Data/Model/Metadata/Gaofen1-2-4/GaofenMetadataExtractor.cs +++ b/src/Stars.Data/Model/Metadata/Gaofen1-2-4/GaofenMetadataExtractor.cs @@ -209,17 +209,17 @@ private async Task AddAssetAsync(StacItem stacItem, string satelliteId, IAsset a if (filename.EndsWith("-MSS1_thumb.jpg", true, CultureInfo.InvariantCulture) || filename.EndsWith("-MSS2_thumb.jpg", true, CultureInfo.InvariantCulture) ) { - if (stacItem.Assets.TryAdd("MSS-thumbnail", - GetGenericAsset(stacItem, asset.Uri, "thumbnail"))) - stacItem.Assets["MSS-thumbnail"].Properties.AddRange(asset.Properties); + if (stacItem.Assets.TryAdd("MSS-thumbnail", GetGenericAsset(stacItem, asset.Uri, "thumbnail"))) { + stacItem.Assets["MSS-thumbnail"].Properties.AddRange(asset.Properties); + } return; } if (filename.EndsWith("-PAN1_thumb.jpg", true, CultureInfo.InvariantCulture) || filename.EndsWith("-PAN2_thumb.jpg", true, CultureInfo.InvariantCulture)) { - if (stacItem.Assets.TryAdd("PAN-thumbnail", - GetGenericAsset(stacItem, asset.Uri, "thumbnail"))) - stacItem.Assets["PAN-thumbnail"].Properties.AddRange(asset.Properties); + if (stacItem.Assets.TryAdd("PAN-thumbnail", GetGenericAsset(stacItem, asset.Uri, "thumbnail"))) { + stacItem.Assets["PAN-thumbnail"].Properties.AddRange(asset.Properties); + } return; } @@ -228,26 +228,26 @@ private async Task AddAssetAsync(StacItem stacItem, string satelliteId, IAsset a if (satelliteImagery == null && filename.StartsWith("GF1", true, CultureInfo.InvariantCulture) && filename.EndsWith("thumb.jpg", true, CultureInfo.InvariantCulture)) { - if (stacItem.Assets.TryAdd("MSS-thumbnail", - GetGenericAsset(stacItem, asset.Uri, "thumbnail"))) - stacItem.Assets["MSS-thumbnail"].Properties.AddRange(asset.Properties); + if (stacItem.Assets.TryAdd("MSS-thumbnail", GetGenericAsset(stacItem, asset.Uri, "thumbnail"))) { + stacItem.Assets["MSS-thumbnail"].Properties.AddRange(asset.Properties); + } return; } if (filename.StartsWith("GF4", true, CultureInfo.InvariantCulture) && filename.EndsWith("thumb.jpg", true, CultureInfo.InvariantCulture)) { - if (stacItem.Assets.TryAdd($"{type}-thumbnail", - GetGenericAsset(stacItem, asset.Uri, "thumbnail"))) - stacItem.Assets[$"{type}-thumbnail"].Properties.AddRange(asset.Properties); + if (stacItem.Assets.TryAdd($"{type}-thumbnail", GetGenericAsset(stacItem, asset.Uri, "thumbnail"))) { + stacItem.Assets[$"{type}-thumbnail"].Properties.AddRange(asset.Properties); + } return; } // overview if (filename.EndsWith("-MSS1.jpg", true, CultureInfo.InvariantCulture) || filename.EndsWith("-MSS2.jpg", true, CultureInfo.InvariantCulture)) { - if (stacItem.Assets.TryAdd("MSS-overview", - GetGenericAsset(stacItem, asset.Uri, "overview"))) - stacItem.Assets["MSS-overview"].Properties.AddRange(asset.Properties); + if (stacItem.Assets.TryAdd("MSS-overview", GetGenericAsset(stacItem, asset.Uri, "overview"))) { + stacItem.Assets["MSS-overview"].Properties.AddRange(asset.Properties); + } return; } @@ -263,33 +263,32 @@ private async Task AddAssetAsync(StacItem stacItem, string satelliteId, IAsset a if (satelliteImagery == null && filename.StartsWith("GF1", true, CultureInfo.InvariantCulture) && filename.EndsWith(".jpg", true, CultureInfo.InvariantCulture)) { - if (stacItem.Assets.TryAdd("MSS-overview", - GetGenericAsset(stacItem, asset.Uri, "overview"))) - stacItem.Assets["MSS-overview"].Properties.AddRange(asset.Properties); + if (stacItem.Assets.TryAdd("MSS-overview", GetGenericAsset(stacItem, asset.Uri, "overview"))) { + stacItem.Assets["MSS-overview"].Properties.AddRange(asset.Properties); + } return; } if (filename.StartsWith("GF4", true, CultureInfo.InvariantCulture) && filename.EndsWith(".jpg", true, CultureInfo.InvariantCulture)) { - if (stacItem.Assets.TryAdd($"{type}-overview", - GetGenericAsset(stacItem, asset.Uri, "overview"))) - stacItem.Assets[$"{type}-overview"].Properties.AddRange(asset.Properties); + if (stacItem.Assets.TryAdd($"{type}-overview", GetGenericAsset(stacItem, asset.Uri, "overview"))) { + stacItem.Assets[$"{type}-overview"].Properties.AddRange(asset.Properties); + } return; } // metadata if (filename.EndsWith("-MSS1.xml", true, CultureInfo.InvariantCulture) || filename.EndsWith("-MSS2.xml", true, CultureInfo.InvariantCulture)) { - if (stacItem.Assets.TryAdd("MSS-metadata", - GetGenericAsset(stacItem, asset.Uri, "metadata"))) - stacItem.Assets["MSS-metadata"].Properties.AddRange(asset.Properties); + if (stacItem.Assets.TryAdd("MSS-metadata", GetGenericAsset(stacItem, asset.Uri, "metadata"))) { + stacItem.Assets["MSS-metadata"].Properties.AddRange(asset.Properties); + } return; } - if (filename.EndsWith("-PAN1.xml", true, CultureInfo.InvariantCulture) || - filename.EndsWith("-PAN2.xml", true, CultureInfo.InvariantCulture)) { - stacItem.Assets.Add("PAN-metadata", - GetGenericAsset(stacItem, asset.Uri, "metadata")); + if (filename.EndsWith("-PAN1.xml", true, CultureInfo.InvariantCulture) + || filename.EndsWith("-PAN2.xml", true, CultureInfo.InvariantCulture)) { + stacItem.Assets.Add("PAN-metadata", GetGenericAsset(stacItem, asset.Uri, "metadata")); stacItem.Assets["PAN-metadata"].Properties.AddRange(asset.Properties); return; } @@ -297,33 +296,31 @@ private async Task AddAssetAsync(StacItem stacItem, string satelliteId, IAsset a if (satelliteImagery == null && filename.StartsWith("GF1", true, CultureInfo.InvariantCulture) && filename.EndsWith(".xml", true, CultureInfo.InvariantCulture)) { - if (stacItem.Assets.TryAdd("MSS-metadata", - GetGenericAsset(stacItem, asset.Uri, "metadata"))) - stacItem.Assets["MSS-metadata"].Properties.AddRange(asset.Properties); + if (stacItem.Assets.TryAdd("MSS-metadata", GetGenericAsset(stacItem, asset.Uri, "metadata"))) { + stacItem.Assets["MSS-metadata"].Properties.AddRange(asset.Properties); + } return; } if (filename.StartsWith("GF4", true, CultureInfo.InvariantCulture) && filename.EndsWith(".xml", true, CultureInfo.InvariantCulture)) { - if (stacItem.Assets.TryAdd($"{type}-metadata", - GetGenericAsset(stacItem, asset.Uri, "metadata"))) - stacItem.Assets[$"{type}-metadata"].Properties.AddRange(asset.Properties); + if (stacItem.Assets.TryAdd($"{type}-metadata", GetGenericAsset(stacItem, asset.Uri, "metadata"))) { + stacItem.Assets[$"{type}-metadata"].Properties.AddRange(asset.Properties); + } return; } // rpb metadata if (filename.EndsWith("-MSS1.rpb", true, CultureInfo.InvariantCulture) || filename.EndsWith("-MSS2.rpb", true, CultureInfo.InvariantCulture)) { - stacItem.Assets.Add("MSS-rpb", - GetGenericAsset(stacItem, asset.Uri, "metadata")); + stacItem.Assets.Add("MSS-rpb", GetGenericAsset(stacItem, asset.Uri, "metadata")); stacItem.Assets["MSS-rpb"].Properties.AddRange(asset.Properties); return; } if (filename.EndsWith("-PAN1.rpb", true, CultureInfo.InvariantCulture) || filename.EndsWith("-PAN2.rpb", true, CultureInfo.InvariantCulture)) { - stacItem.Assets.Add("PAN-rpb", - GetGenericAsset(stacItem, asset.Uri, "metadata")); + stacItem.Assets.Add("PAN-rpb", GetGenericAsset(stacItem, asset.Uri, "metadata")); stacItem.Assets["PAN-rpb"].Properties.AddRange(asset.Properties); return; } @@ -331,17 +328,16 @@ private async Task AddAssetAsync(StacItem stacItem, string satelliteId, IAsset a if (satelliteImagery == null && filename.StartsWith("GF1", true, CultureInfo.InvariantCulture) && filename.EndsWith(".rpb", true, CultureInfo.InvariantCulture)) { - stacItem.Assets.Add("MSS-rpb", - GetGenericAsset(stacItem, asset.Uri, "metadata")); + stacItem.Assets.Add("MSS-rpb", GetGenericAsset(stacItem, asset.Uri, "metadata")); stacItem.Assets["MSS-rpb"].Properties.AddRange(asset.Properties); return; } if (filename.StartsWith("GF4", true, CultureInfo.InvariantCulture) && filename.EndsWith(".rpb", true, CultureInfo.InvariantCulture)) { - if (stacItem.Assets.TryAdd($"{type}-rpb", - GetGenericAsset(stacItem, asset.Uri, "metadata"))) - stacItem.Assets[$"{type}-rpb"].Properties.AddRange(asset.Properties); + if (stacItem.Assets.TryAdd($"{type}-rpb", GetGenericAsset(stacItem, asset.Uri, "metadata"))) { + stacItem.Assets[$"{type}-rpb"].Properties.AddRange(asset.Properties); + } return; } @@ -800,8 +796,7 @@ private StacAsset GetGenericAsset(StacItem stacItem, Uri uri, string role) { private void AddOtherProperties(ProductMetaData productMetadata, StacItem stacItem) { stacItem.Properties.Add("product_type", "PAN_MS_" + productMetadata.ProductLevel.Replace("LEVEL", "L")); - if (IncludeProviderProperty) - { + if (IncludeProviderProperty) { AddSingleProvider( stacItem.Properties, "CNSA", @@ -967,4 +962,4 @@ private void FillInstrument(ProductMetaData productMetadata, properties.Add("gsd", gsd); } } -} \ No newline at end of file +}