Fixes voor diffs

Author: Jelle Dijkstra

api/v2beta1/shared_conversion.go

@@ -86,12 +86,16 @@ func ConvertResources(src corev1.ResourceRequirements) corev1.PodSpec {
 	targetResources := src
 
 	if src.Requests != nil {
-		targetResources.Requests[corev1.ResourceEphemeralStorage] = src.Requests["ephemeralStorage"]
-		delete(targetResources.Requests, "ephemeralStorage")
+		if val, ok := src.Requests["ephemeralStorage"]; ok {
+			targetResources.Requests[corev1.ResourceEphemeralStorage] = val
+			delete(targetResources.Requests, "ephemeralStorage")
+		}
 	}
 	if src.Limits != nil {
-		targetResources.Limits[corev1.ResourceEphemeralStorage] = src.Limits["ephemeralStorage"]
-		delete(targetResources.Limits, "ephemeralStorage")
+		if val, ok := src.Limits["ephemeralStorage"]; ok {
+			targetResources.Limits[corev1.ResourceEphemeralStorage] = val
+			delete(targetResources.Limits, "ephemeralStorage")
+		}
 	}
 
 	return corev1.PodSpec{

api/v3/shared_validation.go

@@ -125,7 +125,7 @@ func ValidateEphemeralStorage(podSpecPatch v1.PodSpec, allErrs *field.ErrorList)
 	}
 }
 
