Merge branch 'release/2.25.7'

Terradue · Jan 10, 2025 · 3e89ec4 · 3e89ec4
2 parents 198d053 + 9e6c1f5
commit 3e89ec4
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 9 deletions.
diff --git a/src/Stars.Console/Terradue.Stars.Console.csproj b/src/Stars.Console/Terradue.Stars.Console.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFrameworks>net6.0</TargetFrameworks>
-    <Version>2.25.6</Version>
+    <Version>2.25.7</Version>
     <!-- <VersionSuffix>beta.8</VersionSuffix> -->
     <Description>Stars is a CLI for working with Spatio Temporal Catalog such as STAC but not only</Description>
     <Version Condition=" '$(VersionSuffix)' != '' ">$(Version)-$(VersionSuffix)</Version>

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
@@ -297,7 +297,7 @@
     ]
   },
   "properties": {
-    "title": "NEWSAT MS L1 2022-03-20 11:28:27",
+    "title": "NEWSAT MS L1_SR 2022-03-20 11:28:27",
     "description": "scene_set_id: ece6d219-e452-4524-8fdc-c61c59727ecf",
     "datetime": "2022-03-20T11:28:27.976967Z",
     "processing:level": "l1",

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
@@ -292,7 +292,7 @@
     ]
   },
   "properties": {
-    "title": "NEWSAT MS L1 2023-10-30 20:08:17",
+    "title": "NEWSAT MS L1_SR 2023-10-30 20:08:17",
     "description": "scene_set_id: 27b30afd-1c9a-4580-846c-7fe1ab55b46a--179598",
     "datetime": "2023-10-30T20:08:17.595251Z",
     "processing:level": "l1",

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
@@ -96,7 +96,7 @@
     ]
   },
   "properties": {
-    "title": "NEWSAT MS L1 2024-03-14 17:26:20",
+    "title": "NEWSAT MS L1_SR 2024-03-14 17:26:20",
     "description": "scene_set_id: ff914eb4-1157-4509-9bc5-36f055cd8e6c",
     "datetime": "2024-03-14T17:26:20.006816Z",
     "processing:level": "l1",

diff --git a/...rces/SATELLOGIC/NEWSAT/MetadataExtractorsTests_20241102_105919_SN48_L1D_SR_MS_251827.json b/...rces/SATELLOGIC/NEWSAT/MetadataExtractorsTests_20241102_105919_SN48_L1D_SR_MS_251827.json
@@ -230,7 +230,7 @@
       "multispectral"
     ],
     "constellation": "Aleph1",
-    "title": "NEWSAT MULTISPECTRAL L1D 2024-11-02 10:59:19",
+    "title": "NEWSAT MS L1D_SR 2024-11-02 10:59:19",
     "processing:level": "l1d",
     "providers": [
       {

diff --git a/src/Stars.Data/Model/Metadata/NewSat/NewSatMetadataExtractor.cs b/src/Stars.Data/Model/Metadata/NewSat/NewSatMetadataExtractor.cs
@@ -185,11 +185,15 @@ private void FillTitleProperty(StacItem stacItem)
             var properties = stacItem.Properties;
             // title
             properties.Remove("title");
+            string instruments = properties.GetProperty<string[]>("instruments").First();
+            if (instruments == "multispectral") instruments = "MS";
+            string processingLevel = properties.GetProperty<string>("processing:level").ToUpper();
+            if (stacItem.Id.Contains("_SR_") || stacItem.Id.EndsWith("_SR")) processingLevel += "_SR";
             properties.Add("title", string.Format("{0} {1} {2} {3}",
                 //StylePlatform(properties.GetProperty<string>("platform")),
                 properties.GetProperty<string>("platform").ToUpper(),
-                properties.GetProperty<string[]>("instruments").First().ToUpper(),
-                properties.GetProperty<string>("processing:level").ToUpper(),
+                instruments.ToUpper(),
+                processingLevel,
                 properties.GetProperty<DateTime>("datetime").ToUniversalTime().ToString("yyyy-MM-dd HH:mm:ss", culture)));
         }
 

diff --git a/src/Stars.Data/Terradue.Stars.Data.csproj b/src/Stars.Data/Terradue.Stars.Data.csproj
@@ -4,7 +4,7 @@
         <ProjectName>Terradue.Stars.Data</ProjectName>
         <Title>Terradue.Stars.Data</Title>
         <Description>Collection of data Plugins for Terradue.Stars</Description>
-        <Version>2.25.6</Version>
+        <Version>2.25.7</Version>
         <!-- <VersionSuffix>beta.8</VersionSuffix> -->
         <Version Condition=" '$(VersionSuffix)' != '' ">$(Version)-$(VersionSuffix)</Version>
         <NoWarn>NU1603</NoWarn>

diff --git a/src/Stars.Services/Terradue.Stars.Services.csproj b/src/Stars.Services/Terradue.Stars.Services.csproj
@@ -3,7 +3,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <Title>Terradue.Stars</Title>
     <Description>Stars is a set of services for working with Spatio Temporal Catalog such as STAC but not only</Description>
-    <Version>2.25.6</Version>
+    <Version>2.25.7</Version>
     <!-- <VersionSuffix>beta.8</VersionSuffix> -->
     <Version Condition=" '$(VersionSuffix)' != '' ">$(Version)-$(VersionSuffix)</Version>
     <AssemblyName>Terradue.Stars.Services</AssemblyName>