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.

Sign up for GitHub

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

tryAdd additional handlings #51

Merged
merged 6 commits into from
Mar 21, 2024
Merged

tryAdd additional handlings #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5bea552
tryAdd additional handlings
Mar 20, 2024
095b77c
+ adds vi
Mar 20, 2024
3055aed
bim pkg
Mar 20, 2024
7ab8121
also for metadata
Mar 20, 2024
0ed774d
cosmetics
Mar 21, 2024
3c6eae6
Corrected indentation in if execution block
floeschau Mar 21, 2024
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
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 vim \
&& rm -rf /var/lib/apt/lists/* /tmp/*

WORKDIR /app
Expand Down
89 changes: 42 additions & 47 deletions src/Stars.Data/Model/Metadata/Gaofen1-2-4/GaofenMetadataExtractor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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;
}

Expand All @@ -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)) {
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;
}

Expand All @@ -263,85 +263,81 @@ 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"));
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)) {
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)) {
stacItem.Assets.Add("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;
}

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"));
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)) {
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;
}

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)) {
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;
}

Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -967,4 +962,4 @@ private void FillInstrument(ProductMetaData productMetadata,
properties.Add("gsd", gsd);
}
}
}
}
Loading