diff --git a/README.rst b/README.rst index 21f24e2e2..d499623fc 100644 --- a/README.rst +++ b/README.rst @@ -152,12 +152,12 @@ An eodag instance can be exposed through a STAC compliant REST api from the comm # search for items $ curl "http://127.0.0.1:5000/search?collections=S2_MSI_L1C&bbox=0,43,1,44&datetime=2018-01-20/2018-01-25" \ - | jq ".context.matched" + | jq ".numberMatched" 6 # browse for items $ curl "http://127.0.0.1:5000/catalogs/S2_MSI_L1C/country/FRA/year/2021/month/01/day/25/cloud_cover/10/items" \ - | jq ".context.matched" + | jq ".numberMatched" 9 # get download link diff --git a/docs/stac_rest.rst b/docs/stac_rest.rst index f7cd8c9b7..24509e9cd 100644 --- a/docs/stac_rest.rst +++ b/docs/stac_rest.rst @@ -144,12 +144,12 @@ Example # search for items $ curl "http://127.0.0.1:5000/search?collections=S2_MSI_L1C&bbox=0,43,1,44&datetime=2018-01-20/2018-01-25" \ - | jq ".context.matched" + | jq ".numberMatched" 6 # browse for items $ curl "http://127.0.0.1:5000/catalogs/S2_MSI_L1C/country/FRA/year/2021/month/01/day/25/cloud_cover/10/items" \ - | jq ".context.matched" + | jq ".numberMatched" 9 # get download link diff --git a/eodag/api/core.py b/eodag/api/core.py index 4a9f55831..4ebb10de4 100644 --- a/eodag/api/core.py +++ b/eodag/api/core.py @@ -1891,13 +1891,7 @@ def load_stac_items( max_connections=max_connections, timeout=timeout, ) - nb_features = len(features) feature_collection = geojson.FeatureCollection(features) - feature_collection["context"] = { - "limit": nb_features, - "matched": nb_features, - "returned": nb_features, - } plugin = next( self._plugins_manager.get_search_plugins( diff --git a/eodag/plugins/search/static_stac_search.py b/eodag/plugins/search/static_stac_search.py index 8b64af766..502b50169 100644 --- a/eodag/plugins/search/static_stac_search.py +++ b/eodag/plugins/search/static_stac_search.py @@ -98,11 +98,6 @@ def query( ) nb_features = len(features) feature_collection = geojson.FeatureCollection(features) - feature_collection["context"] = { - "limit": nb_features, - "matched": nb_features, - "returned": nb_features, - } # save StaticStacSearch._request and mock it to make return loaded static results stacapi_request = self._request diff --git a/eodag/resources/stac.yml b/eodag/resources/stac.yml index 824644753..bfea4b15e 100644 --- a/eodag/resources/stac.yml +++ b/eodag/resources/stac.yml @@ -160,12 +160,6 @@ items: numberMatched: '$.search_results.numberMatched' # len(features) numberReturned: '$.search_results.numberReturned' - # 0.7.0 stac-browser compatibility - context: - page: '$.search_results.properties.page' - limit: '$.search_results.properties.itemsPerPage' - matched: '$.search_results.properties.totalResults' - returned: '$.search_results.numberReturned' # https://stacspec.org/STAC-api.html#operation/getFeature item: diff --git a/eodag/resources/stac_provider.yml b/eodag/resources/stac_provider.yml index 897e7e1a9..680b1d73e 100644 --- a/eodag/resources/stac_provider.yml +++ b/eodag/resources/stac_provider.yml @@ -20,7 +20,7 @@ search: results_entry: features pagination: next_page_query_obj: '{{"limit":{items_per_page},"page":{page}}}' - total_items_nb_key_path: '$.context.matched' + total_items_nb_key_path: '$.numberMatched' next_page_url_key_path: '$.links[?(@.rel="next")].href' next_page_query_obj_key_path: '$.links[?(@.rel="next")].body' next_page_merge_key_path: '$.links[?(@.rel="next")].merge' diff --git a/tests/integration/test_core_config.py b/tests/integration/test_core_config.py index 525a5391d..ce09a7956 100644 --- a/tests/integration/test_core_config.py +++ b/tests/integration/test_core_config.py @@ -57,9 +57,6 @@ def test_core_providers_config_update( mock__request.return_value = mock.Mock() mock__request_side_effect = [ { - "context": { - "matched": 1, - }, "features": [ { "id": "foo", diff --git a/tests/resources/provider_responses/earth_search_search.json b/tests/resources/provider_responses/earth_search_search.json index 9d8ee4a33..245287eb6 100644 --- a/tests/resources/provider_responses/earth_search_search.json +++ b/tests/resources/provider_responses/earth_search_search.json @@ -2,12 +2,6 @@ "type": "FeatureCollection", "stac_version": "1.0.0-beta.2", "stac_extensions": [], - "context": { - "page": 1, - "limit": 1, - "matched": 21830128, - "returned": 1 - }, "numberMatched": 21830128, "numberReturned": 1, "features": [ diff --git a/tests/units/test_http_server.py b/tests/units/test_http_server.py index 538bdc6ee..acc9ad039 100644 --- a/tests/units/test_http_server.py +++ b/tests/units/test_http_server.py @@ -829,11 +829,6 @@ def test_search_response_contains_pagination_info(self): response = self._request_valid(f"search?collections={self.tested_product_type}") self.assertIn("numberMatched", response) self.assertIn("numberReturned", response) - self.assertIn("context", response) - self.assertEqual(1, response["context"]["page"]) - self.assertEqual(DEFAULT_ITEMS_PER_PAGE, response["context"]["limit"]) - self.assertIn("matched", response["context"]) - self.assertIn("returned", response["context"]) def test_search_provider_in_downloadlink(self): """Search through eodag server and check that specified provider appears in downloadLink""" diff --git a/tests/units/test_search_plugins.py b/tests/units/test_search_plugins.py index 1a9db714d..6e22aa91b 100644 --- a/tests/units/test_search_plugins.py +++ b/tests/units/test_search_plugins.py @@ -1073,7 +1073,6 @@ def test_plugins_search_odatav4search_distinct_product_type_mtd_mapping( geojson_geometry = self.search_criteria_s2_msi_l1c["geometry"].__geo_interface__ mock__request.return_value = mock.Mock() result = { - "context": {"matched": 1}, "features": [ { "id": "foo", @@ -1117,7 +1116,6 @@ def test_plugins_search_stacsearch_mapping_earthsearch(self, mock__request): mock__request.return_value = mock.Mock() mock__request.return_value.json.side_effect = [ { - "context": {"page": 1, "limit": 2, "matched": 1, "returned": 2}, "features": [ { "id": "foo", @@ -1171,7 +1169,6 @@ def test_plugins_search_stacsearch_default_geometry(self, mock__request): mock__request.return_value = mock.Mock() mock__request.return_value.json.side_effect = [ { - "context": {"matched": 3}, "features": [ { "id": "foo", @@ -1204,7 +1201,6 @@ def test_plugins_search_stacsearch_distinct_product_type_mtd_mapping( """The metadata mapping for a stac provider should not mix specific product-types metadata-mapping""" mock__request.return_value = mock.Mock() result = { - "context": {"matched": 1}, "features": [ { "id": "foo",