Merge pull request #41 from PDOK/jd/inspire-keywords

Inspire keywords

Author: jelledijkstra97

api/v3/wfs_types.go

@@ -28,6 +28,7 @@ import (
 	shared_model "github.com/pdok/smooth-operator/model"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"slices"
 )
 
 // EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
@@ -145,6 +146,15 @@ type WFSService struct {
 	FeatureTypes []FeatureType `json:"featureTypes"`
 }
 
+func (s WFSService) KeywordsIncludingInspireKeyword() []string {
+	keywords := s.Keywords
+	if s.Inspire != nil && !slices.Contains(keywords, "infoFeatureAccessService") {
+		keywords = append(keywords, "infoFeatureAccessService")
+	}
+
+	return keywords
+}
+
 type Bbox struct {
 	// EXTENT/wfs_extent in mapfile
 	//nolint:tagliatelle

api/v3/wms_types.go

@@ -118,6 +118,15 @@ type WMSService struct {
 	Layer Layer `json:"layer"`
 }
 
+func (s WMSService) KeywordsIncludingInspireKeyword() []string {
+	keywords := s.Keywords
+	if s.Inspire != nil && !slices.Contains(keywords, "infoMapAccessService") {
+		keywords = append(keywords, "infoMapAccessService")
+	}
+
+	return keywords
+}
+
 // +kubebuilder:validation:XValidation:message="Either blobKeys or configMapRefs is required",rule="has(self.blobKeys) || has(self.configMapRefs)"
 type StylingAssets struct {
 	// +kubebuilder:validations:MinItems:=1

internal/controller/capabilitiesgenerator/mapper.go

@@ -49,7 +49,7 @@ func MapWFSToCapabilitiesGeneratorInput(wfs *pdoknlv3.WFS, ownerInfo *smoothoper
 						Abstract:          mapperutils.EscapeQuotes(wfs.Spec.Service.Abstract),
 						AccessConstraints: *wfs.Spec.Service.AccessConstraints,
 						Keywords: &wsc110.Keywords{
-							Keyword: wfs.Spec.Service.Keywords,
+							Keyword: wfs.Spec.Service.KeywordsIncludingInspireKeyword(),
 						},
 					},
 					Capabilities: wfs200.Capabilities{
@@ -232,7 +232,7 @@ func MapWMSToCapabilitiesGeneratorInput(wms *pdoknlv3.WMS, ownerInfo *smoothoper
 						Name:               "WMS",
 						Title:              mapperutils.EscapeQuotes(wms.Spec.Service.Title),
 						Abstract:           &abstract,
-						KeywordList:        &wms130.Keywords{Keyword: wms.Spec.Service.Keywords},
+						KeywordList:        &wms130.Keywords{Keyword: wms.Spec.Service.KeywordsIncludingInspireKeyword()},
 						OnlineResource:     wms130.OnlineResource{Href: &hostBaseURL},
 						ContactInformation: getContactInformation(ownerInfo),
 						Fees:               smoothoperatorutils.Pointer("NONE"),

internal/controller/capabilitiesgenerator/test_data/wms_input.yaml

@@ -35,6 +35,7 @@ services:
             - Hectometerpunten
             - HVD
             - Mobiliteit
+            - infoMapAccessService
         onlineResource:
           xlink: null
           type: null