Fix mime type and links for items and item id

Author: francbartoli

pygeoapi/api/__init__.py

@@ -95,7 +95,7 @@
     (F_HTML, 'text/html'),
     (F_JSONLD, 'application/ld+json'),
     (F_JSON, 'application/json'),
-    (F_JSONFG, 'application/vnd.geo+json'),
+    (F_JSONFG, 'application/geo+json'),
     (F_JPEG, 'image/jpeg'),
     (F_MVT, 'application/vnd.mapbox-vector-tile'),
     (F_NETCDF, 'application/x-netcdf'),
@@ -1128,6 +1128,12 @@ def describe_collections(api: API, request: APIRequest,
                 'title': l10n.translate('Items as GeoJSON', request.locale),  # noqa
                 'href': f'{api.get_collections_url()}/{k}/items?f={F_JSON}'  # noqa
             })
+            collection['links'].append({
+                'type': FORMAT_TYPES[F_JSONFG],
+                'rel': 'items',
+                'title': l10n.translate('Items as JSON-FG', request.locale),  # noqa
+                'href': f'{api.get_collections_url()}/{k}/items?f={F_JSONFG}'  # noqa
+            })
             collection['links'].append({
                 'type': FORMAT_TYPES[F_JSONLD],
                 'rel': 'items',
@@ -1334,6 +1340,12 @@ def describe_collections(api: API, request: APIRequest,
             'title': l10n.translate('This document as JSON', request.locale),  # noqa
             'href': f'{api.get_collections_url()}?f={F_JSON}'
         })
+        fcm['links'].append({
+            'type': FORMAT_TYPES[F_JSONFG],
+            'rel': request.get_linkrel(F_JSONFG),
+            'title': l10n.translate('This document as JSON-FG', request.locale),  # noqa
+            'href': f'{api.get_collections_url()}?f={F_JSONFG}'
+        })
         fcm['links'].append({
             'type': FORMAT_TYPES[F_JSONLD],
             'rel': request.get_linkrel(F_JSONLD),

pygeoapi/api/itemtypes.py

@@ -574,6 +574,11 @@ def get_collection_items(
         'rel': request.get_linkrel(F_JSON),
         'title': l10n.translate('This document as GeoJSON', request.locale),
         'href': f'{uri}?f={F_JSON}{serialized_query_params}'
+    }, {
+        'rel': request.get_linkrel(F_JSONFG),
+        'type': FORMAT_TYPES[F_JSONFG],
+        'title': l10n.translate('This document as JSON-FG', request.locale),  # noqa
+        'href': f'{uri}?f={F_JSONFG}{serialized_query_params}'
     }, {
         'rel': request.get_linkrel(F_JSONLD),
         'type': FORMAT_TYPES[F_JSONLD],

pygeoapi/formatter/jsonfg.py

@@ -59,7 +59,7 @@ def __init__(self, formatter_def: dict):
             geom = formatter_def["geom"]
 
         super().__init__({"name": "jsonfg", "geom": geom})
-        self.mimetype = "application/vnd.ogc.fg+json"
+        self.mimetype = "application/geo+json"
 
     def write(self, data: dict, options: dict = {}) -> str:
         """