Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Complex Search Support for ISupplier #37

Merged
merged 13 commits into from
Nov 6, 2023
Merged

Complex Search Support for ISupplier #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
03fff35
SUPERVISOR-72: Search expression for Opensearchable
emmanuelmathot Oct 27, 2023
81bd709
SUPERVISOR-72: Merge branch 'develop' into SUPERVISOR-72
emmanuelmathot Oct 27, 2023
a37a575
SUPERVISOR-72:
emmanuelmathot Oct 27, 2023
c8b7cd2
SUPERVISOR-72: working tests
emmanuelmathot Oct 27, 2023
9b08066
SUPERVISOR-72: more tests
emmanuelmathot Oct 27, 2023
8dc4bb2
SUPERVISOR-72: tests ok
emmanuelmathot Oct 30, 2023
f7c2dec
SUPERVISOR-72: IItemCollection
emmanuelmathot Oct 31, 2023
eb00d66
SUPERVISOR-72: fix IItemCollection
emmanuelmathot Nov 2, 2023
6c6269a
SUPERVISOR-72: fixed dotntstac.api beta.5
emmanuelmathot Nov 5, 2023
a61e226
SUPERVISOR-72: Updated Terradue.OpenSearch.SciHub dependency
floeschau Nov 3, 2023
ccaf882
SUPERVISOR-72: Merge remote-tracking branch 'origin/develop' into SUP…
emmanuelmathot Nov 6, 2023
3d89373
SUPERVISOR-72: Update .NET version in dotnet.yml workflow
emmanuelmathot Nov 6, 2023
7140009
SUPERVISOR-72: Update test dependencies to latest versions
emmanuelmathot Nov 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/dotnet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
global-json-file: global.json
dotnet-version: |
6.0.x
7.0.x
- name: Install dependencies (hdf5)
run: sudo apt install hdf5-tools -y
- name: Restore dependencies
Expand Down
5 changes: 0 additions & 5 deletions global.json
View file
Open in desktop

This file was deleted.

