update EDR compliance

geopython · Jan 5, 2025 · 2443174 · 2443174
1 parent 96c019a
commit 2443174
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 13 deletions.
diff --git a/pygeoapi/api/__init__.py b/pygeoapi/api/__init__.py
@@ -1113,12 +1113,12 @@ def describe_collections(api: API, request: APIRequest,
                 'href': f'{api.get_collections_url()}/{k}/items?f={F_HTML}'  # noqa
             })
 
-            # OAPIF Part 2 - list supported CRSs and StorageCRS
-            if collection_data_type == 'feature':
-                collection['crs'] = get_supported_crs_list(collection_data, DEFAULT_CRS_LIST) # noqa
-                collection['storageCRS'] = collection_data.get('storage_crs', DEFAULT_STORAGE_CRS) # noqa
-                if 'storage_crs_coordinate_epoch' in collection_data:
-                    collection['storageCrsCoordinateEpoch'] = collection_data.get('storage_crs_coordinate_epoch') # noqa
+        # OAPIF Part 2 - list supported CRSs and StorageCRS
+        if collection_data_type in ['edr', 'feature']:
+            collection['crs'] = get_supported_crs_list(collection_data, DEFAULT_CRS_LIST) # noqa
+            collection['storageCRS'] = collection_data.get('storage_crs', DEFAULT_STORAGE_CRS) # noqa
+            if 'storage_crs_coordinate_epoch' in collection_data:
+                collection['storageCrsCoordinateEpoch'] = collection_data.get('storage_crs_coordinate_epoch') # noqa
 
         elif collection_data_type == 'coverage':
             # TODO: translate
@@ -1235,6 +1235,12 @@ def describe_collections(api: API, request: APIRequest,
                         'id': key,
                         'type': 'Parameter',
                         'name': value['title'],
+                        'observedProperty': {
+                            'label': {
+                                'id': key,
+                                'en': value['title']
+                            },
+                        },
                         'unit': {
                             'label': {
                                 'en': value['title']
@@ -1250,8 +1256,11 @@ def describe_collections(api: API, request: APIRequest,
                 data_query = {
                     'link': {
                         'href': f'{api.get_collections_url()}/{k}/{qt}',
-                        'rel': 'data'
-                     }
+                        'rel': 'data',
+                        'variables': {
+                            'query_type': qt
+                        }
+                    }
                 }
                 collection['data_queries'][qt] = data_query
 
@@ -1264,13 +1273,13 @@ def describe_collections(api: API, request: APIRequest,
                     'type': 'application/json',
                     'rel': 'data',
                     'title': title1,
-                    'href': f'{api.get_collections_url()}/{k}/{qt}?f={F_JSON}'  # noqa
+                    'href': f'{api.get_collections_url()}/{k}/{qt}?f={F_JSON}'
                 })
                 collection['links'].append({
                     'type': FORMAT_TYPES[F_HTML],
                     'rel': 'data',
                     'title': title2,
-                    'href': f'{api.get_collections_url()}/{k}/{qt}?f={F_HTML}'  # noqa
+                    'href': f'{api.get_collections_url()}/{k}/{qt}?f={F_HTML}'
                 })
 
         if dataset is not None and k == dataset:

diff --git a/pygeoapi/api/environmental_data_retrieval.py b/pygeoapi/api/environmental_data_retrieval.py
@@ -284,17 +284,34 @@ def get_oas_30(cfg: dict, locale: str) -> tuple[list[dict[str, str]], dict[str,
 
             for eqe in edr_query_endpoints:
                 if eqe['qt'] == 'cube':
-                    spatial_parameter = 'bbox'
+                    spatial_parameter = {
+                        'description': 'Only features that have a geometry that intersects the bounding box are selected.The bounding box is provided as four or six numbers, depending on whether the coordinate reference system includes a vertical axis (height or depth).',  # noqa
+                        'explode': False,
+                        'in': 'query',
+                        'name': 'bbox',
+                        'required': True,
+                        'schema': {
+                            'items': {
+                                'type': 'number'
+                            },
+                            'maxItems': 6,
+                            'minItems': 4,
+                            'type': 'array'
+                        },
+                        'style': 'form'
+                    }
                 else:
-                    spatial_parameter = f"{eqe['qt']}Coords"
+                    spatial_parameter = {
+                        '$ref': f"{OPENAPI_YAML['oaedr']}/parameters/{eqe['qt']}Coords.yaml"  # noqa
+                    }
                 paths[eqe['path']] = {
                     'get': {
                         'summary': f"query {v['description']} by {eqe['qt']}",
                         'description': v['description'],
                         'tags': [k],
                         'operationId': eqe['op_id'],
                         'parameters': [
-                            {'$ref': f"{OPENAPI_YAML['oaedr']}/parameters/{spatial_parameter}.yaml"},  # noqa
+                            spatial_parameter,
                             {'$ref': f"{OPENAPI_YAML['oapif-1']}#/components/parameters/datetime"},  # noqa
                             {'$ref': f"{OPENAPI_YAML['oaedr']}/parameters/parameter-name.yaml"},  # noqa
                             {'$ref': f"{OPENAPI_YAML['oaedr']}/parameters/z.yaml"},  # noqa

diff --git a/tests/cite/cite.config.yml b/tests/cite/cite.config.yml
@@ -56,6 +56,35 @@ metadata:
         role: pointOfContact
 
 resources:
+    icoads-sst:
+        type: collection
+        title: International Comprehensive Ocean-Atmosphere Data Set (ICOADS)
+        description: International Comprehensive Ocean-Atmosphere Data Set (ICOADS)
+        keywords:
+            - icoads
+            - sst
+            - air temperature
+        extents:
+            spatial:
+                bbox: [-180,-90,180,90]
+                crs: http://www.opengis.net/def/crs/OGC/1.3/CRS84
+            temporal:
+                begin: 2000-01-16T06:00:00Z
+                end: 2000-12-16T01:20:06Z
+        links:
+            - type: text/html
+              rel: canonical
+              title: information
+              href: https://psl.noaa.gov/data/gridded/data.coads.1deg.html
+              hreflang: en-US
+        providers:
+            - type: edr
+              name: xarray-edr
+              data: ../data/coads_sst.nc
+              format:
+                  name: NetCDF
+                  mimetype: application/x-netcdf
+
     canada-hydat-daily-mean-02hc003:
         type: collection
         title: Daily Mean of Water Level or Flow