Iterate over WMS child layers

Author: damienmulder

api/v3/wms_types.go

@@ -151,18 +151,42 @@ func init() {
 	SchemeBuilder.Register(&WMS{}, &WMSList{})
 }
 
-func (wms *WMS) GetUniqueTiffBlobKeys() []string {
-	blobKeys := map[string]bool{}
+func (layer *Layer) getAllLayers() (layers []Layer) {
+	layers = append(layers, *layer)
+	for _, childLayer := range layer.Layers {
+		layers = append(layers, childLayer.getAllLayers()...)
+	}
+	return
+}
+
+func (layer *Layer) hasData() bool {
+	switch {
+	case layer.Data.Gpkg != nil:
+		return true
+	case layer.Data.Postgis != nil:
+		return true
+	case layer.Data.TIF != nil:
+		return true
+	default:
+		return false
+	}
+}
 
-	if wms.Spec.Service.Layer.Data.TIF != nil && wms.Spec.Service.Layer.Data.TIF.BlobKey != "" {
-		blobKeys[wms.Spec.Service.Layer.Data.TIF.BlobKey] = true
+func (wms *WMS) GetAllLayersWithLegend() (layers []Layer) {
+	for _, layer := range wms.Spec.Service.Layer.getAllLayers() {
+		if layer.hasData() && layer.Style.Legend.BlobKey != "" {
+			layers = append(layers, layer)
+		}
 	}
+	return
+}
+
+func (wms *WMS) GetUniqueTiffBlobKeys() []string {
+	blobKeys := map[string]bool{}
 
-	if len(wms.Spec.Service.Layer.Layers) > 0 {
-		for _, layer := range wms.Spec.Service.Layer.Layers {
-			if layer.Data.TIF != nil && layer.Data.TIF.BlobKey != "" {
-				blobKeys[layer.Data.TIF.BlobKey] = true
-			}
+	for _, layer := range wms.Spec.Service.Layer.getAllLayers() {
+		if layer.Data.TIF != nil && layer.Data.TIF.BlobKey != "" {
+			blobKeys[layer.Data.TIF.BlobKey] = true
 		}
 	}
 	return slices.Collect(maps.Keys(blobKeys))

internal/controller/blobdownload/blob_download.go

@@ -107,7 +107,7 @@ func downloadStylingAssets(sb *strings.Builder, WMS *pdoknlv3.WMS) error {
 }
 
 func downloadLegends(sb *strings.Builder, WMS *pdoknlv3.WMS) error {
-	for _, layer := range WMS.Spec.Service.Layer.Layers {
+	for _, layer := range WMS.GetAllLayersWithLegend() {
 		writeLine(sb, "mkdir -p %s/%s;", legendPath, layer.Name)
 		writeLine(sb, "rclone copyto blobs:/%s  %s/%s/%s.png || exit 1;", layer.Style.Legend.BlobKey, legendPath, layer.Name, layer.Style.Name)
 		fileName, err := getFilenameFromBlobKey(layer.Style.Legend.BlobKey)