Merge branch 'release/2.24.2'

Terradue · Jun 13, 2024 · f5f3f92 · f5f3f92
2 parents 186c828 + 42cd2fc
commit f5f3f92
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,13 @@ 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.24.1](https://github.com/Terradue/Stars/compare/2.24.0...2.24.1)
+## [2.24.2](https://github.com/Terradue/Stars/compare/2.24.1...2.24.2)
+
+### Commits
+
+- post collection with OnCollection [`05dd124`](https://github.com/Terradue/Stars/commit/05dd124a47d406b7af8ecb54f38eccbd6b66e9b4)
+
+## [2.24.1](https://github.com/Terradue/Stars/compare/2.24.0...2.24.1) - 2024-06-04
 
 ### 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.24.1</Version>
+    <Version>2.24.2</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/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.24.1</Version>
+        <Version>2.24.2</Version>
         <!-- <VersionSuffix>beta.8</VersionSuffix> -->
         <Version Condition=" '$(VersionSuffix)' != '' ">$(Version)-$(VersionSuffix)</Version>
         <NoWarn>NU1603</NoWarn>

diff --git a/src/Stars.Data/ThirdParty/Publication/GeosquarePublicationModel.cs b/src/Stars.Data/ThirdParty/Publication/GeosquarePublicationModel.cs
@@ -118,6 +118,8 @@ internal void UpdateLink(SyndicationLink link, AtomItem item, IAssetsContainer a
         public string CatalogId { get; set; }
 
         public List<string> AssetsFilters { get; set; }
+
+        public bool PublishCollections { get; set; } = false;
     }
 
 }
diff --git a/src/Stars.Data/ThirdParty/Publication/GeosquareService.cs b/src/Stars.Data/ThirdParty/Publication/GeosquareService.cs
@@ -129,6 +129,8 @@ private void InitRoutingTask(GeosquarePublicationModel geosquareModel)
             // routingService.OnRoutingException((route, router, exception, state) => PrintRouteInfo(route, router, exception, state));
             routingService.OnBeforeBranching((node, router, state, subroutes, ct) => OnBeforeBranching(node, router, state, subroutes, ct));
             routingService.OnItem((node, router, state, ct) => PostItemToCatalog(node, router, state, ct));
+            if (geosquareModel.PublishCollections)
+                routingService.OnCollection((node, router, state, ct) => PostCollectionToCatalog(node, router, state, ct));
             // routingService.OnBranching((parentRoute, route, siblings, state) => PrepareNewRoute(parentRoute, route, siblings, state));
         }
 
@@ -139,12 +141,6 @@ private async Task<object> OnBeforeBranching(ICatalog node, IRouter router, obje
                 return state;
             }
 
-            // If Collection has assets, we consider it as a single item
-            if (collection.Assets.Count > 0)
-            {
-                await PostCollectionToCatalog(new StacCollectionNode(collection, node.Uri), router, state, ct);
-            }
-
             return state;
         }
 

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