Merge branch 'master' into PDOK-17803-mapserver-operator-featureinfo-generator-configmap

Author: damienmulder

api/v2beta1/wms_conversion.go

@@ -43,6 +43,13 @@ func (src *WMS) ConvertTo(dstRaw conversion.Hub) error {
 	dst := dstRaw.(*pdoknlv3.WMS)
 	log.Printf("ConvertTo: Converting WMS from Spoke version v2beta1 to Hub version v3;"+
 		"source: %s/%s, target: %s/%s", src.Namespace, src.Name, dst.Namespace, dst.Name)
+	V3HubFromV2(src, dst)
+
+	return nil
+}
+
+func V3HubFromV2(src *WMS, target *pdoknlv3.WMS) {
+	dst := target
 
 	dst.ObjectMeta = src.ObjectMeta
 	dst.Annotations[SERVICE_METADATA_IDENTIFIER_ANNOTATION] = src.Spec.Service.MetadataIdentifier
@@ -126,8 +133,6 @@ func (src *WMS) ConvertTo(dstRaw conversion.Hub) error {
 	}
 
 	dst.Spec.Service = service
-
-	return nil
 }
 
 // ConvertFrom converts the Hub version (v3) to this WMS (v2beta1).

api/v2beta1/wms_conversion_test.go

@@ -0,0 +1,20 @@
+package v2beta1
+
+import (
+	pdoknlv3 "github.com/pdok/mapserver-operator/api/v3"
+	"github.com/stretchr/testify/assert"
+	"sigs.k8s.io/yaml"
+	"testing"
+)
+
+func TestV2ToV3(t *testing.T) {
+	input := "apiVersion: pdok.nl/v2beta1\nkind: WMS\nmetadata:\n  name: rws-nwbwegen-v1-0\n  labels:\n    dataset-owner: rws\n    dataset: nwbwegen\n    service-version: v1_0\n    service-type: wms\n  annotations:\n    lifecycle-phase: prod\n    service-bundle-id: b39c152b-393b-52f5-a50c-e1ffe904b6fb\nspec:\n  general:\n    datasetOwner: rws\n    dataset: nwbwegen\n    serviceVersion: v1_0\n  kubernetes:\n    healthCheck:\n      boundingbox: 135134.89,457152.55,135416.03,457187.82\n    resources:\n      limits:\n        ephemeralStorage: 1535Mi\n        memory: 4G\n      requests:\n        cpu: 2000m\n        ephemeralStorage: 1535Mi\n        memory: 4G\n  options:\n    automaticCasing: true\n    disableWebserviceProxy: false\n    includeIngress: true\n    validateRequests: true\n  service:\n    title: NWB - Wegen WMS\n    abstract:\n      Dit is de web map service van het Nationaal Wegen Bestand (NWB) - wegen.\n      Deze dataset bevat alleen de wegvakken en hectometerpunten. Het Nationaal Wegen\n      Bestand - Wegen is een digitaal geografisch bestand van alle wegen in Nederland.\n      Opgenomen zijn alle wegen die worden beheerd door wegbeheerders als het Rijk,\n      provincies, gemeenten en waterschappen, echter alleen voor zover deze zijn voorzien\n      van een straatnaam of nummer.\n    authority:\n      name: rws\n      url: https://www.rijkswaterstaat.nl\n    dataEPSG: EPSG:28992\n    extent: -59188.44333693248 304984.64144318487 308126.88473339565 858328.516489961\n    inspire: true\n    keywords:\n      - Vervoersnetwerken\n      - Menselijke gezondheid en veiligheid\n      - Geluidsbelasting hoofdwegen (Richtlijn Omgevingslawaai)\n      - Nationaal\n      - Voertuigen\n      - Verkeer\n      - Wegvakken\n      - Hectometerpunten\n      - HVD\n      - Mobiliteit\n    stylingAssets:\n      configMapRefs:\n        - name: includes\n          keys:\n            - nwb_wegen_hectopunten.symbol\n            - hectopunten.style\n            - wegvakken.style\n      blobKeys:\n        - resources/fonts/liberation-sans.ttf\n    layers:\n      - abstract:\n          Deze laag bevat de wegvakken uit het Nationaal Wegen bestand (NWB)\n          en geeft gedetailleerde informatie per wegvak zoals straatnaam, wegnummer,\n          routenummer, wegbeheerder, huisnummers, enz. weer.\n        data:\n          gpkg:\n            columns:\n              - objectid\n              - wvk_id\n              - wvk_begdat\n              - jte_id_beg\n              - jte_id_end\n              - wegbehsrt\n              - wegnummer\n              - wegdeelltr\n              - hecto_lttr\n              - bst_code\n              - rpe_code\n              - admrichtng\n              - rijrichtng\n              - stt_naam\n              - stt_bron\n              - wpsnaam\n              - gme_id\n              - gme_naam\n              - hnrstrlnks\n              - hnrstrrhts\n              - e_hnr_lnks\n              - e_hnr_rhts\n              - l_hnr_lnks\n              - l_hnr_rhts\n              - begafstand\n              - endafstand\n              - beginkm\n              - eindkm\n              - pos_tv_wol\n              - wegbehcode\n              - wegbehnaam\n              - distrcode\n              - distrnaam\n              - dienstcode\n              - dienstnaam\n              - wegtype\n              - wgtype_oms\n              - routeltr\n              - routenr\n              - routeltr2\n              - routenr2\n              - routeltr3\n              - routenr3\n              - routeltr4\n              - routenr4\n              - wegnr_aw\n              - wegnr_hmp\n              - geobron_id\n              - geobron_nm\n              - bronjaar\n              - openlr\n              - bag_orl\n              - frc\n              - fow\n              - alt_naam\n              - alt_nr\n              - rel_hoogte\n              - st_lengthshape\n            geometryType: MultiLineString\n            blobKey: geopackages/rws/nwbwegen/410a6d1e-e767-41b4-ba8d-9e1e955dd013/1/nwb_wegen.gpkg\n            table: wegvakken\n        datasetMetadataIdentifier: a9b7026e-0a81-4813-93bd-ba49e6f28502\n        keywords:\n          - Vervoersnetwerken\n          - Menselijke gezondheid en veiligheid\n          - Geluidsbelasting hoofdwegen (Richtlijn Omgevingslawaai)\n          - Nationaal\n          - Voertuigen\n          - Verkeer\n          - Wegvakken\n        maxScale: 50000.0\n        minScale: 1.0\n        name: wegvakken\n        sourceMetadataIdentifier: 8f0497f0-dbd7-4bee-b85a-5fdec484a7ff\n        styles:\n          - name: wegvakken\n            title: NWB - Wegvakken\n            visualization: wegvakken.style\n        title: Wegvakken\n        visible: true\n      - abstract:\n          Deze laag bevat de hectopunten uit het Nationaal Wegen Bestand (NWB)\n          en geeft gedetailleerde informatie per hectopunt zoals hectometrering, afstand,\n          zijde en hectoletter weer.\n        data:\n          gpkg:\n            columns:\n              - objectid\n              - hectomtrng\n              - afstand\n              - wvk_id\n              - wvk_begdat\n              - zijde\n              - hecto_lttr\n            geometryType: MultiPoint\n            blobKey: geopackages/rws/nwbwegen/410a6d1e-e767-41b4-ba8d-9e1e955dd013/1/nwb_wegen.gpkg\n            table: hectopunten\n        datasetMetadataIdentifier: a9b7026e-0a81-4813-93bd-ba49e6f28502\n        keywords:\n          - Vervoersnetwerken\n          - Menselijke gezondheid en veiligheid\n          - Geluidsbelasting hoofdwegen (Richtlijn Omgevingslawaai)\n          - Nationaal\n          - Voertuigen\n          - Verkeer\n          - Hectometerpunten\n        maxScale: 50000.0\n        minScale: 1.0\n        name: hectopunten\n        sourceMetadataIdentifier: 8f0497f0-dbd7-4bee-b85a-5fdec484a7ff\n        styles:\n          - name: hectopunten\n            title: NWB - Hectopunten\n            visualization: hectopunten.style\n        title: Hectopunten\n        visible: true\n    metadataIdentifier: f2437a92-ddd3-4777-a1bc-fdf4b4a7fcb8\n"
+	var v2wms WMS
+	err := yaml.Unmarshal([]byte(input), &v2wms)
+	assert.NoError(t, err)
+	var target pdoknlv3.WMS
+	V3HubFromV2(&v2wms, &target)
+	assert.Equal(t, "NWB - Wegen WMS", target.Spec.Service.Title)
+	a := 0
+	_ = a
+}

