Added fallback for metadata id calculation

Author: Daimanta

api/v2beta1/wms_conversion.go

@@ -111,15 +111,16 @@ func V3HubFromV2(src *WMS, target *pdoknlv3.WMS) {
 		}
 	}
 
-	// Also used by non-inspire services
-	service.Inspire = &pdoknlv3.Inspire{
-		ServiceMetadataURL: pdoknlv3.MetadataURL{
-			CSW: &pdoknlv3.Metadata{
-				MetadataIdentifier: src.Spec.Service.MetadataIdentifier,
+	if src.Spec.Service.Inspire {
+		service.Inspire = &pdoknlv3.Inspire{
+			ServiceMetadataURL: pdoknlv3.MetadataURL{
+				CSW: &pdoknlv3.Metadata{
+					MetadataIdentifier: src.Spec.Service.MetadataIdentifier,
+				},
 			},
-		},
-		SpatialDatasetIdentifier: *src.Spec.Service.Layers[0].SourceMetadataIdentifier,
-		Language:                 "dut",
+			SpatialDatasetIdentifier: *src.Spec.Service.Layers[0].SourceMetadataIdentifier,
+			Language:                 "dut",
+		}
 	}
 
 	if src.Spec.Service.StylingAssets != nil {

internal/controller/mapfilegenerator/mapper.go

@@ -2,6 +2,7 @@ package mapfilegenerator
 
 import (
 	"fmt"
+	"github.com/pdok/mapserver-operator/api/v2beta1"
 	"strconv"
 	"strings"
 
@@ -127,6 +128,8 @@ func MapWMSToMapfileGeneratorInput(wms *pdoknlv3.WMS, ownerInfo *smoothoperatorv
 	metadataId := ""
 	if service.Inspire != nil {
 		metadataId = service.Inspire.ServiceMetadataURL.CSW.MetadataIdentifier
+	} else {
+		metadataId = wms.ObjectMeta.Annotations[v2beta1.SERVICE_METADATA_IDENTIFIER_ANNOTATION]
 	}
 
 	var fonts *string