From bf5fef3d107929313bbb1c7dd28b38f2df189be7 Mon Sep 17 00:00:00 2001 From: Roel van den Berg Date: Thu, 9 Sep 2021 18:24:28 +0200 Subject: [PATCH] Fix WMTS tilematrixset. --- pkg/wmts100/getcapabilities_response.go | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkg/wmts100/getcapabilities_response.go b/pkg/wmts100/getcapabilities_response.go index 45ea9bc..18d51a6 100644 --- a/pkg/wmts100/getcapabilities_response.go +++ b/pkg/wmts100/getcapabilities_response.go @@ -38,11 +38,11 @@ func (gc GetCapabilitiesResponse) ToXML() []byte { type GetCapabilitiesResponse struct { XMLName xml.Name `xml:"Capabilities"` Namespaces `yaml:"namespaces"` - ServiceIdentification ServiceIdentification `xml:"ows:ServiceIdentification" yaml:"serviceidentification"` - ServiceProvider wsc110.ServiceProvider `xml:"ows:ServiceProvider,omitempty" yaml:"serviceprovider"` - OperationsMetadata *OperationsMetadata `xml:"ows:OperationsMetadata,omitempty" yaml:"operationsmetadata"` - Contents Contents `xml:"Contents" yaml:"contents"` - ServiceMetadataURL *ServiceMetadataURL `xml:"ServiceMetadataURL,omitempty" yaml:"servicemetadataurl"` + ServiceIdentification ServiceIdentification `xml:"ows:ServiceIdentification" yaml:"serviceidentification"` + ServiceProvider *wsc110.ServiceProvider `xml:"ows:ServiceProvider,omitempty" yaml:"serviceprovider"` + OperationsMetadata *OperationsMetadata `xml:"ows:OperationsMetadata,omitempty" yaml:"operationsmetadata"` + Contents Contents `xml:"Contents" yaml:"contents"` + ServiceMetadataURL *ServiceMetadataURL `xml:"ServiceMetadataURL,omitempty" yaml:"servicemetadataurl"` } // Namespaces struct containing the namespaces needed for the XML document @@ -97,13 +97,13 @@ type Method struct { // ServiceIdentification struct should only be fill by the "template" configuration wmts100.yaml type ServiceIdentification struct { - Title string `xml:"ows:Title" yaml:"title"` - Abstract string `xml:"ows:Abstract" yaml:"abstract"` - Keywords wsc110.Keywords `xml:"ows:Keywords,omitempty" yaml:"keywords"` - ServiceType string `xml:"ows:ServiceType" yaml:"servicetype"` - ServiceTypeVersion string `xml:"ows:ServiceTypeVersion" yaml:"servicetypeversion"` - Fees string `xml:"ows:Fees" yaml:"fees"` - AccessConstraints string `xml:"ows:AccessConstraints" yaml:"accessconstraints"` + Title string `xml:"ows:Title" yaml:"title"` + Abstract string `xml:"ows:Abstract" yaml:"abstract"` + Keywords *wsc110.Keywords `xml:"ows:Keywords,omitempty" yaml:"keywords"` + ServiceType string `xml:"ows:ServiceType" yaml:"servicetype"` + ServiceTypeVersion string `xml:"ows:ServiceTypeVersion" yaml:"servicetypeversion"` + Fees string `xml:"ows:Fees" yaml:"fees"` + AccessConstraints string `xml:"ows:AccessConstraints" yaml:"accessconstraints"` } // ServiceMetadataURL in struct for repeatability