api/v3/shared_types.go

@@ -35,6 +35,7 @@ type WMSWFS interface {
 	HasPostgisData() bool
 	// Sha1 hash of the objects name
 	ID() string
+	URLPath() string
 }
 
 type Mapfile struct {
@@ -112,18 +113,7 @@ func GetHost() string {
 }
 
 func GetBaseURLPath[T WMSWFS](o T) string {
-	var serviceURL string
-	switch any(o).(type) {
-	case *WFS:
-		if WFS, ok := any(o).(*WFS); ok {
-			serviceURL = WFS.Spec.Service.URL
-		}
-	case *WMS:
-		if WMS, ok := any(o).(*WMS); ok {
-			serviceURL = WMS.Spec.Service.URL
-		}
-	}
-
+	serviceURL := o.URLPath()
 	parsed, _ := url.Parse(serviceURL)
 	return strings.TrimPrefix(parsed.Path, "/")
 }

api/v3/wfs_types.go

@@ -150,3 +150,7 @@ func (wfs *WFS) Options() *Options {
 func (wfs *WFS) ID() string {
 	return Sha1HashOfName(wfs)
 }
+
+func (wfs *WFS) URLPath() string {
+	return wfs.Spec.Service.URL
+}

api/v3/wms_types.go

@@ -231,6 +231,34 @@ func (layer *Layer) IsGroupLayer(service *WMSService) bool {
 	return layer.GetLayerType(service) == 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 {
@@ -310,3 +338,7 @@ func (wms *WMS) Options() *Options {
 func (wms *WMS) ID() string {
 	return Sha1HashOfName(wms)
 }
+
+func (wms *WMS) URLPath() string {
+	return wms.Spec.Service.URL
+}

api/v3/wms_types_test.go

@@ -1,10 +1,131 @@
 package v3
 
 import (
+	"github.com/google/go-cmp/cmp"
+	"github.com/pdok/smooth-operator/model"
 	"reflect"
 	"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)
+			}
+		})
+	}
+}
+
 func TestLayer_GetParent(t *testing.T) {
 	childLayer2 := Layer{Name: "childlayer-2"}
 	childLayer1 := Layer{Name: "childlayer-1", Layers: &[]Layer{childLayer2}}