Fix missing links in items and item id

Author: francbartoli

pygeoapi/api/__init__.py

@@ -109,7 +109,7 @@
     'http://www.opengis.net/spec/ogcapi-common-2/1.0/conf/collections',
     'http://www.opengis.net/spec/ogcapi-common-1/1.0/conf/landing-page',
     'http://www.opengis.net/spec/ogcapi-common-1/1.0/conf/json',
-    'http://www.opengis.net/spec/json-fg-1/0.2/conf/core',
+    'http://www.opengis.net/spec/json-fg-1/0.3/conf/core',
     'http://www.opengis.net/spec/ogcapi-common-1/1.0/conf/oas30'
 ]
 

pygeoapi/api/itemtypes.py

@@ -710,7 +710,10 @@ def get_collection_items(
 
         try:
             content = formatter.write(
+                api=api,
                 data=content,
+                dataset=dataset,
+                id_field=(p.uri_field or 'id'),
                 options={
                     'provider_def': get_provider_by_type(
                         collections[dataset]['providers'],
@@ -723,7 +726,9 @@ def get_collection_items(
                 HTTPStatus.INTERNAL_SERVER_ERROR, headers, request.format,
                 'NoApplicableCode', msg)
 
-        return headers, HTTPStatus.OK, content
+        headers['Content-Type'] = formatter.mimetype
+
+        return headers, HTTPStatus.OK, to_json(content, api.pretty_print)
 
     return headers, HTTPStatus.OK, to_json(content, api.pretty_print)
 
@@ -947,6 +952,11 @@ def get_collection_item(api: API, request: APIRequest,
         'title': l10n.translate('This document as JSON', request.locale),
         'href': f'{uri}?f={F_JSON}'
         }, {
+        'rel': request.get_linkrel(F_JSONFG),
+        'type': FORMAT_TYPES[F_JSONFG],
+        'title': l10n.translate('This document as JSON-FG (JSON-FG)', request.locale),  # noqa
+        'href': f'{uri}?f={F_JSONFG}'
+        }, {
         'rel': request.get_linkrel(F_JSONLD),
         'type': FORMAT_TYPES[F_JSONLD],
         'title': l10n.translate('This document as RDF (JSON-LD)', request.locale),  # noqa
@@ -1010,15 +1020,15 @@ def get_collection_item(api: API, request: APIRequest,
         return headers, HTTPStatus.OK, content
 
     elif request.format == F_JSONFG:
-        # content = geojson2jsonfg(
-        #     api, content, dataset, id_field=(p.uri_field or 'id')
-        # )
         formatter = load_plugin('formatter',
                                 {'name': F_JSONFG, 'geom': True})
 
         try:
             content = formatter.write(
+                api=api,
                 data=content,
+                dataset=dataset,
+                id_field=(p.uri_field or 'id'),
                 options={
                     'provider_def': get_provider_by_type(
                         collections[dataset]['providers'],
@@ -1031,7 +1041,7 @@ def get_collection_item(api: API, request: APIRequest,
                 HTTPStatus.INTERNAL_SERVER_ERROR, headers, request.format,
                 'NoApplicableCode', msg)
 
-        return headers, HTTPStatus.OK, content
+        return headers, HTTPStatus.OK, to_json(content, api.pretty_print)
 
     return headers, HTTPStatus.OK, to_json(content, api.pretty_print)
 

pygeoapi/formatter/jsonfg.py

@@ -38,6 +38,7 @@
 from osgeo import gdal
 
 from pygeoapi.formatter.base import BaseFormatter, FormatterSerializationError
+from pygeoapi.api import APIRequest
 
 LOGGER = logging.getLogger(__name__)
 
@@ -61,7 +62,10 @@ def __init__(self, formatter_def: dict):
         super().__init__({"name": "jsonfg", "geom": geom})
         self.mimetype = "application/geo+json"
 
-    def write(self, data: dict, options: dict = {}) -> str:
+    def write(
+        self, api: APIRequest, data: dict,
+        dataset: str, id_field: str, options: dict = {}
+    ) -> dict:
         """
         Generate data in JSON-FG format
 
@@ -78,12 +82,14 @@ def write(self, data: dict, options: dict = {}) -> str:
                 fields = data["properties"].keys()
         except IndexError:
             LOGGER.error("no features")
-            return str()
+            return dict()
 
         LOGGER.debug(f"JSONFG fields: {fields}")
 
         try:
-            output = geojson2jsonfg(data=data, dataset="items")
+            links = data.get("links")
+            output = geojson2jsonfg(data=data, dataset=dataset)
+            output["links"] = links
             return output
         except ValueError as err:
             LOGGER.error(err)
@@ -98,18 +104,17 @@ def geojson2jsonfg(
     dataset: str,
     identifier: Union[str, None] = None,
     id_field: str = "id",
-) -> str:
+) -> dict:
     """
     Return JSON-FG from a GeoJSON content.
 
     :param cls: API object
     :param data: dict of data:
 
-    :returns: string of rendered JSON (JSON-FG)
+    :returns: dict of converted GeoJSON (JSON-FG)
     """
     gdal.UseExceptions()
     LOGGER.debug("Dump GeoJSON content into a data source")
-    # breakpoint()
     try:
         with gdal.OpenEx(json.dumps(data)) as srcDS:
             tmpfile = f"/vsimem/{uuid.uuid1()}.json"