full context for collections and items

default jsonld for collections did not allow for custom context. items were transofrmed to schems. woth this change context can be added for both collection level and items level

Author: pzaborowski

pygeoapi/api/__init__.py

@@ -1281,15 +1281,20 @@ def describe_collections(self, request: Union[APIRequest, Any],
             return headers, HTTPStatus.OK, content
 
         if request.format == F_JSONLD:
-            jsonld = self.fcmld.copy()
-            if dataset is not None:
-                jsonld['dataset'] = jsonldify_collection(self, fcm,
-                                                         request.locale)
+            if cls.config['metadata']['linked-data']:
+                jsonld = fcm
+                jsonld["@context"] = self.fcmld.copy()["@context"]
             else:
-                jsonld['dataset'] = [
-                    jsonldify_collection(self, c, request.locale)
-                    for c in fcm.get('collections', [])
-                ]
+                jsonld = self.fcmld.copy()
+                if dataset is not None:
+                    jsonld['dataset'] = jsonldify_collection(self, fcm,
+                                                             request.locale)
+                else:
+                    jsonld['dataset'] = [
+                        jsonldify_collection(self, c, request.locale)
+                        for c in fcm.get('collections', [])
+                    ]
+
             return headers, HTTPStatus.OK, to_json(jsonld, self.pretty_print)
 
         return headers, HTTPStatus.OK, to_json(fcm, self.pretty_print)

pygeoapi/linked_data.py

@@ -111,6 +111,8 @@ def inner(*args, **kwargs):
           }
         }
         cls.fcmld = fcmld
+        collections_context = cls.config['metadata']['linked-data'].get('collections-context', {})
+        fcmld["@context"].append(collections_context)
         return func(cls, *args[1:], **kwargs)
     return inner
 
@@ -193,9 +195,16 @@ def geojson2jsonld(cls, data: dict, dataset: str,
     jsonld = cls.config['resources'][dataset].get('linked-data', {})
     ds_url = f"{cls.get_collections_url()}/{dataset}"
 
+    direct_context = jsonld.get('direct-context', None)
     context = jsonld.get('context', []).copy()
     template = jsonld.get('item_template', None)
 
+    if direct_context:
+        return {
+            '@context': direct_context,
+            **data
+        }
+
     defaultVocabulary = {
         'schema': 'https://schema.org/',
         'type': '@type'