Merge pull request #374 from PDOK/fix-missing-fields-collections

fix: add version + displayNameTemplate to collections response

Author: rkettelerij

internal/ogc/common/geospatial/main_test.go

@@ -111,6 +111,28 @@ func TestNewCollections_Collections(t *testing.T) {
 				statusCode:   http.StatusOK,
 			},
 		},
+		{
+			name: "search config, check references to related collections",
+			fields: fields{
+				configFile: "internal/ogc/features_search/testdata/config_search.yaml",
+				url:        "http://localhost:8080/collections?f=json",
+			},
+			want: want{
+				bodyContains: "Related OGC API Features collection 'buildings' in HTML representation",
+				statusCode:   http.StatusOK,
+			},
+		},
+		{
+			name: "search config, check version",
+			fields: fields{
+				configFile: "internal/ogc/features_search/testdata/config_search.yaml",
+				url:        "http://localhost:8080/collections?f=json",
+			},
+			want: want{
+				bodyContains: "\"version\": 1,",
+				statusCode:   http.StatusOK,
+			},
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {

internal/ogc/common/geospatial/templates/collections.go.json

@@ -83,6 +83,16 @@
       ,"storageCrs" : "http://www.opengis.net/def/crs/OGC/1.3/CRS84"
       {{ end }}
       {{ end }}
+      {{ if and $cfg.OgcAPI.FeaturesSearch $cfg.OgcAPI.FeaturesSearch.Collections }}
+        {{ if $cfg.OgcAPI.FeaturesSearch.Collections.ContainsID $coll.ID }}
+          {{ range $idxSearch, $collSearch := $cfg.OgcAPI.FeaturesSearch.Collections }}
+            {{ if eq $collSearch.ID $coll.ID }}
+            ,"version" : {{ $collSearch.Version }}
+            ,"displayNameTemplate" : {{ mustToRawJson $collSearch.DisplayNameTemplate }}
+            {{ end }}
+          {{ end }}
+        {{ end }}
+      {{ end }}
       ,"links" : [
         {
           "rel" : "self",
@@ -153,20 +163,28 @@
         {{ if and $cfg.OgcAPI.FeaturesSearch $cfg.OgcAPI.FeaturesSearch.Collections }}
           {{ if $cfg.OgcAPI.FeaturesSearch.Collections.ContainsID $coll.ID }}
             {{ range $idxSearch, $collSearch := $cfg.OgcAPI.FeaturesSearch.Collections }}
-            {{ if and (eq $collSearch.ID $coll.ID) ($collSearch.IsRemoteFeatureCollection $coll.ID) }}
+            {{ if eq $collSearch.ID $coll.ID }}
             {{/* collection reference is only required for remotely hosted collections */}}
+            {{ if $collSearch.IsRemoteFeatureCollection $coll.ID }}
               ,
               {{ range $o, $collRef := $coll.CollectionRefs -}}
               {{ if $o }},{{ end }}
               {
-                "rel": "canonical",
+                "rel": "source", {{/* not an offical IANA link relation */}}
                 "type": "text/html",
-                "title": "{{ $collRef.CollectionID }}",
-                "href": "{{ $collRef.APIBaseURL }}/collections/{{ $collRef.CollectionID }}"
+                "title": "Related OGC API Features collection '{{ $collRef.CollectionID }}' in HTML representation",
+                "href": "{{ $collRef.APIBaseURL }}/collections/{{ $collRef.CollectionID }}?f=html"
+              },
+              {
+                "rel": "source", {{/* not an offical IANA link relation */}}
+                "type": "application/json",
+                "title": "Related OGC API Features collection '{{ $collRef.CollectionID }}' in JSON representation",
+                "href": "{{ $collRef.APIBaseURL }}/collections/{{ $collRef.CollectionID }}?f=json"
               }
               {{- end }}
             {{- end }}
             {{- end }}
+            {{- end }}
           {{end}}
         {{end}}
         {{ if and $cfg.OgcAPI.Features $cfg.OgcAPI.Features.Collections }}