-func ValidateInspire[O WMSWFS](obj O, allErrs *field.ErrorList) {
+func ValidateInspire[O WMSWFS](obj O, allErrs *field.ErrorList, allWarnings *[]string) {
 	if obj.Inspire() == nil {
 		return
 	}
@@ -134,11 +134,11 @@ func ValidateInspire[O WMSWFS](obj O, allErrs *field.ErrorList) {
 	spatialID := obj.Inspire().SpatialDatasetIdentifier
 
 	if slices.Contains(datasetIDs, spatialID) {
-		*allErrs = append(*allErrs, field.Invalid(
+		*allWarnings = append(*allWarnings, field.Invalid(
 			field.NewPath("spec").Child("service").Child("inspire").Child("spatialDatasetIdentifier"),
 			spatialID,
-			"spatialDatasetIdentifier cannot also be used as an datasetMetadataUrl.csw.metadataIdentifier",
-		))
+			"spatialDatasetIdentifier should not also be used as an datasetMetadataUrl.csw.metadataIdentifier",
+		).Error())
 	}
 
 	if serviceID := obj.Inspire().ServiceMetadataURL.CSW; serviceID != nil {

api/v3/wfs_validation.go

@@ -62,7 +62,7 @@ func ValidateWFS(wfs *WFS, warnings *[]string, allErrs *field.ErrorList) {
 		}
 	}
 
-	ValidateInspire(wfs, allErrs)
+	ValidateInspire(wfs, allErrs, warnings)
 
 	if wfs.Spec.HorizontalPodAutoscalerPatch != nil {
 		ValidateHorizontalPodAutoscalerPatch(*wfs.Spec.HorizontalPodAutoscalerPatch, allErrs)

api/v3/wms_validation.go

@@ -53,7 +53,7 @@ func ValidateWMS(wms *WMS, warnings *[]string, allErrs *field.ErrorList) {
 		}
 	}
 
-	ValidateInspire(wms, allErrs)
+	ValidateInspire(wms, allErrs, warnings)
 	if wms.HorizontalPodAutoscalerPatch() != nil {
 		ValidateHorizontalPodAutoscalerPatch(*wms.HorizontalPodAutoscalerPatch(), allErrs)
 	}

internal/controller/blobdownload/blob_download.go

@@ -41,20 +41,25 @@ func GetBlobDownloadInitContainer[O pdoknlv3.WMSWFS](obj O, images types.Images,
 			blobkeys = append(blobkeys, gpkg.BlobKey)
 		}
 	}
+
+	envVars := []corev1.EnvVar{
+		{
+			Name:  "GEOPACKAGE_TARGET_PATH",
+			Value: "/srv/data/gpkg",
+		},
+	}
+	if len(blobkeys) > 0 {
+		envVars = append(envVars, corev1.EnvVar{
+			Name:  "GEOPACKAGE_DOWNLOAD_LIST",
+			Value: strings.Join(blobkeys, ";"),
+		})
+	}
+
 	initContainer := corev1.Container{
 		Name:            constants.BlobDownloadName,
 		Image:           images.MultitoolImage,
 		ImagePullPolicy: corev1.PullIfNotPresent,
-		Env: []corev1.EnvVar{
-			{
-				Name:  "GEOPACKAGE_TARGET_PATH",
-				Value: "/srv/data/gpkg",
-			},
-			{
-				Name:  "GEOPACKAGE_DOWNLOAD_LIST",
-				Value: strings.Join(blobkeys, ";"),
-			},
-		},
+		Env:             envVars,
 		EnvFrom: []corev1.EnvFromSource{
 			utils.NewEnvFromSource(utils.EnvFromSourceTypeConfigMap, blobsConfigName),
 			utils.NewEnvFromSource(utils.EnvFromSourceTypeSecret, blobsSecretName),
@@ -198,7 +203,7 @@ func downloadLegends(sb *strings.Builder, wms *pdoknlv3.WMS) error {
 				if err != nil {
 					return err
 				}
-				writeLine(sb, "Copied legend %s to %s/%s/%s.png;", fileName, legendPath, *layer.Name, style.Name)
+				writeLine(sb, "echo 'Copied legend %s to %s/%s/%s.png';", fileName, legendPath, *layer.Name, style.Name)
 			}
 		}
 		writeLine(sb, "chown -R 999:999 %s", legendPath)

internal/controller/capabilitiesgenerator/mapper.go

@@ -506,11 +506,13 @@ func mapLayer(layer pdoknlv3.Layer, canonicalURL string, authorityURL *wms130.Au
 
 	// Map sublayers
 	for _, sublayer := range layer.Layers {
-		mapped, err := mapLayer(sublayer, canonicalURL, authorityURL, identifier, append(parentStyleNames, layerStyleNames...), bboxes)
-		if err != nil {
-			return nil, err
+		if sublayer.Visible {
+			mapped, err := mapLayer(sublayer, canonicalURL, authorityURL, identifier, append(parentStyleNames, layerStyleNames...), bboxes)
+			if err != nil {
+				return nil, err
+			}
+			l.Layer = append(l.Layer, mapped)
 		}
-		l.Layer = append(l.Layer, mapped)
 	}
 
 	return &l, nil

internal/controller/mapfilegenerator/mapper.go

@@ -289,10 +289,9 @@ func getWMSLayer(serviceLayer pdoknlv3.Layer, serviceExtent string, wms *pdoknlv
 			MaxScale:       serviceLayer.MaxScaleDenominator,
 			LabelNoClip:    serviceLayer.LabelNoClip,
 		},
-		GroupName:                   groupName,
-		Styles:                      []Style{},
-		Offsite:                     "",
-		GetFeatureInfoIncludesClass: false,
+		GroupName: groupName,
+		Styles:    []Style{},
+		Offsite:   "",
 	}
 
 	for _, style := range serviceLayer.Styles {

internal/controller/mapfilegenerator/types.go

@@ -90,7 +90,7 @@ type WMSLayer struct {
 	GroupName                   string  `json:"group_name,omitempty"`
 	Styles                      []Style `json:"styles"`
 	Offsite                     string  `json:"offsite,omitempty"`
-	GetFeatureInfoIncludesClass bool    `json:"get_feature_info_includes_class,omitempty"`
+	GetFeatureInfoIncludesClass *bool   `json:"get_feature_info_includes_class,omitempty"`
 }
 
 type Column struct {
@@ -125,6 +125,7 @@ func SetDataFields[O pdoknlv3.WMSWFS](obj O, wmsLayer *WMSLayer, data pdoknlv3.D
 		}
 		wmsLayer.BaseLayer.Resample = &tif.Resample
 		wmsLayer.Offsite = smoothoperatorutils.PointerVal(tif.Offsite, "")
+		wmsLayer.GetFeatureInfoIncludesClass = &tif.GetFeatureInfoIncludesClass
 	case data.Postgis != nil:
 		postgis := data.Postgis
 		wmsLayer.Postgis = smoothoperatorutils.Pointer(true)