Normans review addressed

xcube-dev · Jul 10, 2024 · be95304 · be95304
1 parent c806c6d
commit be95304
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 29 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -26,11 +26,11 @@
 * The `xcube.core.store.DataDescriptor` class now supports specifying time ranges
   using both `datetime.date` and `datetime.datetime` objects. Previously,
   only `datetime.date` objects were supported.
-* The xcube server STAC publication has been adjusted so that the data store
-  parameters and data ID, which are needed to open the data, 
-  are now included with the asset; furthermore, a second assert called
-  `analytic_multires` will be published referring to the multi-resolution data format
-  levels (#1020).
+* The xcube server STAC API has been adjusted so that the data store
+  parameters and data ID, which are needed to open the data referred to by a STAC item, 
+  are now included with the item's `analytic` asset. 
+  Furthermore, a second assert called `analytic_multires` will be published
+  referring to the multi-resolution data format levels (#1020).
 
 ## Changes in 1.6.0
 

diff --git a/test/webapi/ows/stac/demo-collection.json b/test/webapi/ows/stac/demo-collection.json
@@ -7,8 +7,8 @@
       ],
       "type": "application/zarr",
       "href": "http://localhost:8080/s3/datasets/demo.zarr",
-      "xcube:store_kwargs": {
-        "data_store_id": "s3",
+      "xcube:data_store_id": "s3",
+      "xcube:data_store_params": {
         "root": "datasets",
         "storage_options": {
           "anon": true,
@@ -17,7 +17,7 @@
           }
         }
       },
-      "xcube:open_kwargs": {
+      "xcube:open_data_params": {
         "data_id": "demo.zarr"
       },
       "xcube:analytic": {
@@ -70,8 +70,8 @@
       ],
       "type": "application/zarr",
       "href": "http://localhost:8080/s3/pyramids/demo.levels",
-      "xcube:store_kwargs": {
-        "data_store_id": "s3",
+      "xcube:data_store_id": "s3",
+      "xcube:data_store_params": {
         "root": "pyramids",
         "storage_options": {
           "anon": true,
@@ -80,7 +80,7 @@
           }
         }
       },
-      "xcube:open_kwargs": {
+      "xcube:open_data_params": {
         "data_id": "demo.levels"
       },
       "xcube:analytic_multires": {

diff --git a/test/webapi/ows/stac/stac-datacubes-item.json b/test/webapi/ows/stac/stac-datacubes-item.json
@@ -970,8 +970,8 @@
       ],
       "type": "application/zarr",
       "href": "http://localhost:8080/s3/datasets/demo-1w.zarr",
-      "xcube:store_kwargs": {
-        "data_store_id": "s3",
+      "xcube:data_store_id": "s3",
+      "xcube:data_store_params": {
         "root": "datasets",
         "storage_options": {
           "anon": true,
@@ -980,7 +980,7 @@
           }
         }
       },
-      "xcube:open_kwargs": {
+      "xcube:open_data_params": {
         "data_id": "demo-1w.zarr"
       },
       "xcube:analytic": {
@@ -1073,8 +1073,8 @@
       ],
       "type": "application/zarr",
       "href": "http://localhost:8080/s3/pyramids/demo-1w.levels",
-      "xcube:store_kwargs": {
-        "data_store_id": "s3",
+      "xcube:data_store_id": "s3",
+      "xcube:data_store_params": {
         "root": "pyramids",
         "storage_options": {
           "anon": true,
@@ -1083,7 +1083,7 @@
           }
         }
       },
-      "xcube:open_kwargs": {
+      "xcube:open_data_params": {
         "data_id": "demo-1w.levels"
       },
       "xcube:analytic_multires": {

diff --git a/test/webapi/ows/stac/stac-single-item.json b/test/webapi/ows/stac/stac-single-item.json
@@ -970,8 +970,8 @@
       ],
       "type": "application/zarr",
       "href": "http://localhost:8080/s3/datasets/demo-1w.zarr",
-      "xcube:store_kwargs": {
-        "data_store_id": "s3",
+      "xcube:data_store_id": "s3",
+      "xcube:data_store_params": {
         "root": "datasets",
         "storage_options": {
           "anon": true,
@@ -980,7 +980,7 @@
           }
         }
       },
-      "xcube:open_kwargs": {
+      "xcube:open_data_params": {
         "data_id": "demo-1w.zarr"
       },
       "xcube:analytic": {
@@ -1073,8 +1073,8 @@
       ],
       "type": "application/zarr",
       "href": "http://localhost:8080/s3/pyramids/demo-1w.levels",
-      "xcube:store_kwargs": {
-        "data_store_id": "s3",
+      "xcube:data_store_id": "s3",
+      "xcube:data_store_params": {
         "root": "pyramids",
         "storage_options": {
           "anon": true,
@@ -1083,7 +1083,7 @@
           }
         }
       },
-      "xcube:open_kwargs": {
+      "xcube:open_data_params": {
         "data_id": "demo-1w.levels"
       },
       "xcube:analytic_multires": {

diff --git a/xcube/webapi/ows/stac/controllers.py b/xcube/webapi/ows/stac/controllers.py
@@ -797,15 +797,15 @@ def _get_assets(ctx: DatasetsContext, base_url: str, dataset_id: str):
             "roles": ["data"],
             "type": "application/zarr",
             "href": f"{base_url}/s3/datasets/{dataset_id}.zarr",
-            "xcube:store_kwargs": {
-                "data_store_id": "s3",
+            "xcube:data_store_id": "s3",
+            "xcube:data_store_params": {
                 "root": "datasets",
                 "storage_options": {
                     "anon": True,
                     "client_kwargs": {"endpoint_url": "http://localhost:8080/s3"},
                 },
             },
-            "xcube:open_kwargs": {"data_id": f"{dataset_id}.zarr"},
+            "xcube:open_data_params": {"data_id": f"{dataset_id}.zarr"},
             "xcube:analytic": {
                 v["name"]: {
                     "title": f"{v['name']} data access",
@@ -821,15 +821,15 @@ def _get_assets(ctx: DatasetsContext, base_url: str, dataset_id: str):
             "roles": ["data"],
             "type": "application/zarr",
             "href": f"{base_url}/s3/pyramids/{dataset_id}.levels",
-            "xcube:store_kwargs": {
-                "data_store_id": "s3",
+            "xcube:data_store_id": "s3",
+            "xcube:data_store_params": {
                 "root": "pyramids",
                 "storage_options": {
                     "anon": True,
                     "client_kwargs": {"endpoint_url": "http://localhost:8080/s3"},
                 },
             },
-            "xcube:open_kwargs": {"data_id": f"{dataset_id}.levels"},
+            "xcube:open_data_params": {"data_id": f"{dataset_id}.levels"},
             "xcube:analytic_multires": {
                 v["name"]: {
                     "title": f"{v['name']} data access",