15 changes: 15 additions & 0 deletions src/Stars.Data.Tests/Resources/Suppliers/Opensearchable/CQL2Tests_Example0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"filter": {
"op": "=",
"args": [
{
"property": "id"
},
"LC08_L1TP_060247_20180905_20180912_01_T1_L1TP"
]
},
"result":
{
"{http://a9.com/-/opensearch/extensions/geo/1.0/}uid": "LC08_L1TP_060247_20180905_20180912_01_T1_L1TP"
}
}
30 changes: 30 additions & 0 deletions src/Stars.Data.Tests/Resources/Suppliers/Opensearchable/CQL2Tests_Example1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"filter": {
"op": "and",
"args": [
{
"op": "=",
"args": [
{
"property": "id"
},
"S2A_60HWB_20201111_0_L2A"
]
},
{
"op": "=",
"args": [
{
"property": "collection"
},
"sentinel-s2-l2a-cogs"
]
}
]
},
"result":
{
"{http://a9.com/-/opensearch/extensions/geo/1.0/}uid": "S2A_60HWB_20201111_0_L2A",
"{http://a9.com/-/opensearch/extensions/eo/1.0/}parentIdentifier": "sentinel-s2-l2a-cogs"
}
}
16 changes: 16 additions & 0 deletions src/Stars.Data.Tests/Resources/Suppliers/Opensearchable/CQL2Tests_Example10.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"filter-lang": "cql2-json",
"filter": {
"op": "between",
"args": [
{
"property": "eo:cloud_cover"
},
0,
50
]
},
"result": {
"{http://a9.com/-/opensearch/extensions/eo/1.0/}cloudCover": "[0,50]"
}
}
11 changes: 11 additions & 0 deletions src/Stars.Data.Tests/Resources/Suppliers/Opensearchable/CQL2Tests_Example11.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"filter-lang": "cql2-json",
"filter": {
"op": "like",
"args": [
{ "property": "mission" },
"sentinel%"
]
},
"exception": "System.NotSupportedException"
}
19 changes: 19 additions & 0 deletions src/Stars.Data.Tests/Resources/Suppliers/Opensearchable/CQL2Tests_Example12.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"filter-lang": "cql2-json",
"filter": {
"op": "in",
"args": [
{
"property": "keywords"
},
[
"fire",
"forest",
"wildfire"
]
]
},
"result": {
"{http://purl.org/dc/terms/}subject": "{fire,forest,wildfire}"
}
}
103 changes: 103 additions & 0 deletions src/Stars.Data.Tests/Resources/Suppliers/Opensearchable/CQL2Tests_Example2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
{
"filter-lang": "cql2-json",
"filter": {
"op": "and",
"args": [
{
"op": "=",
"args": [
{
"property": "collection"
},
"landsat8_l1tp"
]
},
{
"op": "<=",
"args": [
{
"property": "eo:cloud_cover"
},
10
]
},
{
"op": ">=",
"args": [
{
"property": "datetime"
},
{
"timestamp": "2021-04-08T04:39:23Z"
}
]
},
{
"op": "s_intersects",
"args": [
{
"property": "geometry"
},
{
"type": "Polygon",
"coordinates": [
[
[
43.5845,
-79.5442
],
[
43.6079,
-79.4893
],
[
43.5677,
-79.4632
],
[
43.6129,
-79.3925
],
[
43.6223,
-79.3238
],
[
43.6576,
-79.3163
],
[
43.7945,
-79.1178
],
[
43.8144,
-79.1542
],
[
43.8555,
-79.1714
],
[
43.7509,
-79.6390
],
[
43.5845,
-79.5442
]
]
]
}
]
}
]
},
"result": {
"{http://a9.com/-/opensearch/extensions/eo/1.0/}parentIdentifier": "landsat8_l1tp",
"{http://a9.com/-/opensearch/extensions/eo/1.0/}cloudCover": "10]",
"{http://a9.com/-/opensearch/extensions/time/1.0/}start": "2021-04-08T04:39:23Z",
"{http://a9.com/-/opensearch/extensions/geo/1.0/}relation": "intersects",
"{http://a9.com/-/opensearch/extensions/geo/1.0/}geometry": "POLYGON((43.5845 -79.5442,43.6079 -79.4893,43.5677 -79.4632,43.6129 -79.3925,43.6223 -79.3238,43.6576 -79.3163,43.7945 -79.1178,43.8144 -79.1542,43.8555 -79.1714,43.7509 -79.639,43.5845 -79.5442))"
}
}
17 changes: 17 additions & 0 deletions src/Stars.Data.Tests/Resources/Suppliers/Opensearchable/CQL2Tests_Example3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"filter-lang": "cql2-json",
"filter": {
"op": "and",
"args": [
{
"op": ">",
"args": [ { "property": "sentinel:data_coverage" }, 50 ]
},
{
"op": "<",
"args": [ { "property": "eo:cloud_cover" }, 10 ]
}
]
},
"exception": "System.NotSupportedException"
}
17 changes: 17 additions & 0 deletions src/Stars.Data.Tests/Resources/Suppliers/Opensearchable/CQL2Tests_Example4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"filter-lang": "cql2-json",
"filter": {
"op": "or",
"args": [
{
"op": ">",
"args": [ { "property": "sentinel:data_coverage" }, 50 ]
},
{
"op": "<",
"args": [ { "property": "eo:cloud_cover" }, 10 ]
}
]
},
"exception": "System.NotSupportedException"
}
11 changes: 11 additions & 0 deletions src/Stars.Data.Tests/Resources/Suppliers/Opensearchable/CQL2Tests_Example5.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"filter-lang": "cql2-json",
"filter": {
"op": "=",
"args": [
{ "property": "prop1" },
{ "property": "prop2" }
]
},
"exception": "System.NotSupportedException"
}
22 changes: 22 additions & 0 deletions src/Stars.Data.Tests/Resources/Suppliers/Opensearchable/CQL2Tests_Example6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"filter-lang": "cql2-json",
"filter": {
"op": "t_intersects",
"args": [
{
"property": "datetime"
},
{
"interval": [
"2020-11-11T00:00:00Z",
"2020-11-12T00:00:00Z"
]
}
]
},
"result": {
"{http://a9.com/-/opensearch/extensions/time/1.0/}relation": "intersects",
"{http://a9.com/-/opensearch/extensions/time/1.0/}start": "2020-11-11T00:00:00Z",
"{http://a9.com/-/opensearch/extensions/time/1.0/}end": "2020-11-12T00:00:00Z"
}
}
42 changes: 42 additions & 0 deletions src/Stars.Data.Tests/Resources/Suppliers/Opensearchable/CQL2Tests_Example7.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"filter-lang": "cql2-json",
"filter": {
"op": "s_intersects",
"args": [
{
"property": "geometry"
},
{
"type": "Polygon",
"coordinates": [
[
[
-77.0824,
38.7886
],
[
-77.0189,
38.7886
],
[
-77.0189,
38.8351
],
[
-77.0824,
38.8351
],
[
-77.0824,
38.7886
]
]
]
}
]
},
"result": {
"{http://a9.com/-/opensearch/extensions/geo/1.0/}relation": "intersects",
"{http://a9.com/-/opensearch/extensions/geo/1.0/}geometry": "POLYGON((-77.0824 38.7886,-77.0189 38.7886,-77.0189 38.8351,-77.0824 38.8351,-77.0824 38.7886))"
}
}
Loading