WMS validation

Author: damienmulder

api/v3/wms_types.go

@@ -25,14 +25,19 @@ SOFTWARE.
 package v3
 
 import (
-	"maps"
-	"slices"
-	"sort"
-
 	shared_model "github.com/pdok/smooth-operator/model"
 	autoscalingv2 "k8s.io/api/autoscaling/v2"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"maps"
+	"slices"
+	"sort"
+)
+
+const (
+	topLayer   = "topLayer"
+	dataLayer  = "dataLayer"
+	groupLayer = "groupLayer"
 )
 
 // EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
@@ -188,6 +193,45 @@ func (layer *Layer) hasTIFData() bool {
 	return layer.Data.TIF != nil && layer.Data.TIF.BlobKey != ""
 }
 
+func (layer *Layer) getLayerType(service *WMSService) (layerType string) {
+	switch {
+	case layer.hasData() && layer.Layers == nil:
+		return dataLayer
+	case layer.Name == service.Layer.Name:
+		return topLayer
+	default:
+		return groupLayer
+	}
+}
+
+func (layer *Layer) hasBoundingBoxForCRS(crs string) bool {
+	for _, bbox := range layer.BoundingBoxes {
+		if bbox.CRS == crs {
+			return true
+		}
+	}
+	return false
+}
+
+func (layer *Layer) setInheritedBoundingBoxes() {
+	if layer.Layers == nil || len(*layer.Layers) == 0 {
+		return
+	}
+
+	var updatedLayers []Layer
+	for _, childLayer := range *layer.Layers {
+		// Inherit parent boundingboxes
+		for _, boundingBox := range layer.BoundingBoxes {
+			if !childLayer.hasBoundingBoxForCRS(boundingBox.CRS) {
+				childLayer.BoundingBoxes = append(childLayer.BoundingBoxes, boundingBox)
+			}
+		}
+		childLayer.setInheritedBoundingBoxes()
+		updatedLayers = append(updatedLayers, childLayer)
+	}
+	*layer.Layers = updatedLayers
+}
+
 func (wms *WMS) GetAllLayersWithLegend() (layers []Layer) {
 	for _, layer := range wms.Spec.Service.Layer.getAllLayers() {
 		if !layer.hasData() || len(layer.Styles) == 0 {

api/v3/wms_types_test.go

@@ -0,0 +1,126 @@
+package v3
+
+import (
+	"github.com/google/go-cmp/cmp"
+	"github.com/pdok/smooth-operator/model"
+	"testing"
+)
+
+func TestLayer_setInheritedBoundingBoxes(t *testing.T) {
+	first28992BoundingBox := WMSBoundingBox{
+		CRS: "EPSG:28992",
+		BBox: model.BBox{
+			MinX: "482.06",
+			MaxX: "306602.42",
+			MinY: "284182.97",
+			MaxY: "637049.52",
+		},
+	}
+	first4326BoundingBox := WMSBoundingBox{
+		CRS: "EPSG:4326",
+		BBox: model.BBox{
+			MinX: "2.35417303",
+			MaxX: "7.5553525",
+			MinY: "50.71447164",
+			MaxY: "55.66948102",
+		},
+	}
+	first4258BoundingBox := WMSBoundingBox{
+		CRS: "EPSG:4258",
+		BBox: model.BBox{
+			MinX: "2.354173",
+			MaxX: "7.5553527",
+			MinY: "50.71447",
+			MaxY: "55.66948",
+		}}
+	second28992BoundingBox := WMSBoundingBox{
+		CRS: "EPSG:28992",
+		BBox: model.BBox{
+			MinX: "0.00",
+			MaxX: "310000.00",
+			MinY: "275000.00",
+			MaxY: "650000.00",
+		}}
+
+	tests := []struct {
+		name                                string
+		layer                               Layer
+		toplayerExpectedBoundingBoxCount    int
+		toplayerExpectedBoundingBoxes       []WMSBoundingBox
+		grouplayer1ExpectedBoundingBoxCount int
+		grouplayer1ExpectedBoundingBoxes    []WMSBoundingBox
+		datalayer1ExpectedBoundingBoxCount  int
+		datalayer1ExpectedBoundingBoxes     []WMSBoundingBox
+		datalayer2ExpectedBoundingBoxCount  int
+		datalayer2ExpectedBoundingBoxes     []WMSBoundingBox
+	}{
+		{
+			name: "setInheritedBoundingBoxes for layer",
+			layer: Layer{
+				Name:          "toplayer",
+				BoundingBoxes: []WMSBoundingBox{first28992BoundingBox},
+				Layers: &[]Layer{
+					{
+						Name:          "grouplayer-1",
+						BoundingBoxes: []WMSBoundingBox{first4326BoundingBox},
+						Layers: &[]Layer{
+							{
+								Name:          "datalayer-1",
+								BoundingBoxes: []WMSBoundingBox{first4258BoundingBox},
+							},
+							{
+								Name:          "datalayer-2",
+								BoundingBoxes: []WMSBoundingBox{second28992BoundingBox},
+							},
+						},
+					},
+				},
+			},
+			toplayerExpectedBoundingBoxCount:    1,
+			toplayerExpectedBoundingBoxes:       []WMSBoundingBox{first28992BoundingBox},
+			grouplayer1ExpectedBoundingBoxCount: 2,
+			grouplayer1ExpectedBoundingBoxes:    []WMSBoundingBox{first4326BoundingBox, first28992BoundingBox},
+			datalayer1ExpectedBoundingBoxCount:  3,
+			datalayer1ExpectedBoundingBoxes:     []WMSBoundingBox{first4258BoundingBox, first4326BoundingBox, first28992BoundingBox},
+			datalayer2ExpectedBoundingBoxCount:  2,
+			datalayer2ExpectedBoundingBoxes:     []WMSBoundingBox{second28992BoundingBox, first4326BoundingBox},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			layer := tt.layer
+			layer.setInheritedBoundingBoxes()
+
+			topChildLayers := *layer.Layers
+			groupLayer1 := topChildLayers[0]
+			groupChildLayers := *groupLayer1.Layers
+			dataLayer1 := groupChildLayers[0]
+			dataLayer2 := groupChildLayers[1]
+
+			if len(layer.BoundingBoxes) != tt.toplayerExpectedBoundingBoxCount {
+				t.Errorf("Toplayer has unexpected number of bounding boxes = %v, want %v", len(layer.BoundingBoxes), tt.toplayerExpectedBoundingBoxCount)
+			}
+			if !cmp.Equal(layer.BoundingBoxes, tt.toplayerExpectedBoundingBoxes) {
+				t.Errorf("Toplayer has unexpected bounding boxes = %v, want %v", layer.BoundingBoxes, tt.toplayerExpectedBoundingBoxes)
+			}
+			if len(groupLayer1.BoundingBoxes) != tt.grouplayer1ExpectedBoundingBoxCount {
+				t.Errorf("Grouplayer has unexpected number of bounding boxes = %v, want %v", len(groupLayer1.BoundingBoxes), tt.grouplayer1ExpectedBoundingBoxCount)
+			}
+			if !cmp.Equal(groupLayer1.BoundingBoxes, tt.grouplayer1ExpectedBoundingBoxes) {
+				t.Errorf("Grouplayer has unexpected bounding boxes = %v, want %v", groupLayer1.BoundingBoxes, tt.grouplayer1ExpectedBoundingBoxes)
+			}
+			if len(dataLayer1.BoundingBoxes) != tt.datalayer1ExpectedBoundingBoxCount {
+				t.Errorf("Datalayer1 has unexpected number of bounding boxes = %v, want %v", len(dataLayer1.BoundingBoxes), tt.datalayer1ExpectedBoundingBoxCount)
+			}
+			if !cmp.Equal(dataLayer1.BoundingBoxes, tt.datalayer1ExpectedBoundingBoxes) {
+				t.Errorf("Datalayer1 has unexpected bounding boxes = %v, want %v", dataLayer1.BoundingBoxes, tt.datalayer1ExpectedBoundingBoxes)
+			}
+			if len(dataLayer2.BoundingBoxes) != tt.datalayer2ExpectedBoundingBoxCount {
+				t.Errorf("Datalayer2 has unexpected number of bounding boxes = %v, want %v", len(dataLayer2.BoundingBoxes), tt.datalayer2ExpectedBoundingBoxCount)
+			}
+			if !cmp.Equal(dataLayer2.BoundingBoxes, tt.datalayer2ExpectedBoundingBoxes) {
+				t.Errorf("Datalayer2 has unexpected bounding boxes = %v, want %v", dataLayer2.BoundingBoxes, tt.datalayer2ExpectedBoundingBoxes)
+			}
+		})
+	}
+}