update EDR parameter defs (#2279) (#2284)

Author: tomkralidis

pygeoapi/api/collection.py

@@ -404,15 +404,15 @@ def gen_collection(api, request, dataset: str,
         if parameters:
             data['parameter_names'] = {}
             for key, value in parameters.items():
+                p_label = value.get('title')
+                p_description = value.get('description')
                 data['parameter_names'][key] = {
                     'id': key,
                     'type': 'Parameter',
-                    'name': value['title'],
                     'observedProperty': {
                         'label': {
-                            'id': key,
-                            'en': value['title']
-                        },
+                            'en': p_label
+                        }
                     },
                     'unit': {
                         'label': {
@@ -425,10 +425,12 @@ def gen_collection(api, request, dataset: str,
                     }
                 }
 
-                data['parameter_names'][key].update({
-                    'description': value['description']}
-                        if 'description' in value else {}
-                )
+                if p_description is not None:
+                    data['parameter_names'][key]['observedProperty'].update({
+                        'description': {
+                            'en': p_description
+                        }
+                    })
 
         for qt in p.get_query_types():
             data_query = {

pygeoapi/templates/collections/collection.html

@@ -98,7 +98,7 @@ <h3>Parameters</h3>
         {% for parameter in data['parameter_names'].values() %}
         <tr>
           <td>{{ parameter['id'] }}</td>
-          <td>{{ parameter['name'] }}</td>
+          <td>{{ parameter['observedProperty']['label'].values()|first }}{% if parameter['observedProperty']['description'] %}<br/><i>{{ parameter['observedProperty']['description'].values()|first }}</i>{% endif %}</td>
           <td>{{ parameter['unit']['symbol']['value'] }}</td>
         </tr>
         {% endfor %}

tests/api/test_environmental_data_retrieval.py

@@ -41,6 +41,23 @@
 from tests.util import mock_api_request
 
 
+def test_describe_collection_edr(config, api_):
+    req = mock_api_request()
+    rsp_headers, code, response = describe_collections(api_, req, 'icoads-sst')
+    collection = json.loads(response)
+    parameter_names = list(collection['parameter_names'].keys())
+    parameter_names.sort()
+    assert len(parameter_names) == 4
+    assert parameter_names == ['AIRT', 'SST', 'UWND', 'VWND']
+
+    sst = collection['parameter_names']['SST']
+    assert sst['id'] == 'SST'
+    assert sst['type'] == 'Parameter'
+    assert sst['observedProperty']['label']['en'] == 'SEA SURFACE TEMPERATURE'
+    assert sst['unit']['label']['en'] == 'SEA SURFACE TEMPERATURE'
+    assert sst['unit']['symbol']['value'] == 'Deg C'
+
+
 def test_get_collection_edr_query(config, api_):
     # edr resource
     req = mock_api_request()