Skip to content

Commit c1f950e

Browse files
Merge pull request #4 from PDOK/jd/base-url
Jd/base url
2 parents 3bf26cd + 21861e5 commit c1f950e

File tree

4 files changed

+630
-2
lines changed

4 files changed

+630
-2
lines changed

api/v2beta1/shared_conversion.go

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package v2beta1
22

33
import (
4+
"fmt"
45
pdoknlv3 "github.com/pdok/mapserver-operator/api/v3"
56
shared_model "github.com/pdok/smooth-operator/model"
67
autoscalingv2 "k8s.io/api/autoscaling/v2beta1"
@@ -239,3 +240,17 @@ func LabelsToV2General(labels map[string]string) General {
239240

240241
return general
241242
}
243+
244+
func CreateBaseURL(host string, kind string, general General) string {
245+
URI := fmt.Sprintf("%s/%s", general.DatasetOwner, general.Dataset)
246+
if general.Theme != nil {
247+
URI += "/" + *general.Theme
248+
}
249+
URI += "/" + kind
250+
251+
if general.ServiceVersion != nil {
252+
URI += "/" + *general.ServiceVersion
253+
}
254+
255+
return fmt.Sprintf("%s/%s", host, URI)
256+
}

api/v2beta1/wfs_conversion.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func (src *WFS) ConvertTo(dstRaw conversion.Hub) error {
6161

6262
service := pdoknlv3.WFSService{
6363
Prefix: "",
64-
BaseURL: "https://service.pdok.nl",
64+
BaseURL: CreateBaseURL("https://service.pdok.nl", "wfs", src.Spec.General),
6565
OwnerInfoRef: "pdok",
6666
Title: src.Spec.Service.Title,
6767
Abstract: src.Spec.Service.Abstract,

api/v2beta1/wms_conversion.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func (src *WMS) ConvertTo(dstRaw conversion.Hub) error {
6565
dst.Spec.Options = ConverseOptionsV2ToV3(src.Spec.Options)
6666

6767
service := pdoknlv3.WMSService{
68-
BaseURL: "https://service.pdok.nl",
68+
BaseURL: CreateBaseURL("https://service.pdok.nl", "wms", src.Spec.General),
6969
OwnerInfoRef: "pdok",
7070
Title: src.Spec.Service.Title,
7171
Abstract: src.Spec.Service.Abstract,

0 commit comments

Comments
 (0)