Merge branch 'release/2.14.5'

Terradue · Jul 26, 2023 · a6804db · a6804db
2 parents 9f6e6d2 + 430f967
commit a6804db
Show file tree

Hide file tree

Showing 12 changed files with 48 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
-## [2.14.4](https://github.com/Terradue/Stars/compare/2.14.3...2.14.4)
+## [2.14.5](https://github.com/Terradue/Stars/compare/2.14.4...2.14.5)
+
+Sentinel-2 metadata extractor with eo:cloud_cover property
+
+### Merged
+
+- Sentinel-2 metadata extractor with eo:cloud_cover property [`#20`](https://github.com/Terradue/Stars/pull/20)
+- Revert PR #10 and improved error handling [`#19`](https://github.com/Terradue/Stars/pull/19)
+
+### Commits
+
+- Changes for Sentinel-2 cloud cover STAC property [`bbd59c0`](https://github.com/Terradue/Stars/commit/bbd59c05b2073b0afd9afe77c33d5dfe6346acd5)
+- Renamed file [`6ccb4b8`](https://github.com/Terradue/Stars/commit/6ccb4b8d1ab187136d6a5cf80954bde06b878b15)
+
+## [2.14.4](https://github.com/Terradue/Stars/compare/2.14.3...2.14.4) - 2023-07-25
 
 ### Commits
 

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.14.4</Version>
+    <Version>2.14.5</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/...MetadataExtractorsTests_S2A_MSIL1C_20180315T160021_N0206_R097_T17RLM_20180315T194425.json b/...MetadataExtractorsTests_S2A_MSIL1C_20180315T160021_N0206_R097_T17RLM_20180315T194425.json
@@ -51,6 +51,7 @@
     ],
     "sensor_type": "optical",
     "gsd": 10.0,
+    "eo:cloud_cover": 0.0,
     "sat:orbit_state": "descending",
     "sat:absolute_orbit": 14251,
     "sat:relative_orbit": 97,

diff --git a/...MetadataExtractorsTests_S2A_MSIL1C_20220125T151701_N0400_R125_T18LTM_20220125T190036.json b/...MetadataExtractorsTests_S2A_MSIL1C_20220125T151701_N0400_R125_T18LTM_20220125T190036.json
@@ -79,6 +79,7 @@
     ],
     "sensor_type": "optical",
     "gsd": 10.0,
+    "eo:cloud_cover": 15.2616929084983,
     "sat:orbit_state": "descending",
     "sat:absolute_orbit": 34442,
     "sat:relative_orbit": 125,

diff --git a/...MetadataExtractorsTests_S2B_MSIL1C_20211121T050109_N0301_R119_T44PLQ_20211121T070706.json b/...MetadataExtractorsTests_S2B_MSIL1C_20211121T050109_N0301_R119_T44PLQ_20211121T070706.json
@@ -51,6 +51,7 @@
     ],
     "sensor_type": "optical",
     "gsd": 10.0,
+    "eo:cloud_cover": 2.2017,
     "sat:orbit_state": "descending",
     "sat:absolute_orbit": 24598,
     "sat:relative_orbit": 119,

diff --git a/...MetadataExtractorsTests_S2B_MSIL2A_20210208T043939_N0214_R033_T49WDM_20210208T061027.json b/...MetadataExtractorsTests_S2B_MSIL2A_20210208T043939_N0214_R033_T49WDM_20210208T061027.json
@@ -71,6 +71,7 @@
     ],
     "sensor_type": "optical",
     "gsd": 10.0,
+    "eo:cloud_cover": 88.091139,
     "sat:orbit_state": "descending",
     "sat:absolute_orbit": 20508,
     "sat:relative_orbit": 33,

diff --git a/src/Stars.Data/Model/Metadata/Sentinels/Sentinel2/S2L2SafeStacFactory.cs b/src/Stars.Data/Model/Metadata/Sentinels/Sentinel2/S2L2SafeStacFactory.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Xml.Serialization;
 using Stac;
+using Stac.Extensions.Eo;
 using Stac.Extensions.Projection;
 using Stac.Extensions.Sar;
 using Terradue.OpenSearch.Sentinel.Data.Safe;
@@ -24,6 +25,12 @@ public static S2L2SafeStacFactory Create(XFDUType xfdu, IItem route, string iden
             return new S2L2SafeStacFactory(xfdu, route, identifier, mtdTile);
         }
 
+        protected override void AddEoStacExtension(StacItem stacItem)
+        {
+            double? cloudCover = mtdTile?.Quality_Indicators_Info?.Image_Content_QI?.CLOUDY_PIXEL_PERCENTAGE.Value;
+            EoStacExtension eo = stacItem.EoExtension();
+            if (cloudCover != null) eo.CloudCover = cloudCover.Value;
+        }
 
         protected override void AddProjectionStacExtension(StacItem stacItem)
         {

diff --git a/src/Stars.Data/Model/Metadata/Sentinels/Sentinel2/S2SafeStacFactory.cs b/src/Stars.Data/Model/Metadata/Sentinels/Sentinel2/S2SafeStacFactory.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Xml.Serialization;
 using Stac;
+using Stac.Extensions.Eo;
 using Stac.Extensions.Projection;
 using Stac.Extensions.Sar;
 using Terradue.OpenSearch.Sentinel.Data.Safe;
@@ -33,8 +34,11 @@ internal override StacItem CreateStacItem()
             return stacItem;
         }
 
