From a1b10c687ccdfa45ceb7539b1c02e215514f3b14 Mon Sep 17 00:00:00 2001 From: Emmanuel Mathot Date: Mon, 7 Jun 2021 12:32:10 +0200 Subject: [PATCH 1/2] fixed stage-in from linked stac --- .vscode/launch.json | 2 +- src/Stars.Console/Operations/CopyOperation.cs | 2 ++ src/Stars.Services/Translator/StacLinkTranslator.cs | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 36cfebaf..ded24d60 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -418,7 +418,7 @@ "program": "${workspaceFolder}/src/Stars.Console/bin/Debug/netcoreapp3.1/Stars.dll", "args": [ "copy", - "https://catalog.charter.uat.esaportal.eu/charter/search?format=atom&uid=802-TSX1_SAR__EEC_RE___SM_S_SRA_20160324T215413_20160324T215421E", + "https://catalog.charter.uat.esaportal.eu//charter/cat/charterdataset/search?format=atom&uid=call100_AB0009e5_001_MUL_L1T", "-v", "-r", "4", diff --git a/src/Stars.Console/Operations/CopyOperation.cs b/src/Stars.Console/Operations/CopyOperation.cs index 489cc0ae..e2425202 100644 --- a/src/Stars.Console/Operations/CopyOperation.cs +++ b/src/Stars.Console/Operations/CopyOperation.cs @@ -272,6 +272,8 @@ private async Task CopyNode(IResource node, IRouter router, object state private AssetFilters CreateAssetFiltersFromOptions() { AssetFilters assetFilters = new AssetFilters(); + if ( AssetsFilters == null ) + return assetFilters; Regex propertyRegex = new Regex(@"^\{(?'key'[\w:]*)\}(?'value'.*)$"); foreach (var assetName in AssetsFilters) { diff --git a/src/Stars.Services/Translator/StacLinkTranslator.cs b/src/Stars.Services/Translator/StacLinkTranslator.cs index 84697d38..fab7daeb 100644 --- a/src/Stars.Services/Translator/StacLinkTranslator.cs +++ b/src/Stars.Services/Translator/StacLinkTranslator.cs @@ -53,7 +53,7 @@ public async Task Translate(IResource route) where T : IResource if (itemNode != null) { var links = itemNode.GetLinks(); - foreach (IResourceLink stacLink in links.Where(l => l.Relationship == "alternate" && l.ContentType?.MediaType == "application/json")) + foreach (IResourceLink stacLink in links.Where(l => l.Relationship == "alternate" && l.ContentType?.MediaType == "application/geo+json")) { try { From 1964d2db9bed1d056eef233cefe6333b58d0256d Mon Sep 17 00:00:00 2001 From: Emmanuel Mathot Date: Mon, 7 Jun 2021 12:32:46 +0200 Subject: [PATCH 2/2] ready to pack 0.8.7 --- src/Stars.Console/Terradue.Stars.Console.csproj | 2 +- src/Stars.Services/Terradue.Stars.Services.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Stars.Console/Terradue.Stars.Console.csproj b/src/Stars.Console/Terradue.Stars.Console.csproj index 709510d2..c805706c 100644 --- a/src/Stars.Console/Terradue.Stars.Console.csproj +++ b/src/Stars.Console/Terradue.Stars.Console.csproj @@ -2,7 +2,7 @@ Exe netcoreapp3.1;net5.0 - 0.8.6 + 0.8.7 $(Version)-$(VersionSuffix) $(VersionSuffix) Stars diff --git a/src/Stars.Services/Terradue.Stars.Services.csproj b/src/Stars.Services/Terradue.Stars.Services.csproj index c33a9d77..3102f28a 100644 --- a/src/Stars.Services/Terradue.Stars.Services.csproj +++ b/src/Stars.Services/Terradue.Stars.Services.csproj @@ -3,7 +3,7 @@ netstandard2.1 Terradue.Stars Stars is a set of services for working with Spatio Temporal Catalog such as STAC but not only - 0.8.6 + 0.8.7 Terradue.Stars.Services Terradue.Stars