Merge pull request #71 from PDOK/jd/small-fixes

Small fixes

Author: jelledijkstra97

internal/controller/capabilitiesgenerator/mapper.go

@@ -229,9 +229,9 @@ func MapWMSToCapabilitiesGeneratorInput(wms *pdoknlv3.WMS, ownerInfo *smoothoper
 
 	config := capabilitiesgenerator.Config{
 		Global: capabilitiesgenerator.Global{
-			// Prefix is unused for the WMS
-			Namespace:         mapperutils.GetNamespaceURI("", ownerInfo),
-			Prefix:            "",
+			// Prefix is unused for the WMS, but doesn't hurt to pass it
+			Namespace:         mapperutils.GetNamespaceURI(wms.Spec.Service.Prefix, ownerInfo),
+			Prefix:            wms.Spec.Service.Prefix,
 			Onlineresourceurl: pdoknlv3.GetHost(true),
 			Path:              "/" + pdoknlv3.GetBaseURLPath(wms),
 			Version:           *serviceVersion,

internal/controller/capabilitiesgenerator/test_data/wms_input.yaml

@@ -1,6 +1,6 @@
 global:
-  prefix: ""
-  namespace: http://.geonovum.nl
+  prefix: nwbwegen
+  namespace: http://nwbwegen.geonovum.nl
   onlineResourceUrl: http://localhost
   path: /rws/nwbwegen/wms/v1_0
   version: v1_0

internal/controller/featureinfogenerator/mapper.go

@@ -28,7 +28,7 @@ func MapWMSToFeatureinfoGeneratorInput(wms *pdoknlv3.WMS) (*featureinfo.Scheme,
 		}
 
 		parentLayer := wms.Spec.Service.GetParentLayer(layer)
-		if parentLayer != nil && parentLayer.IsGroupLayer() {
+		if parentLayer != nil && parentLayer.IsGroupLayer() && parentLayer.Name != wms.Spec.Service.Layer.Name {
 			l.GroupName = smoothoperatorutils.PointerVal(parentLayer.Name, "")
 		}
 

internal/controller/mapfilegenerator/mapfile_generator.go

@@ -40,9 +40,7 @@ func GetMapfileGeneratorInitContainer[O pdoknlv3.WMSWFS](obj O, images types.Ima
 	// Additional mapfile-generator configuration
 	if obj.HasPostgisData() {
 		initContainer.EnvFrom = []corev1.EnvFromSource{
-			// Todo add this ConfigMap
 			utils.NewEnvFromSource(utils.EnvFromSourceTypeConfigMap, postgisConfigName),
-			// Todo add this Secret
 			utils.NewEnvFromSource(utils.EnvFromSourceTypeSecret, postgisSecretName),
 		}
 	}

internal/controller/mapfilegenerator/mapfile_generator_test.go

@@ -81,7 +81,7 @@ func testWMS(t *testing.T, filenameWithoutExt string) {
 	assert.NoError(t, err)
 
 	diff := cmp.Diff(expected, inputStruct)
-	assert.Equal(t, diff, "", "%s", diff)
+	assert.Equal(t, diff == "", true, "%s", diff)
 }
 
 func readExpectedWMS(filename string) (WMSInput, error) {

internal/controller/mapfilegenerator/mapper.go

@@ -212,6 +212,17 @@ func MapWMSToMapfileGeneratorInput(wms *pdoknlv3.WMS, ownerInfo *smoothoperatorv
 		MaxSize:           maxSize,
 	}
 
+	if wms.Spec.Service.Layer.IsTopLayer() && wms.Spec.Service.Layer.Name != nil {
+		result.TopLevelName = *wms.Spec.Service.Layer.Name
+	}
+
+	if wms.Spec.Service.Resolution != nil {
+		result.Resolution = strconv.Itoa(int(*wms.Spec.Service.Resolution))
+	}
+	if wms.Spec.Service.DefResolution != nil {
+		result.DefResolution = strconv.Itoa(int(*wms.Spec.Service.DefResolution))
+	}
+
 	annotatedLayers := wms.Spec.Service.GetAnnotatedLayers()
 	for _, annotatedLayer := range annotatedLayers {
 		if annotatedLayer.IsDataLayer {
@@ -225,6 +236,10 @@ func MapWMSToMapfileGeneratorInput(wms *pdoknlv3.WMS, ownerInfo *smoothoperatorv
 				StyleName:  "",
 				StyleTitle: "",
 			}
+			if len(annotatedLayer.Layer.Styles) > 0 {
+				groupLayer.StyleName = annotatedLayer.Layer.Styles[0].Name
+				groupLayer.StyleTitle = smoothoperatorutils.PointerVal(annotatedLayer.Layer.Styles[0].Title, "")
+			}
 			result.GroupLayers = append(result.GroupLayers, groupLayer)
 		}
 	}

internal/controller/mapfilegenerator/types.go

@@ -46,6 +46,9 @@ type WMSInput struct {
 	OutputFormatJpg   string       `json:"outputformat_jpg"`
 	OutputFormatPng   string       `json:"outputformat_png8"`
 	MaxSize           string       `json:"maxSize"`
+	TopLevelName      string       `json:"top_level_name,omitempty"`
+	Resolution        string       `json:"resolution,omitempty"`
+	DefResolution     string       `json:"defresolution,omitempty"`
 }
 
 //nolint:tagliatelle
@@ -72,12 +75,13 @@ type WFSLayer struct {
 	BaseLayer
 }
 
+//nolint:tagliatelle
 type GroupLayer struct {
 	Name       string `json:"name"`
 	Title      string `json:"title"`
 	Abstract   string `json:"abstract"`
-	StyleName  string `json:"styleName"`
-	StyleTitle string `json:"styleTitle"`
+	StyleName  string `json:"style_name"`
+	StyleTitle string `json:"style_title"`
 }
 
 //nolint:tagliatelle
@@ -86,7 +90,7 @@ type WMSLayer struct {
 	GroupName                   string  `json:"group_name,omitempty"`
 	Styles                      []Style `json:"styles"`
 	Offsite                     string  `json:"offsite,omitempty"`
-	GetFeatureInfoIncludesClass bool    `json:"get_feature_info_includes_class"`
+	GetFeatureInfoIncludesClass bool    `json:"get_feature_info_includes_class,omitempty"`
 }
 
 type Column struct {

internal/controller/ogcwebserviceproxy/ogc_webservice_proxy.go

@@ -69,7 +69,7 @@ func GetConfig(wms *pdoknlv3.WMS) (config string, err error) {
 func MapWMSToOgcWebserviceProxyConfig(wms *pdoknlv3.WMS) (config Config, err error) {
 	dataLayersForGroupLayer := func(l pdoknlv3.Layer) []string {
 		var dataLayers []string
-		for _, childLayer := range l.Layers {
+		for _, childLayer := range l.GetAllSublayers() {
 			if childLayer.IsDataLayer() {
 				dataLayers = append(dataLayers, *childLayer.Name)
 			}

internal/controller/ogcwebserviceproxy/ogc_webservice_proxy_test.go

@@ -1,86 +1,46 @@
 package ogcwebserviceproxy
 
 import (
+	"os"
 	"testing"
 
+	"github.com/google/go-cmp/cmp"
+	"sigs.k8s.io/yaml"
+
 	pdoknlv3 "github.com/pdok/mapserver-operator/api/v3"
-	smoothoperatorutils "github.com/pdok/smooth-operator/pkg/util"
 )
 
-const expectedConfig = `grouplayers:
-    grouplayer-1:
-        - datalayer-1
-        - datalayer-2
-    grouplayer-2:
-        - datalayer-3
-        - datalayer-4
-`
-
 func TestGetConfig(t *testing.T) {
-	type args struct {
-		wms *pdoknlv3.WMS
-	}
-	tests := []struct {
-		name       string
-		args       args
-		wantConfig string
-		wantErr    bool
-	}{
-		{
-			name: "GetConfig for OGC Webservice proxy",
-			args: args{
-				wms: &pdoknlv3.WMS{
-					Spec: pdoknlv3.WMSSpec{
-						Service: pdoknlv3.WMSService{
-							Layer: pdoknlv3.Layer{
-								Name: smoothoperatorutils.Pointer("toplayer"),
-								Layers: []pdoknlv3.Layer{
-									{
-										Name: smoothoperatorutils.Pointer("grouplayer-1"),
-										Layers: []pdoknlv3.Layer{
-											{
-												Name: smoothoperatorutils.Pointer("datalayer-1"),
-												Data: &pdoknlv3.Data{Gpkg: &pdoknlv3.Gpkg{BlobKey: "blob-1"}},
-											},
-											{
-												Name: smoothoperatorutils.Pointer("datalayer-2"),
-												Data: &pdoknlv3.Data{Gpkg: &pdoknlv3.Gpkg{BlobKey: "blob-2"}},
-											},
-										},
-									},
-									{
-										Name: smoothoperatorutils.Pointer("grouplayer-2"),
-										Layers: []pdoknlv3.Layer{
-											{
-												Name: smoothoperatorutils.Pointer("datalayer-3"),
-												Data: &pdoknlv3.Data{Gpkg: &pdoknlv3.Gpkg{BlobKey: "blob-3"}},
-											},
-											{
-												Name: smoothoperatorutils.Pointer("datalayer-4"),
-												Data: &pdoknlv3.Data{Gpkg: &pdoknlv3.Gpkg{BlobKey: "blob-4"}},
-											},
-										},
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			wantConfig: expectedConfig,
-			wantErr:    false,
-		},
-	}
+	tests := []string{"named-toplayer", "unnamed-toplayer"}
+
 	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			gotConfig, err := GetConfig(tt.args.wms)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("GetConfig() error = %v, wantErr %v", err, tt.wantErr)
-				return
-			}
-			if gotConfig != tt.wantConfig {
-				t.Errorf("GetConfig() gotConfig = %v, want %v", gotConfig, tt.wantConfig)
-			}
-		})
+		input, err := os.ReadFile("test_data/input/" + tt + ".yaml")
+		if err != nil {
+			t.Errorf("os.ReadFile() error = %v", err)
+		}
+		wms := &pdoknlv3.WMS{}
+		if err := yaml.Unmarshal(input, wms); err != nil {
+			t.Errorf("yaml.Unmarshal() error = %v", err)
+		}
+
+		generated, err := MapWMSToOgcWebserviceProxyConfig(wms)
+		if err != nil {
+			t.Errorf("MapWMSToOgcWebserviceProxyConfig() error = %v", err)
+		}
+
+		expectedBytes, err := os.ReadFile("test_data/expected/" + tt + ".yaml")
+		if err != nil {
+			t.Errorf("os.ReadFile() error = %v", err)
+		}
+
+		var expected Config
+		if err := yaml.Unmarshal(expectedBytes, &expected); err != nil {
+			t.Errorf("yaml.Unmarshal() error = %v", err)
+		}
+
+		diff := cmp.Diff(expected, generated)
+		if diff != "" {
+			t.Errorf("GetConfig() mismatch (-want +got):\n%s", diff)
+		}
 	}
 }

internal/controller/ogcwebserviceproxy/test_data/expected/named-toplayer.yaml

@@ -0,0 +1,12 @@
+grouplayers:
+  grouplayer-1:
+    - datalayer-1
+    - datalayer-2
+  grouplayer-2:
+    - datalayer-3
+    - datalayer-4
+  toplayer:
+    - datalayer-1
+    - datalayer-2
+    - datalayer-3
+    - datalayer-4