-        private void AddEoStacExtension(StacItem stacItem)
+        protected virtual void AddEoStacExtension(StacItem stacItem)
         {
+            double? cloudCover = mtdTile?.Quality_Indicators_Info?.Image_Content_QI?.CLOUDY_PIXEL_PERCENTAGE.Value;
+            EoStacExtension eo = stacItem.EoExtension();
+            if (cloudCover != null) eo.CloudCover = cloudCover.Value;
         }
 
         private SarCommonFrequencyBandName GetFrequencyBand() => SarCommonFrequencyBandName.C;

diff --git a/...entinel2/S2_PDI_Level-1C_Tile_Metadata.cs → ...entinel2/S2_PDI_Level-2A_Tile_Metadata.cs b/...entinel2/S2_PDI_Level-1C_Tile_Metadata.cs → ...entinel2/S2_PDI_Level-2A_Tile_Metadata.cs
@@ -68,18 +68,18 @@ public A_GEOMETRIC_INFO_TILE Geometric_Info
             }
         }
 
-        // [System.Xml.Serialization.XmlElementAttribute(Order = 2)]
-        // public A_QUALITY_INDICATORS_INFO_TILE Quality_Indicators_Info
-        // {
-        //     get
-        //     {
-        //         return this.quality_Indicators_InfoField;
-        //     }
-        //     set
-        //     {
-        //         this.quality_Indicators_InfoField = value;
-        //     }
-        // }
+        [System.Xml.Serialization.XmlElementAttribute(Order = 2)]
+        public A_QUALITY_INDICATORS_INFO_TILE Quality_Indicators_Info
+        {
+            get
+            {
+                return this.quality_Indicators_InfoField;
+            }
+            set
+            {
+                this.quality_Indicators_InfoField = value;
+            }
+        }
     }
 
 

diff --git a/src/Stars.Data/Model/Metadata/Sentinels/Sentinel2/Sentinel2Level2MetadataExtractor.cs b/src/Stars.Data/Model/Metadata/Sentinels/Sentinel2/Sentinel2Level2MetadataExtractor.cs
@@ -79,7 +79,7 @@ protected async override Task AddAdditionalProperties(StacItem stacItem, IItem i
             stacItem.Properties.Add("processing_baseline", level2A_User_Product.General_Info.L2A_Product_Info.PROCESSING_BASELINE);
         }
 
-        private string AddJp2BandAsset(StacItem stacItem, IAsset bandAsset, IItem item, Level2A_User_Product level2AUserProduct, Level2A_Tile? mtdTile)
+        private string AddJp2BandAsset(StacItem stacItem, IAsset bandAsset, IItem item, Level2A_User_Product level2AUserProduct, Level2A_Tile mtdTile)
         {
 
             // checking if the jp2 is a MSK, if yes skip.

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.14.4</Version>
+        <Version>2.14.5</Version>
         <!-- <VersionSuffix>beta.8</VersionSuffix> -->
         <Version Condition=" '$(VersionSuffix)' != '' ">$(Version)-$(VersionSuffix)</Version>
         <NoWarn>NU1603</NoWarn>
@@ -30,7 +30,7 @@
         <PackageReference Include="Terradue.MetadataExtractor" Version="1.3.0" />
         <PackageReference Include="ProjNet" Version="2.0.0" />
         <PackageReference Include="MimeTypes" Version="2.0.2" />
-        <PackageReference Include="Terradue.OpenSearch.SciHub" Version="1.25.5" />
+        <PackageReference Include="Terradue.OpenSearch.SciHub" Version="1.25.6" />
         <PackageReference Include="Terradue.OpenSearch.Asf" Version="1.2.*" />
         <PackageReference Include="Terradue.OpenSearch.Usgs" Version="1.6.*" />
         <PackageReference Include="Terradue.OpenSearch.GeoJson" Version="1.4.5" />
@@ -50,9 +50,6 @@
             <PrivateAssets>all</PrivateAssets>
         </ProjectReference>
     </ItemGroup>
-    <!--<ItemGroup>
-        <Reference Include="tempbin\Terradue.OpenSearch.SciHub.dll" />
-    </ItemGroup>-->
     <!-- <ItemGroup>
     <ProjectReference Include="../../../../sugar/Terradue.OpenSearch.SciHub/Terradue.OpenSearch.SciHub/Terradue.OpenSearch.SciHub.csproj" />
   </ItemGroup> -->

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.14.4</Version>
+    <Version>2.14.5</Version>
     <!-- <VersionSuffix>beta.8</VersionSuffix> -->
     <Version Condition=" '$(VersionSuffix)' != '' ">$(Version)-$(VersionSuffix)</Version>
     <AssemblyName>Terradue.Stars.Services</AssemblyName>