Started on WMS Capabilities Generator input

Author: Daimanta

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

@@ -267,3 +267,7 @@ func (wms *WMS) Options() *Options {
 func (wms *WMS) ID() string {
 	return Sha1HashOfName(wms)
 }
+
+func (wms *WMS) URLPath() string {
+	return wms.Spec.Service.URL
+}

internal/controller/capabilitiesgenerator/capabilities_generator.go

@@ -1,7 +1,6 @@
 package capabilitiesgenerator
 
 import (
-	"errors"
 	"fmt"
 
 	pdoknlv3 "github.com/pdok/mapserver-operator/api/v3"
@@ -37,8 +36,8 @@ func GetInput[W pdoknlv3.WMSWFS](webservice W, ownerInfo *smoothoperatorv1.Owner
 			return createInputForWFS(WFS, ownerInfo)
 		}
 	case *pdoknlv3.WMS:
-		if _, ok := any(webservice).(*pdoknlv3.WMS); ok {
-			return "", errors.New("not implemented for WMS")
+		if WMS, ok := any(webservice).(*pdoknlv3.WMS); ok {
+			return createInputForWMS(WMS, ownerInfo)
 		}
 	default:
 		return "", fmt.Errorf("unexpected input, webservice should be of type WFS or WMS, webservice: %v", webservice)
@@ -58,3 +57,16 @@ func createInputForWFS(wfs *pdoknlv3.WFS, ownerInfo *smoothoperatorv1.OwnerInfo)
 
 	return string(yamlInput), nil
 }
+
+func createInputForWMS(wms *pdoknlv3.WMS, ownerInfo *smoothoperatorv1.OwnerInfo) (config string, err error) {
+	input, err := MapWMSToCapabilitiesGeneratorInput(wms, ownerInfo)
+	if err != nil {
+		return "", err
+	}
+	yamlInput, err := yaml.Marshal(input)
+	if err != nil {
+		return "", fmt.Errorf("failed to marshal the capabilities generator input to yaml: %w", err)
+	}
+
+	return string(yamlInput), nil
+}

internal/controller/capabilitiesgenerator/capabilities_generator_test.go

@@ -3,6 +3,8 @@ package capabilitiesgenerator
 import (
 	pdoknlv3 "github.com/pdok/mapserver-operator/api/v3"
 	smoothoperatorv1 "github.com/pdok/smooth-operator/api/v1"
+	"github.com/pdok/smooth-operator/model"
+	"github.com/stretchr/testify/assert"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"testing"
@@ -116,6 +118,7 @@ func TestGetInputForWFS(t *testing.T) {
 					},
 					Spec: pdoknlv3.WFSSpec{
 						Service: pdoknlv3.WFSService{
+							URL:               "/datasetOwner/dataset/theme/wfs/v1_0",
 							Title:             "some Service title",
 							Abstract:          "some \"Service\" abstract",
 							Keywords:          []string{"service-keyword-1", "service-keyword-2", "infoFeatureAccessService"},
@@ -201,3 +204,32 @@ func TestGetInputForWFS(t *testing.T) {
 		})
 	}
 }
+
+func TestInputForWMS(t *testing.T) {
+	wms := pdoknlv3.WMS{
+		TypeMeta:   metav1.TypeMeta{},
+		ObjectMeta: metav1.ObjectMeta{},
+		Spec:       pdoknlv3.WMSSpec{},
+		Status:     model.OperatorStatus{},
+	}
+
+	ownerInfo := smoothoperatorv1.OwnerInfo{
+		Spec: smoothoperatorv1.OwnerInfoSpec{
+			NamespaceTemplate: "http://{{prefix}}.geonovum.nl",
+			MetadataUrls: smoothoperatorv1.MetadataUrls{
+				CSW: smoothoperatorv1.MetadataURL{
+					HrefTemplate: "https://www.nationaalgeoregister.nl/geonetwork/srv/dut/csw?service=CSW&version=2.0.2&request=GetRecordById&outputschema=http://www.isotc211.org/2005/gmd&elementsetname=full&id={{identifier}}",
+				},
+			},
+			WFS: smoothoperatorv1.WFS{
+				ServiceProvider: smoothoperatorv1.ServiceProvider{
+					ProviderName: smoothoperatorutils.Pointer("PDOK"),
+				},
+			},
+		},
+	}
+
+	input, err := GetInput(&wms, &ownerInfo)
+	assert.NoError(t, err)
+	println(input)
+}

internal/controller/capabilitiesgenerator/mapper.go

@@ -1,7 +1,9 @@
 package capabilitiesgenerator
 
 import (
+	"encoding/xml"
 	"fmt"
+	"github.com/pdok/ogc-specifications/pkg/wms130"
 	"strconv"
 	"strings"
 
@@ -15,9 +17,10 @@ import (
 )
 
 const (
-	inspireSchemaLocations = "http://inspire.ec.europa.eu/schemas/inspire_dls/1.0 http://inspire.ec.europa.eu/schemas/inspire_dls/1.0/inspire_dls.xsd"
-	capabilitiesFilename   = "/var/www/config/capabilities_wfs_200.xml"
-	metadataMediaType      = "application/vnd.ogc.csw.GetRecordByIdResponse_xml"
+	inspireSchemaLocations  = "http://inspire.ec.europa.eu/schemas/inspire_dls/1.0 http://inspire.ec.europa.eu/schemas/inspire_dls/1.0/inspire_dls.xsd"
+	wfsCapabilitiesFilename = "/var/www/config/capabilities_wfs_200.xml"
+	wmsCapabilitiesFilename = "/var/www/config/capabilities_wms_130.xml"
+	metadataMediaType       = "application/vnd.ogc.csw.GetRecordByIdResponse_xml"
 )
 
 func MapWFSToCapabilitiesGeneratorInput(wfs *pdoknlv3.WFS, ownerInfo *smoothoperatorv1.OwnerInfo) (*capabilitiesgenerator.Config, error) {
@@ -31,12 +34,12 @@ func MapWFSToCapabilitiesGeneratorInput(wfs *pdoknlv3.WFS, ownerInfo *smoothoper
 			Namespace:         mapperutils.GetNamespaceURI(wfs.Spec.Service.Prefix, ownerInfo),
 			Prefix:            wfs.Spec.Service.Prefix,
 			Onlineresourceurl: pdoknlv3.GetHost(),
-			Path:              mapperutils.GetPath(wfs),
+			Path:              "/" + pdoknlv3.GetBaseURLPath(wfs),
 			Version:           *mapperutils.GetLabelValueByKey(wfs.ObjectMeta.Labels, "service-version"),
 		},
 		Services: capabilitiesgenerator.Services{
 			WFS200Config: &capabilitiesgenerator.WFS200Config{
-				Filename: capabilitiesFilename,
+				Filename: wfsCapabilitiesFilename,
 				Wfs200: wfs200.GetCapabilitiesResponse{
 
 					ServiceProvider: mapServiceProvider(&ownerInfo.Spec.WFS.ServiceProvider),
@@ -200,3 +203,39 @@ func mapServiceProvider(provider *smoothoperatorv1.ServiceProvider) (serviceProv
 
 	return serviceProvider
 }
+
+func MapWMSToCapabilitiesGeneratorInput(wms *pdoknlv3.WMS, ownerInfo *smoothoperatorv1.OwnerInfo) (*capabilitiesgenerator.Config, error) {
+	//featureTypeList, err := getFeatureTypeList(wms, ownerInfo)
+	//if err != nil {
+	//	return nil, err
+	//}
+
+	config := capabilitiesgenerator.Config{
+		Global: capabilitiesgenerator.Global{
+			Namespace:         mapperutils.GetNamespaceURI("prefix", ownerInfo),
+			Prefix:            "prefix",
+			Onlineresourceurl: pdoknlv3.GetHost(),
+			Path:              pdoknlv3.GetBaseURLPath(wms),
+			Version:           *mapperutils.GetLabelValueByKey(wms.ObjectMeta.Labels, "service-version"),
+		},
+		Services: capabilitiesgenerator.Services{
+			WMS130Config: &capabilitiesgenerator.WMS130Config{
+				Filename: wmsCapabilitiesFilename,
+				Wms130: wms130.GetCapabilitiesResponse{
+					XMLName:      xml.Name{},
+					Namespaces:   wms130.Namespaces{},
+					WMSService:   wms130.WMSService{},
+					Capabilities: wms130.Capabilities{},
+				},
+			},
+		},
+	}
+
+	if wms.Spec.Service.Inspire != nil {
+		config.Global.AdditionalSchemaLocations = inspireSchemaLocations
+		//metadataURL, _ := replaceMustachTemplate(ownerInfo.Spec.MetadataUrls.CSW.HrefTemplate, wms.Spec.Service.Inspire.ServiceMetadataURL.CSW.MetadataIdentifier)
+
+	}
+
+	return &config, nil
+}