Removed label->path logic

Author: Jelle Dijkstra

internal/controller/mapfilegenerator/mapper.go

@@ -57,7 +57,7 @@ func MapWFSToMapfileGeneratorInput(wfs *pdoknlv3.WFS, ownerInfo *smoothoperatorv
 			Abstract:        mapperutils.EscapeQuotes(wfs.Spec.Service.Abstract),
 			Keywords:        strings.Join(wfs.Spec.Service.KeywordsIncludingInspireKeyword(), ","),
 			OnlineResource:  pdoknlv3.GetHost(true),
-			Path:            mapperutils.GetPath(wfs),
+			Path:            "/" + pdoknlv3.GetBaseURLPath(wfs),
 			MetadataID:      metadataID,
 			Extent:          extent,
 			NamespacePrefix: wfs.Spec.Service.Prefix,
@@ -198,7 +198,7 @@ func MapWMSToMapfileGeneratorInput(wms *pdoknlv3.WMS, _ *smoothoperatorv1.OwnerI
 			NamespacePrefix: datasetName,
 			NamespaceURI:    fmt.Sprintf("%s://%s.geonovum.nl", protocol, datasetName),
 			OnlineResource:  pdoknlv3.GetHost(true),
-			Path:            mapperutils.GetPath(wms),
+			Path:            "/" + pdoknlv3.GetBaseURLPath(wms),
 			MetadataID:      metadataID,
 			DatasetOwner:    &datasetOwner,
 			AuthorityURL:    &authorityURL,

internal/controller/mapfilegenerator/test_data/input/wfs.yaml

@@ -92,4 +92,4 @@ spec:
     ownerInfoRef: ""
     prefix: prefix
     title: some Service title
-    url: ""
+    url: "http://localhost:32788/datasetOwner/dataset/theme/wfs/v1_0"

internal/controller/mapperutils/utils.go

@@ -1,7 +1,6 @@
 package mapperutils
 
 import (
-	"fmt"
 	"strings"
 
 	pdoknlv3 "github.com/pdok/mapserver-operator/api/v3"
@@ -54,25 +53,6 @@ func EscapeQuotes(s string) string {
 	return strings.ReplaceAll(s, "\"", "\\\"")
 }
 
-func GetPath[O pdoknlv3.WMSWFS](obj O) (path string) {
-	webserviceType := strings.ToLower(string(obj.Type()))
-	datasetOwner := GetLabelValueByKey(obj.GetLabels(), "dataset-owner")
-	dataset := GetLabelValueByKey(obj.GetLabels(), "dataset")
-	theme := GetLabelValueByKey(obj.GetLabels(), "theme")
-	serviceVersion := GetLabelValueByKey(obj.GetLabels(), "service-version")
-
-	path = fmt.Sprintf("/%s/%s", *datasetOwner, *dataset)
-	if theme != nil {
-		path += "/" + *theme
-	}
-	path += "/" + webserviceType
-	if serviceVersion != nil {
-		path += "/" + *serviceVersion
-	}
-
-	return path
-}
-
 func GetLabelValueByKey(labels map[string]string, key string) *string {
 	for k, v := range labels {
 		if k == key {

internal/controller/shared_controller.go

@@ -16,7 +16,6 @@ import (
 	"github.com/pdok/mapserver-operator/internal/controller/featureinfogenerator"
 	"github.com/pdok/mapserver-operator/internal/controller/legendgenerator"
 	"github.com/pdok/mapserver-operator/internal/controller/mapfilegenerator"
-	"github.com/pdok/mapserver-operator/internal/controller/mapperutils"
 	"github.com/pdok/mapserver-operator/internal/controller/mapserver"
 	"github.com/pdok/mapserver-operator/internal/controller/ogcwebserviceproxy"
 	"github.com/pdok/mapserver-operator/internal/controller/static"
@@ -913,7 +912,7 @@ func mutateConfigMap[R Reconciler, O pdoknlv3.WMSWFS](r R, obj O, configMap *cor
 	for _, name := range staticFileName {
 		content := contents[name]
 		if name == "include.conf" {
-			content = []byte(strings.ReplaceAll(string(content), "/{{ service_path }}", mapperutils.GetPath(obj)))
+			content = []byte(strings.ReplaceAll(string(content), "{{ service_path }}", pdoknlv3.GetBaseURLPath(obj)))
 		}
 		configMap.Data[name] = string(content)
 	}