Refactored layer classification to fix tests

Author: Jelle Dijkstra

api/v3/wms_types.go

@@ -313,39 +313,38 @@ type AnnotatedLayer struct {
 func (wmsService *WMSService) GetAnnotatedLayers() []AnnotatedLayer {
 	result := make([]AnnotatedLayer, 0)
 
-	topLayer := wmsService.Layer
-	annotatedTopLayer := AnnotatedLayer{
-		GroupName:    nil,
-		IsTopLayer:   true,
-		IsGroupLayer: topLayer.Name != nil,
-		IsDataLayer:  false,
-		Layer:        topLayer,
+	firstLayer := AnnotatedLayer{}
+	if wmsService.Layer.Name != nil && len(*wmsService.Layer.Name) > 0 {
+		firstLayer = AnnotatedLayer{
+			GroupName:    nil,
+			IsTopLayer:   wmsService.Layer.IsTopLayer(),
+			IsGroupLayer: wmsService.Layer.IsGroupLayer(),
+			IsDataLayer:  wmsService.Layer.IsDataLayer(),
+			Layer:        wmsService.Layer,
+		}
+		result = append(result, firstLayer)
 	}
-	result = append(result, annotatedTopLayer)
 
-	for _, topLayerChild := range topLayer.Layers {
-		groupName := topLayer.Name
-		isGroupLayer := topLayerChild.Layers != nil && len(topLayerChild.Layers) > 0
+	for _, subLayer := range wmsService.Layer.Layers {
+		groupName := wmsService.Layer.Name
+		isGroupLayer := subLayer.IsGroupLayer()
 		isDataLayer := !isGroupLayer
 		result = append(result, AnnotatedLayer{
 			GroupName:    groupName,
 			IsTopLayer:   false,
 			IsGroupLayer: isGroupLayer,
 			IsDataLayer:  isDataLayer,
-			Layer:        topLayerChild,
+			Layer:        subLayer,
 		})
 
-		if len(topLayerChild.Layers) > 0 {
-			for _, middleLayerChild := range topLayerChild.Layers {
-				groupName = topLayerChild.Name
-				result = append(result, AnnotatedLayer{
-					GroupName:    groupName,
-					IsTopLayer:   false,
-					IsGroupLayer: false,
-					IsDataLayer:  true,
-					Layer:        middleLayerChild,
-				})
-			}
+		for _, subSubLayer := range subLayer.Layers {
+			result = append(result, AnnotatedLayer{
+				GroupName:    subLayer.Name,
+				IsTopLayer:   false,
+				IsGroupLayer: false,
+				IsDataLayer:  true,
+				Layer:        subSubLayer,
+			})
 		}
 	}
 
@@ -423,8 +422,22 @@ func (layer *Layer) IsGroupLayer() bool {
 	return len(layer.Layers) > 0
 }
 
-func (layer *Layer) IsTopLayer(service *WMSService) bool {
-	return layer.Name == service.Layer.Name
+// IsTopLayer - a layer is a toplayer if and only if it has sublayers that are group layers.
+// In other words the layer is level 1 in a 3 level hierarchy.
+func (layer *Layer) IsTopLayer() bool {
+	if layer.IsGroupLayer() {
+		for _, childLayer := range layer.Layers {
+			if childLayer.IsGroupLayer() {
+				return true
+			}
+		}
+	}
+
+	return false
+}
+
+func (layer *Layer) IsVisible() bool {
+	return layer.Visible == nil || *layer.Visible
 }
 
 func (layer *Layer) hasBoundingBoxForCRS(crs string) bool {

config/crd/bases/pdok.nl_wfs.yaml

@@ -456,7 +456,7 @@ spec:
               horizontalPodAutoscalerPatch:
                 description: |-
                   HorizontalPodAutoscalerPatch - copy of autoscalingv2.HorizontalPodAutoscalerSpec without ScaleTargetRef
-                  To that v3 CRD end up with an empty scaleTargetRef when marshalling. This can be removed when we're done with converting CRDs.
+                  This way we don't have to specify the scaleTargetRef field in the CRD.
                 properties:
                   behavior:
                     description: |-

internal/controller/capabilitiesgenerator/capabilities_generator_test.go

@@ -558,7 +558,7 @@ func TestGetInputForWFS(t *testing.T) {
 							Title:             "some Service title",
 							Abstract:          "some \"Service\" abstract",
 							Keywords:          []string{"service-keyword-1", "service-keyword-2", "infoFeatureAccessService"},
-							AccessConstraints: "http://creativecommons.org/publicdomain/zero/1.0/deed.nl",
+							AccessConstraints: smoothoperatorutils.Pointer("http://creativecommons.org/publicdomain/zero/1.0/deed.nl"),
 							Inspire: &pdoknlv3.Inspire{
 								ServiceMetadataURL: pdoknlv3.MetadataURL{
 									CSW: &pdoknlv3.Metadata{

internal/controller/capabilitiesgenerator/mapper.go

@@ -46,7 +46,7 @@ func MapWFSToCapabilitiesGeneratorInput(wfs *pdoknlv3.WFS, ownerInfo *smoothoper
 					ServiceIdentification: wfs200.ServiceIdentification{
 						Title:             mapperutils.EscapeQuotes(wfs.Spec.Service.Title),
 						Abstract:          mapperutils.EscapeQuotes(wfs.Spec.Service.Abstract),
-						AccessConstraints: wfs.Spec.Service.AccessConstraints,
+						AccessConstraints: *wfs.Spec.Service.AccessConstraints,
 						Keywords: &wsc110.Keywords{
 							Keyword: wfs.Spec.Service.Keywords,
 						},
@@ -221,8 +221,8 @@ func MapWMSToCapabilitiesGeneratorInput(wms *pdoknlv3.WMS, ownerInfo *smoothoper
 	maxHeight := 4000
 
 	accessContraints := wms.Spec.Service.AccessConstraints
-	if accessContraints == "" {
-		accessContraints = "https://creativecommons.org/publicdomain/zero/1.0/deed.nl"
+	if accessContraints == nil || *accessContraints == "" {
+		accessContraints = smoothoperatorutils.Pointer("https://creativecommons.org/publicdomain/zero/1.0/deed.nl")
 	}
 
 	config := capabilitiesgenerator.Config{
@@ -245,7 +245,7 @@ func MapWMSToCapabilitiesGeneratorInput(wms *pdoknlv3.WMS, ownerInfo *smoothoper
 						OnlineResource:     wms130.OnlineResource{Href: &hostBaseURL},
 						ContactInformation: getContactInformation(ownerInfo),
 						Fees:               fees,
-						AccessConstraints:  &accessContraints,
+						AccessConstraints:  accessContraints,
 						LayerLimit:         nil,
 						MaxWidth:           &maxWidth,
 						MaxHeight:          &maxHeight,

internal/controller/mapfilegenerator/mapfile_generator_test.go

@@ -130,7 +130,7 @@ func TestGetConfigForWFS(t *testing.T) {
 							Title:             "some Service title",
 							Abstract:          "some \"Service\" abstract",
 							Keywords:          []string{"service-keyword-1", "service-keyword-2", "infoFeatureAccessService"},
-							AccessConstraints: "http://creativecommons.org/publicdomain/zero/1.0/deed.nl",
+							AccessConstraints: smoothoperatorutils.Pointer("http://creativecommons.org/publicdomain/zero/1.0/deed.nl"),
 							Bbox: &pdoknlv3.Bbox{
 								DefaultCRS: shared_model.BBox{
 									MinX: "0.0",
@@ -317,6 +317,7 @@ func TestGetConfigForWMSWithGroupLayersAndTopGroupLayer(t *testing.T) {
 	inputStruct, err := MapWMSToMapfileGeneratorInput(&wms, ownerInfo)
 	assert.NoError(t, err)
 	expected := WMSInput{}
+	assert.NoError(t, err)
 	err = json.Unmarshal([]byte(WMSGroupAndToplayerConfig), &expected)
 	assert.NoError(t, err)
 

internal/controller/mapfilegenerator/mapper.go

@@ -118,8 +118,8 @@ func MapWMSToMapfileGeneratorInput(wms *pdoknlv3.WMS, _ *smoothoperatorv1.OwnerI
 	service := wms.Spec.Service
 
 	accessConstraints := service.AccessConstraints
-	if accessConstraints == "" {
-		accessConstraints = "https://creativecommons.org/publicdomain/zero/1.0/deed.nl"
+	if accessConstraints == nil || *accessConstraints == "" {
+		accessConstraints = smoothoperatorutils.Pointer("https://creativecommons.org/publicdomain/zero/1.0/deed.nl")
 	}
 
 	datasetOwner := ""
@@ -183,7 +183,7 @@ func MapWMSToMapfileGeneratorInput(wms *pdoknlv3.WMS, _ *smoothoperatorv1.OwnerI
 			DataEPSG:        service.DataEPSG,
 			EPSGList:        epsgs,
 		},
-		AccessConstraints: accessConstraints,
+		AccessConstraints: *accessConstraints,
 		Layers:            []WMSLayer{},
 		GroupLayers:       []GroupLayer{},
 		Symbols:           getSymbols(wms),
@@ -199,7 +199,7 @@ func MapWMSToMapfileGeneratorInput(wms *pdoknlv3.WMS, _ *smoothoperatorv1.OwnerI
 		if annotatedLayer.IsDataLayer {
 			layer := getWMSLayer(annotatedLayer.Layer, extent, wms)
 			result.Layers = append(result.Layers, layer)
-		} else if annotatedLayer.IsGroupLayer && *annotatedLayer.Layer.Visible {
+		} else if annotatedLayer.IsGroupLayer && !annotatedLayer.IsTopLayer {
 			groupLayer := GroupLayer{
 				Name:       *annotatedLayer.Layer.Name,
 				Title:      smoothoperatorutils.PointerVal(annotatedLayer.Layer.Title, ""),
@@ -222,7 +222,8 @@ func getWMSLayer(serviceLayer pdoknlv3.Layer, serviceExtent string, wms *pdoknlv
 
 	groupName := ""
 	parent := serviceLayer.GetParent(&wms.Spec.Service.Layer)
-	if parent.IsGroupLayer() && parent.Name != nil && *parent.Visible {
+	// If the layer falls directly under the toplayer, the groupname is omitted
+	if !parent.IsTopLayer() && parent.IsGroupLayer() && parent.Name != nil && parent.IsVisible() {
 		groupName = *parent.Name
 	}