Skip to content

Commit 360d27f

Browse files
emmanuelmathotemmanuelmathot
committed
Merge branch 'release/2.22.8'
2 parents b8bc5d8 + fb04ed2 commit 360d27f

File tree

7 files changed

+169
-7
lines changed

7 files changed

+169
-7
lines changed

‎CHANGELOG.md

+20-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
99

10-
## [2.22.6](https://github.com/Terradue/Stars/compare/2.22.5...2.22.6)
10+
## [2.22.8](https://github.com/Terradue/Stars/compare/2.22.7...2.22.8)
1111

12-
this fixes MCUBE-10 and MCUBE-11
12+
### Commits
13+
14+
- feat: Add VAPTest to StacItemToAtomItemTests.cs [`6764ce8`](https://github.com/Terradue/Stars/commit/6764ce8d40d303ca28386895f019ab626509ac09)
15+
- Add asset key to syndication links in StarsAtomItem.cs [`5d4441f`](https://github.com/Terradue/Stars/commit/5d4441fb9172bbf1ad70d4d1639f40e776c26e86)
16+
17+
## [2.22.7](https://github.com/Terradue/Stars/compare/2.22.6...2.22.7) - 2024-05-23
18+
19+
### Merged
20+
21+
- Fix for wrongly assigned processing level in SAOCOM identifier [`#57`](https://github.com/Terradue/Stars/pull/57)
22+
- Correction for incorrect Landsat-8/9 orbit states (orbit direction) [`#53`](https://github.com/Terradue/Stars/pull/53)
23+
24+
### Commits
25+
26+
- Fix for wrongly assigned processing level in identifier [`bcfb105`](https://github.com/Terradue/Stars/commit/bcfb10597097c586c5d4b282c72f032dd4aefa2e)
27+
- Changed orbit direction calculation and added test case [`b9a4254`](https://github.com/Terradue/Stars/commit/b9a42543ce21d44d91992c406eb07229209a3544)
28+
- Restored SAOCOM L1A expected output [`e3124fa`](https://github.com/Terradue/Stars/commit/e3124fa7971880c2c982d67904658a1499991568)
29+
30+
## [2.22.6](https://github.com/Terradue/Stars/compare/2.22.5...2.22.6) - 2024-05-21
1331

1432
### Commits
1533

‎src/Stars.Console/Terradue.Stars.Console.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
44
<TargetFrameworks>net6.0</TargetFrameworks>
5-
<Version>2.22.7</Version>
5+
<Version>2.22.8</Version>
66
<!-- <VersionSuffix>beta.8</VersionSuffix> -->
77
<Description>Stars is a CLI for working with Spatio Temporal Catalog such as STAC but not only</Description>
88
<Version Condition=" '$(VersionSuffix)' != '' ">$(Version)-$(VersionSuffix)</Version>

‎src/Stars.Data.Tests/Resources/Translators/StacItemToAtomItemTests_VAPTest.json

+112
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
{
2+
"stac_version": "1.0.0",
3+
"stac_extensions": [
4+
"https://stac-extensions.github.io/file/v1.0.0/schema.json",
5+
"https://stac-extensions.github.io/version/v1.0.0/schema.json",
6+
"https://terradue.github.io/disaster/v1.0.0/schema.json"
7+
],
8+
"type": "Feature",
9+
"id": "act-874-vap-1002-6",
10+
"geometry": {
11+
"type": "Polygon",
12+
"coordinates": [
13+
[
14+
[
15+
36.833,
16+
-1.208
17+
],
18+
[
19+
37.003,
20+
-1.208
21+
],
22+
[
23+
37.003,
24+
-1.329
25+
],
26+
[
27+
36.833,
28+
-1.329
29+
],
30+
[
31+
36.833,
32+
-1.208
33+
],
34+
[
35+
36.833,
36+
-1.208
37+
]
38+
]
39+
]
40+
},
41+
"properties": {
42+
"disaster:class": "ValueAddedProduct",
43+
"cpe:status": {
44+
"stage": "notificationImported",
45+
"message": "2 assets imported",
46+
"link": "https://supervisor.disasterscharter.org/hangfire/jobs/details/34839"
47+
},
48+
"updated": "2024-05-23T09:33:59.0295601Z",
49+
"disaster:activation_id": 874,
50+
"cpe:cos2_id": "act-874-vap-1002-6",
51+
"datetime": "2024-05-06T10:36:29Z",
52+
"cpe:cos2_xml": "<?xml version=\"1.0\" encoding=\"utf-16\"?>\n<valueAddedProduct xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">\n <identifier>1002-6</identifier>\n <activationId>874</activationId>\n <recordCreated>2024-05-07T02:38:19Z</recordCreated>\n <recordUpdated>2024-05-07T02:38:30Z</recordUpdated>\n <title language=\"en\">Flood impact analysis in Central Nairobi, Kenya as of 1 May 2024</title>\n <acquisitionDate>2024-05-06T10:36:29Z</acquisitionDate>\n <copyright language=\"en\">Includes Pleiades material © CNES (2024), Distribution Airbus DS.;Includes Pleiades material © CNES (2024), Distribution Airbus DS.;Includes Pleiades material © CNES (2024), Distribution Airbus DS.</copyright>\n <productFileUrl>https://disasterscharter.org/cos-api/service/vap/1002/6.pdf</productFileUrl>\n <quicklookFileUrl>https://disasterscharter.org/documents/10180/24551505/vap-1002-6-quicklook.jpg/96c86441-71dd-4774-9c66-2b66cbe3081a?version=1.0</quicklookFileUrl>\n <additionalInformation language=\"en\">This map illustrates satellite-detected surface waters in Nairobi, Kenya, as observed from a Pléiades image acquired on 1 May 2024 at 11:06 local time (08:06 UTC). Within the analyzed area, about 2 km² of land appears to be flooded. UNITAR-UNOSAT identified 3,387 affected structures, about 7 km of affected roads, and 9 affected bridges.\nThis is a preliminary analysis and has not yet been validated in the field. Please send ground feedback to the United Nations Satellite Centre (UNOSAT).</additionalInformation>\n <footprint>\n <polyPoint>\n <latitude>-1.208</latitude>\n <longitude>36.833</longitude>\n </polyPoint>\n <polyPoint>\n <latitude>-1.208</latitude>\n <longitude>37.003</longitude>\n </polyPoint>\n <polyPoint>\n <latitude>-1.329</latitude>\n <longitude>37.003</longitude>\n </polyPoint>\n <polyPoint>\n <latitude>-1.329</latitude>\n <longitude>36.833</longitude>\n </polyPoint>\n <polyPoint>\n <latitude>-1.208</latitude>\n <longitude>36.833</longitude>\n </polyPoint>\n </footprint>\n <productFileSize>0</productFileSize>\n</valueAddedProduct>",
53+
"created": "2024-05-07T02:38:19Z",
54+
"title": "Flood impact analysis in Central Nairobi, Kenya as of 1 May 2024 [05/06/2024 10:36:29]",
55+
"source": null,
56+
"copyright": "Includes Pleiades material © CNES (2024), Distribution Airbus DS.;Includes Pleiades material © CNES (2024), Distribution Airbus DS.;Includes Pleiades material © CNES (2024), Distribution Airbus DS.",
57+
"additional_information": "This map illustrates satellite-detected surface waters in Nairobi, Kenya, as observed from a Pléiades image acquired on 1 May 2024 at 11:06 local time (08:06 UTC). Within the analyzed area, about 2 km² of land appears to be flooded. UNITAR-UNOSAT identified 3,387 affected structures, about 7 km of affected roads, and 9 affected bridges.\nThis is a preliminary analysis and has not yet been validated in the field. Please send ground feedback to the United Nations Satellite Centre (UNOSAT).",
58+
"description": "Name | Value\n---- | -----\nSource | ****\nCopyright | **Includes Pleiades material © CNES (2024), Distribution Airbus DS.;Includes Pleiades material © CNES (2024), Distribution Airbus DS.;Includes Pleiades material © CNES (2024), Distribution Airbus DS.**\nAdditional Information | **This map illustrates satellite-detected surface waters in Nairobi, Kenya, as observed from a Pléiades image acquired on 1 May 2024 at 11:06 local time (08:06 UTC). Within the analyzed area, about 2 km² of land appears to be flooded. UNITAR-UNOSAT identified 3,387 affected structures, about 7 km of affected roads, and 9 affected bridges. This is a preliminary analysis and has not yet been validated in the field. Please send ground feedback to the United Nations Satellite Centre (UNOSAT).**\nAcquisition Date | **06/05/2024 10:36:29**\nCreated | **07/05/2024 02:38:19**\nUpdated | **07/05/2024 02:38:30**\n",
59+
"cpe:notification_source": "cos2",
60+
"cpe:notified": [
61+
"2024-05-07T02:38:30.5503974Z"
62+
],
63+
"version": "1"
64+
},
65+
"bbox": [
66+
36.833,
67+
-1.329,
68+
37.003,
69+
-1.208
70+
],
71+
"assets": {
72+
"overview": {
73+
"type": "image/jpeg",
74+
"roles": [
75+
"overview"
76+
],
77+
"title": "Value Added Product Overview",
78+
"href": "https://supervisor.disasterscharter.org/assets/activations/act-874/vaps/act-874-vap-1002-6/act-874-vap-1002-6.json?key=overview",
79+
"file:size": 314027
80+
},
81+
"enclosure": {
82+
"type": "application/pdf",
83+
"roles": [
84+
"data",
85+
"visual"
86+
],
87+
"title": "Value Added Product Enclosure",
88+
"href": "https://supervisor.disasterscharter.org/assets/activations/act-874/vaps/act-874-vap-1002-6/act-874-vap-1002-6.json?key=enclosure",
89+
"file:size": 4687256
90+
}
91+
},
92+
"links": [
93+
{
94+
"type": "application/geo+json",
95+
"rel": "self",
96+
"title": "Flood impact analysis in Central Nairobi, Kenya as of 1 May 2024 [05/06/2024 10:36:29]",
97+
"href": "https://supervisor.disasterscharter.org/api/activations/act-874/vaps/act-874-vap-1002-6/items/act-874-vap-1002-6.json.json"
98+
},
99+
{
100+
"type": "application/json",
101+
"rel": "root",
102+
"title": "Root Catalog",
103+
"href": "https://supervisor.disasterscharter.org/api/catalog.json"
104+
},
105+
{
106+
"rel": "collection",
107+
"title": "collection",
108+
"href": "https://supervisor.disasterscharter.org/api/activations/act-874/vaps/act-874-vap-1002-6.json"
109+
}
110+
],
111+
"collection": "act-874-vap-1002-6"
112+
}

‎src/Stars.Data.Tests/Translators/StacItemToAtomItemTests.cs

+27
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,33 @@ public async System.Threading.Tasks.Task S1A_IW_GRDH_1SDV_20220903T165054_202209
250250

251251
}
252252

253+
[Fact]
254+
public async System.Threading.Tasks.Task VAPTest()
255+
{
256+
string json = GetJson("Translators");
257+
258+
StacItem stacItem = StacConvert.Deserialize<StacItem>(json);
259+
260+
StacItemToAtomItemTranslator stacItemToAtomItemTranslator = new StacItemToAtomItemTranslator(ServiceProvider);
261+
262+
StacItemNode stacItemNode = new StacItemNode(stacItem, new System.Uri("https://supervisor.disasterscharter.org/api/activations/act-874/vaps/act-874-vap-1002-6/items/act-874-vap-1002-6.json"));
263+
264+
AtomItemNode atomItemNode = await stacItemToAtomItemTranslator.TranslateAsync<AtomItemNode>(stacItemNode, CancellationToken.None);
265+
266+
// find browse link
267+
var browseLink = atomItemNode.AtomItem.Links.FirstOrDefault(r => r.RelationshipType == "icon");
268+
269+
Assert.NotNull(browseLink);
270+
Assert.True(browseLink.Uri.ToString() == "https://supervisor.disasterscharter.org/assets/activations/act-874/vaps/act-874-vap-1002-6/act-874-vap-1002-6.json?key=overview");
271+
// Check that the asset reference is set in the link attributes
272+
Assert.True(browseLink.AttributeExtensions.ContainsKey(new XmlQualifiedName("asset")));
273+
Assert.True(browseLink.AttributeExtensions[new XmlQualifiedName("asset")].ToString() == "overview");
274+
275+
// Check that description is not in markdown
276+
Assert.DoesNotContain("Value----", atomItemNode.AtomItem.Summary.Text);
277+
278+
}
279+
253280

254281
}
255282

‎src/Stars.Data/Model/Atom/StarsAtomItem.cs

+7-2
Original file line numberDiff line numberDiff line change
@@ -211,11 +211,16 @@ private static IEnumerable<SyndicationLink> GetFunctionalLinks(IDictionary<strin
211211
List<SyndicationLink> links = new List<SyndicationLink>();
212212

213213
var overviews = assets.Where(a => a.Value.Roles.Contains("overview") || a.Value.Roles.Contains("thumbnail") || a.Value.Roles.Contains("legend"));
214-
links.AddRange(overviews.Select(o => new SyndicationLink(GetAssetUri(stacObjectUri, o.Value),
214+
foreach (var o in overviews)
215+
{
216+
var link = new SyndicationLink(GetAssetUri(stacObjectUri, o.Value),
215217
GetRelationshipFromRoles(o.Value.Roles),
216218
GetTitleFromRoles(o),
217219
o.Value.MediaType.ToString(),
218-
Convert.ToInt64(o.Value.FileExtension().Size))));
220+
Convert.ToInt64(o.Value.FileExtension().Size));
221+
link.AttributeExtensions.Add(new XmlQualifiedName("asset"), o.Key);
222+
links.Add(link);
223+
}
219224

220225
return links;
221226
}

‎src/Stars.Data/Terradue.Stars.Data.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<ProjectName>Terradue.Stars.Data</ProjectName>
55
<Title>Terradue.Stars.Data</Title>
66
<Description>Collection of data Plugins for Terradue.Stars</Description>
7-
<Version>2.22.7</Version>
7+
<Version>2.22.8</Version>
88
<!-- <VersionSuffix>beta.8</VersionSuffix> -->
99
<Version Condition=" '$(VersionSuffix)' != '' ">$(Version)-$(VersionSuffix)</Version>
1010
<NoWarn>NU1603</NoWarn>

‎src/Stars.Services/Terradue.Stars.Services.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<TargetFramework>netstandard2.0</TargetFramework>
44
<Title>Terradue.Stars</Title>
55
<Description>Stars is a set of services for working with Spatio Temporal Catalog such as STAC but not only</Description>
6-
<Version>2.22.7</Version>
6+
<Version>2.22.8</Version>
77
<!-- <VersionSuffix>beta.8</VersionSuffix> -->
88
<Version Condition=" '$(VersionSuffix)' != '' ">$(Version)-$(VersionSuffix)</Version>
99
<AssemblyName>Terradue.Stars.Services</AssemblyName>

0 commit comments

Comments
 (0)