Merge branch 'master' into PDOK-17804-wms-mapfilegenerator-input

Daimanta · Daimanta · commit e092bc01ab19 · 2025-04-18T15:03:28.000+02:00
diff --git a/api/v2beta1/wms_conversion.go b/api/v2beta1/wms_conversion.go
@@ -305,7 +305,13 @@ func (v2Service WMSService) MapLayersToV3() pdoknlv3.Layer {
 			Keywords: v2Service.Keywords,
 			Layers:   &[]pdoknlv3.Layer{},
 		}
-		middleLayers = notGroupedLayers
+
+		// adding the bottom layers to the middle layers they are grouped by
+		for _, layer := range notGroupedLayers {
+			bottomLayers := groupedLayers[*layer.Name]
+			layer.Layers = &bottomLayers
+			middleLayers = append(middleLayers, layer)
+		}
 	}
 
 	// if the topLayer is defined in the v2 layers

Original file line number	Diff line number	Diff line change
`@@ -305,7 +305,13 @@ func (v2Service WMSService) MapLayersToV3() pdoknlv3.Layer {`
`305`	`305`	`Keywords: v2Service.Keywords,`
`306`	`306`	`Layers: &[]pdoknlv3.Layer{},`
`307`	`307`	`}`
`308`		`- middleLayers = notGroupedLayers`
	`308`	`+`
	`309`	`+ // adding the bottom layers to the middle layers they are grouped by`
	`310`	`+ for _, layer := range notGroupedLayers {`
	`311`	`+ bottomLayers := groupedLayers[*layer.Name]`
	`312`	`+ layer.Layers = &bottomLayers`
	`313`	`+ middleLayers = append(middleLayers, layer)`
	`314`	`+ }`
`309`	`315`	`}`
`310`	`316`
`311`	`317`	`// if the topLayer is defined in the v2 layers`