Changes for NewSat and WorldView metadata extraction

Terradue · Jan 9, 2025 · 85983a8 · 85983a8
1 parent 28e9466
commit 85983a8
Show file tree

Hide file tree

Showing 23 changed files with 3,237 additions and 24 deletions.
diff --git a/src/Stars.Console/Operations/CopyOperation.cs b/src/Stars.Console/Operations/CopyOperation.cs
@@ -10,6 +10,7 @@
 using System.Threading.Tasks;
 using McMaster.Extensions.CommandLineUtils;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using Stac;
 using Terradue.Stars.Interface;
@@ -192,7 +193,7 @@ private async Task<object> CopyItemAsync(IItem item, IRouter router, object stat
                     throw new InvalidDataException(string.Format("Impossible to translate item {0} into STAC.", item.Uri));
             }
 
-            logger.Output(string.Format("Copy item {0} from {1}", stacItemNode.Id, item.Uri));
+            logger.LogInformation(string.Format("Copy item {0} from {1}", stacItemNode.Id, item.Uri));
 
             // We update the destination in case a new router updated the route
             IDestination destination = operationState.CurrentDestination.To(stacItemNode);
@@ -224,14 +225,14 @@ private async Task<object> CopyItemAsync(IItem item, IRouter router, object stat
                 IResource supplierNode = null;
                 try
                 {
-                    logger.Output(string.Format("[{0}] Searching for {1}", supplier.Value.Id, stacItemNode.Uri.ToString()));
+                    logger.LogInformation(string.Format("[{0}] Searching for {1}", supplier.Value.Id, stacItemNode.Uri.ToString()));
                     supplierNode = await supplier.Value.SearchForAsync(stacItemNode, ct);
                     if (supplierNode == null && supplierNode is not IAssetsContainer)
                     {
-                        logger.Output(string.Format("[{0}] --> no supply possible", supplier.Value.Id));
+                        logger.LogInformation(string.Format("[{0}] --> no supply possible", supplier.Value.Id));
                         continue;
                     }
-                    logger.Output(string.Format("[{0}] resource found at {1} [{2}]", supplier.Value.Id, supplierNode.Uri, supplierNode.ContentType));
+                    logger.LogInformation(string.Format("[{0}] resource found at {1} [{2}]", supplier.Value.Id, supplierNode.Uri, supplierNode.ContentType));
                 }
                 catch (Exception e)
                 {
@@ -281,7 +282,7 @@ private async Task<object> CopyCollectionAsync(ICollection collection, IRouter r
                     throw new InvalidDataException(string.Format("Impossible to translate item {0} into STAC.", collection.Uri));
             }
 
-            logger.Output(string.Format("Copy collection {0} from {1}", stacCollectionNode.Id, collection.Uri));
+            logger.LogInformation(string.Format("Copy collection {0} from {1}", stacCollectionNode.Id, collection.Uri));
 
             // We update the destination in case a new router updated the route
             IDestination destination = operationState.CurrentDestination.To(stacCollectionNode);

diff --git a/...Tests/Resources/SATELLOGIC/NEWSAT/MetadataExtractorsTests_20220320_112827_SN20_L1_SR.json b/...Tests/Resources/SATELLOGIC/NEWSAT/MetadataExtractorsTests_20220320_112827_SN20_L1_SR.json
@@ -380,7 +380,7 @@
       "roles": [
         "visual"
       ],
-      "title": "3-Band Visual",
+      "title": "3-Band Visual (L3)",
       "href": "data/Flood_Mozambique-product/rasters/20220320_112827_SN20_L3_SR_MS_0.tif",
       "eo:bands": [
         {

diff --git a/...Tests/Resources/SATELLOGIC/NEWSAT/MetadataExtractorsTests_20231030_200817_SN29_L1_SR.json b/...Tests/Resources/SATELLOGIC/NEWSAT/MetadataExtractorsTests_20231030_200817_SN29_L1_SR.json
@@ -375,7 +375,7 @@
       "roles": [
         "visual"
       ],
-      "title": "3-Band Visual",
+      "title": "3-Band Visual (L3)",
       "href": "data/Landslide_Storm_Hurricane_in_Mexico_6-product/rasters/20231030_200817_SN29_L3_SR_MS_0.tif",
       "eo:bands": [
         {

diff --git a/...Tests/Resources/SATELLOGIC/NEWSAT/MetadataExtractorsTests_20240314_172620_SN30_L1_SR.json b/...Tests/Resources/SATELLOGIC/NEWSAT/MetadataExtractorsTests_20240314_172620_SN30_L1_SR.json
@@ -179,7 +179,7 @@
       "roles": [
         "visual"
       ],
-      "title": "3-Band Visual",
+      "title": "3-Band Visual (L3)",
       "href": "data/20240314_172620_SN30_L1_SR/20240314_172620_SN30_L3_SR_MS_0.tif",
       "eo:bands": [
         {