Merge branch 'release/0.8.8'

Terradue · Jun 8, 2021 · 9cc8034 · 9cc8034
2 parents c088180 + 6480f80
commit 9cc8034
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -574,7 +574,7 @@
             "program": "${workspaceFolder}/src/Stars.Console/bin/Debug/netcoreapp3.1/Stars.dll",
             "args": [
                 "copy",
-                "https://resource-catalogue.185.52.193.87.nip.io/?mode=opensearch&service=CSW&version=3.0.0&request=GetRecords&elementsetname=full&resulttype=results&typenames=csw:Record&recordids=S2B_MSIL2A_20200902T090559_N0214_R050_T34SFH_20200902T113910.SAFE",
+                "https://catalog.charter.uat.esaportal.eu//charter/cat/[chartercalibrateddataset,%7Bcallid857%7D,mission_worldview_3]/search?format=atom&uid=call857_WV03S00_875416E119_8883332018100200000000MS00-calibrated&do=[terradue]",
                 "-v",
                 "-r",
                 "4",
@@ -603,7 +603,6 @@
                 "-v",
                 "-r",
                 "4",
-                "-k",
                 "--output",
                 "/tmp/charter"
             ],

diff --git a/src/Stars.Console/Operations/CopyOperation.cs b/src/Stars.Console/Operations/CopyOperation.cs
@@ -76,6 +76,8 @@ internal class CopyOperation : BaseOperation
         [Option("-af|--asset-filter", "Asset filters to match to be included in the copy (default to all)", CommandOptionType.MultipleValue)]
         public string[] AssetsFilters { get; set; }
 
+        [Option("--empty", "Empty argument", CommandOptionType.NoValue)]
+        public bool Empty { get; set; }
 
         private RouterService routingService;
         private CarrierManager carrierManager;

diff --git a/src/Stars.Services/StarsServiceCollectionExtensions.cs b/src/Stars.Services/StarsServiceCollectionExtensions.cs
@@ -122,7 +122,7 @@ public static IServiceCollection LoadBasePlugins(this IServiceCollection service
             services.AddTransient<AssetService, AssetService>();
             // Processing Service
             services.AddTransient<ProcessingService, ProcessingService>();
-
+            services.AddTransient<ITranslator, StacLinkTranslator>();
             services.AddTransient<ITranslator, DefaultStacTranslator>();
 
             return services;

diff --git a/src/Stars.Services/Translator/StacLinkTranslator.cs b/src/Stars.Services/Translator/StacLinkTranslator.cs
@@ -53,7 +53,8 @@ public async Task<T> Translate<T>(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/geo+json"))
+                    foreach (IResourceLink stacLink in links.Where(l => l.Relationship == "alternate" && 
+                                (l.ContentType?.MediaType == "application/json" || l.ContentType?.MediaType == "application/geo+json")))
                     {
                         try
                         {