Pv/fix content types (#362)

Author: Phil Varner

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Fixed
 
+- Fixed incorrect usage of `application/geo+json` in several link relations.
 - When cross-cluster search is configured, the first search without a collection returned
   zero results.
 

src/lib/api.js

@@ -320,19 +320,19 @@ const addCollectionLinks = function (results, endpoint) {
     // self link
     links.splice(0, 0, {
       rel: 'self',
-      type: 'application/geo+json',
+      type: 'application/json',
       href: `${endpoint}/collections/${id}`
     })
     // parent catalog
     links.push({
       rel: 'parent',
-      type: 'application/geo+json',
+      type: 'application/json',
       href: `${endpoint}`
     })
     // root catalog
     links.push({
       rel: 'root',
-      type: 'application/geo+json',
+      type: 'application/json',
       href: `${endpoint}`
     })
     // child items
@@ -372,7 +372,7 @@ const addItemLinks = function (results, endpoint) {
     // root catalog
     links.push({
       rel: 'root',
-      type: 'application/geo+json',
+      type: 'application/json',
       href: `${endpoint}`
     })
     links.push({
@@ -465,7 +465,8 @@ const buildPaginationLinks = function (limit, parameters, bbox, intersects, endp
     const link = {
       rel: 'next',
       title: 'Next page of Items',
-      method: httpMethod
+      method: httpMethod,
+      type: 'application/geo+json'
     }
     if (httpMethod === 'GET') {
       const nextQueryParameters = dictToURI(nextParams)
@@ -515,9 +516,11 @@ const searchItems = async function (collectionId, queryParameters, backend, endp
   })
 
   let newEndpoint = `${endpoint}/search`
+  let collectionEndpoint
   if (collectionId) {
     searchParams.collections = [collectionId]
     newEndpoint = `${endpoint}/collections/${collectionId}/items`
+    collectionEndpoint = `${endpoint}/collections/${collectionId}`
   }
 
   logger.debug(`Search parameters: ${JSON.stringify(searchParams)}`)
@@ -551,13 +554,18 @@ const searchItems = async function (collectionId, queryParameters, backend, endp
     links = paginationLinks.concat([
       {
         rel: 'self',
-        type: 'application/json',
-        href: `${newEndpoint}`
+        type: 'application/geo+json',
+        href: newEndpoint
       },
       {
         rel: 'root',
-        type: 'application/geo+json',
-        href: `${endpoint}`
+        type: 'application/json',
+        href: endpoint
+      },
+      {
+        rel: 'collection',
+        type: 'application/json',
+        href: collectionEndpoint
       }
     ])
   } else {
@@ -666,7 +674,7 @@ const aggregate = async function (queryParameters, backend, endpoint, httpMethod
     },
     {
       rel: 'root',
-      type: 'application/geo+json',
+      type: 'application/json',
       href: `${endpoint}`
     }]
   }
@@ -702,12 +710,12 @@ const getCatalog = async function (txnEnabled, backend, endpoint = '') {
   const links = [
     {
       rel: 'self',
-      type: 'application/geo+json',
+      type: 'application/json',
       href: `${endpoint}`
     },
     {
       rel: 'root',
-      type: 'application/geo+json',
+      type: 'application/json',
       href: `${endpoint}`
     },
     {
@@ -781,7 +789,7 @@ const getCollections = async function (backend, endpoint = '') {
       },
       {
         rel: 'root',
-        type: 'application/geo+json',
+        type: 'application/json',
         href: `${endpoint}`,
       },
     ],