Requested changes

Author: Jelle Dijkstra

internal/controller/capabilitiesgenerator/capabilities_generator_test.go

@@ -652,8 +652,8 @@ func TestInputForWMS(t *testing.T) {
 	pdoknlv3.SetHost("http://localhost")
 
 	contactPersonPrimary := smoothoperatorv1.ContactPersonPrimary{
-		ContactPerson:       asPtr("KlantContactCenter PDOK"),
-		ContactOrganization: asPtr("PDOK"),
+		ContactPerson:       smoothoperatorutils.Pointer("KlantContactCenter PDOK"),
+		ContactOrganization: smoothoperatorutils.Pointer("PDOK"),
 	}
 
 	ownerInfo := smoothoperatorv1.OwnerInfo{
@@ -667,18 +667,18 @@ func TestInputForWMS(t *testing.T) {
 			WMS: &smoothoperatorv1.WMS{
 				ContactInformation: smoothoperatorv1.ContactInformation{
 					ContactPersonPrimary: &contactPersonPrimary,
-					ContactPosition:      asPtr("pointOfContact"),
+					ContactPosition:      smoothoperatorutils.Pointer("pointOfContact"),
 					ContactAddress: &smoothoperatorv1.ContactAddress{
-						AddressType:     asPtr("Work"),
+						AddressType:     smoothoperatorutils.Pointer("Work"),
 						Address:         nil,
-						City:            asPtr("Apeldoorn"),
+						City:            smoothoperatorutils.Pointer("Apeldoorn"),
 						StateOrProvince: nil,
 						PostCode:        nil,
-						Country:         asPtr("The Netherlands"),
+						Country:         smoothoperatorutils.Pointer("The Netherlands"),
 					},
 					ContactVoiceTelephone:        nil,
 					ContactFacsimileTelephone:    nil,
-					ContactElectronicMailAddress: asPtr("[email protected]"),
+					ContactElectronicMailAddress: smoothoperatorutils.Pointer("[email protected]"),
 				},
 			},
 		},

internal/controller/capabilitiesgenerator/mapper.go

@@ -232,7 +232,7 @@ func MapWMSToCapabilitiesGeneratorInput(wms *pdoknlv3.WMS, ownerInfo *smoothoper
 						KeywordList:        &wms130.Keywords{Keyword: wms.Spec.Service.Keywords},
 						OnlineResource:     wms130.OnlineResource{Href: &hostBaseURL},
 						ContactInformation: getContactInformation(ownerInfo),
-						Fees:               asPtr("NONE"),
+						Fees:               smoothoperatorutils.Pointer("NONE"),
 						AccessConstraints:  &wms.Spec.Service.AccessConstraints,
 						LayerLimit:         nil,
 						MaxWidth:           &maxWidth,
@@ -338,7 +338,7 @@ func getDcpType(url string, fillPost bool) *wms130.DCPType {
 		OnlineResource: wms130.OnlineResource{
 			Xlink: nil,
 			Type:  nil,
-			Href:  asPtr(url),
+			Href:  smoothoperatorutils.Pointer(url),
 		},
 	}
 
@@ -364,9 +364,9 @@ func getLayers(wms *pdoknlv3.WMS, canonicalURL string) []wms130.Layer {
 	referenceLayer := wms.Spec.Service.Layer
 	title := referenceLayer.Title
 	if title != nil {
-		title = asPtr(mapperutils.EscapeQuotes(*referenceLayer.Title))
+		title = smoothoperatorutils.Pointer(mapperutils.EscapeQuotes(*referenceLayer.Title))
 	} else {
-		title = asPtr("")
+		title = smoothoperatorutils.Pointer("")
 	}
 
 	defaultCrs := []wms130.CRS{{
@@ -508,11 +508,11 @@ func getLayers(wms *pdoknlv3.WMS, canonicalURL string) []wms130.Layer {
 	}
 
 	topLayer := wms130.Layer{
-		Queryable:               asPtr(1),
+		Queryable:               smoothoperatorutils.Pointer(1),
 		Opaque:                  nil,
 		Name:                    nil,
 		Title:                   *title,
-		Abstract:                asPtr(mapperutils.EscapeQuotes(wms.Spec.Service.Abstract)),
+		Abstract:                smoothoperatorutils.Pointer(mapperutils.EscapeQuotes(wms.Spec.Service.Abstract)),
 		KeywordList:             &wms130.Keywords{Keyword: referenceLayer.Keywords},
 		CRS:                     defaultCrs,
 		EXGeographicBoundingBox: &defaultBoundingBox,
@@ -552,12 +552,12 @@ func getLayers(wms *pdoknlv3.WMS, canonicalURL string) []wms130.Layer {
 
 		if layer.DatasetMetadataURL != nil {
 			metadataUrls = append(metadataUrls, &wms130.MetadataURL{
-				Type:   asPtr("TC211"),
-				Format: asPtr("text/plain"),
+				Type:   smoothoperatorutils.Pointer("TC211"),
+				Format: smoothoperatorutils.Pointer("text/plain"),
 				OnlineResource: wms130.OnlineResource{
 					Xlink: nil,
-					Type:  asPtr("simple"),
-					Href:  asPtr("https://www.nationaalgeoregister.nl/geonetwork/srv/dut/csw?service=CSW&version=2.0.2&request=GetRecordById&outputschema=http://www.isotc211.org/2005/gmd&elementsetname=full&id=" + layer.DatasetMetadataURL.CSW.MetadataIdentifier),
+					Type:  smoothoperatorutils.Pointer("simple"),
+					Href:  smoothoperatorutils.Pointer("https://www.nationaalgeoregister.nl/geonetwork/srv/dut/csw?service=CSW&version=2.0.2&request=GetRecordById&outputschema=http://www.isotc211.org/2005/gmd&elementsetname=full&id=" + layer.DatasetMetadataURL.CSW.MetadataIdentifier),
 				},
 			})
 		}
@@ -570,7 +570,7 @@ func getLayers(wms *pdoknlv3.WMS, canonicalURL string) []wms130.Layer {
 		}
 
 		nestedLayer := wms130.Layer{
-			Queryable: asPtr(1),
+			Queryable: smoothoperatorutils.Pointer(1),
 			Opaque:    nil,
 			Name:      layer.Name,
 			Title:     smoothoperatorutils.PointerVal(layer.Title, ""),
@@ -604,8 +604,8 @@ func getLayers(wms *pdoknlv3.WMS, canonicalURL string) []wms130.Layer {
 					Format: "image/png",
 					OnlineResource: wms130.OnlineResource{
 						Xlink: nil,
-						Type:  asPtr("simple"),
-						Href:  asPtr(canonicalURL + "/legend/" + *layer.Name + "/" + style.Name + ".png"),
+						Type:  smoothoperatorutils.Pointer("simple"),
+						Href:  smoothoperatorutils.Pointer(canonicalURL + "/legend/" + *layer.Name + "/" + style.Name + ".png"),
 					},
 				},
 				StyleSheetURL: nil,
@@ -619,7 +619,3 @@ func getLayers(wms *pdoknlv3.WMS, canonicalURL string) []wms130.Layer {
 	result = append(result, topLayer)
 	return result
 }
-
-func asPtr[T any](value T) *T {
-	return &value
-}