Skip to content

Commit 4c19519

Browse files
author
Jelle Dijkstra
committed
Merge branch 'master' into jd/fixes
2 parents 9432f55 + 2f70aca commit 4c19519

File tree

20 files changed

+23
-117
lines changed

20 files changed

+23
-117
lines changed

‎internal/controller/configmaps.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ func mutateConfigMap[R Reconciler, O pdoknlv3.WMSWFS](r R, obj O, configMap *cor
120120
for _, name := range staticFileName {
121121
content := contents[name]
122122
if name == "include.conf" {
123-
content = []byte(strings.ReplaceAll(string(content), "{{ service_path }}", obj.URL().Path))
123+
content = []byte(strings.ReplaceAll(string(content), "/{{ service_path }}", obj.URL().Path))
124124
}
125125
configMap.Data[name] = string(content)
126126
}

‎internal/controller/legendgenerator/legend_generator_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,5 @@ func TestGetConfigMapDataNoLegendFix(t *testing.T) {
3838
}
3939

4040
func TestGetConfigMapDataLegendFix(t *testing.T) {
41-
test(t, "no-legend-fix")
41+
test(t, "legend-fix")
4242
}

‎internal/controller/legendgenerator/test_data/expected/legend-fix.yaml‎

Lines changed: 3 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ default_mapserver.conf: |
55
END
66
END
77
input: |
8-
"Kadastralekaart" "standaard" │
9-
"Kadastralekaart" "kwaliteit" │
8+
"Kadastralekaart" "standaard"
9+
"Kadastralekaart" "kwaliteit"
1010
"Kadastralekaart" "print"
1111
"Bebouwing" "standaard:bebouwing"
1212
"Bebouwing" "kwaliteit:bebouwing"
@@ -56,103 +56,6 @@ input: |
5656
"KadastraleGrens" "standaard:kadastralegrens"
5757
"KadastraleGrens" "kwaliteit:kadastralegrens"
5858
"KadastraleGrens" "print:kadastralegrens"
59-
#input2: |
60-
# - layer: Bebouwing
61-
# style: standaard:bebouwing
62-
# - layer: Bebouwing
63-
# style: kwaliteit:bebouwing
64-
# - layer: Bebouwing
65-
# style: print:bebouwing
66-
# - layer: Bebouwingvlak
67-
# style: standaard
68-
# - layer: Bebouwingvlak
69-
# style: kwaliteit
70-
# - layer: Bebouwingvlak
71-
# style: print
72-
# - layer: Bebouwingvlak
73-
# style: standaard:bebouwing
74-
# - layer: Bebouwingvlak
75-
# style: kwaliteit:bebouwing
76-
# - layer: Bebouwingvlak
77-
# style: print:bebouwing
78-
# - layer: Nummeraanduidingreeks
79-
# style: standaard
80-
# - layer: Nummeraanduidingreeks
81-
# style: kwaliteit
82-
# - layer: Nummeraanduidingreeks
83-
# style: print
84-
# - layer: Nummeraanduidingreeks
85-
# style: standaard:bebouwing
86-
# - layer: Nummeraanduidingreeks
87-
# style: kwaliteit:bebouwing
88-
# - layer: Nummeraanduidingreeks
89-
# style: print:bebouwing
90-
# - layer: OpenbareRuimteNaam
91-
# style: standaard
92-
# - layer: OpenbareRuimteNaam
93-
# style: kwaliteit
94-
# - layer: OpenbareRuimteNaam
95-
# style: print
96-
# - layer: OpenbareRuimteNaam
97-
# style: standaard:openbareruimtenaam
98-
# - layer: OpenbareRuimteNaam
99-
# style: kwaliteit:openbareruimtenaam
100-
# - layer: OpenbareRuimteNaam
101-
# style: print:openbareruimtenaam
102-
# - layer: Perceel
103-
# style: standaard:perceel
104-
# - layer: Perceel
105-
# style: kwaliteit:perceel
106-
# - layer: Perceel
107-
# style: print:perceel
108-
# - layer: Perceelvlak
109-
# style: standaard
110-
# - layer: Perceelvlak
111-
# style: kwaliteit
112-
# - layer: Perceelvlak
113-
# style: print
114-
# - layer: Perceelvlak
115-
# style: standaard:perceel
116-
# - layer: Perceelvlak
117-
# style: kwaliteit:perceel
118-
# - layer: Perceelvlak
119-
# style: print:perceel
120-
# - layer: Label
121-
# style: standaard
122-
# - layer: Label
123-
# style: standaard:perceel
124-
# - layer: Label
125-
# style: kwaliteit
126-
# - layer: Label
127-
# style: kwaliteit:perceel
128-
# - layer: Label
129-
# style: print
130-
# - layer: Label
131-
# style: print:perceel
132-
# - layer: Bijpijling
133-
# style: standaard
134-
# - layer: Bijpijling
135-
# style: kwaliteit
136-
# - layer: Bijpijling
137-
# style: print
138-
# - layer: Bijpijling
139-
# style: standaard:perceel
140-
# - layer: Bijpijling
141-
# style: kwaliteit:perceel
142-
# - layer: Bijpijling
143-
# style: print:perceel
144-
# - layer: KadastraleGrens
145-
# style: standaard
146-
# - layer: KadastraleGrens
147-
# style: kwaliteit
148-
# - layer: KadastraleGrens
149-
# style: print
150-
# - layer: KadastraleGrens
151-
# style: standaard:kadastralegrens
152-
# - layer: KadastraleGrens
153-
# style: kwaliteit:kadastralegrens
154-
# - layer: KadastraleGrens
155-
# style: print:kadastralegrens
15659
legend-fixer.sh: |-
15760
#!/usr/bin/env bash
15861
set -eo pipefail
@@ -215,3 +118,4 @@ remove: |
215118
"KadastraleGrens" "standaard"
216119
"KadastraleGrens" "kwaliteit"
217120
"KadastraleGrens" "print"
121+

‎internal/controller/test_data/wfs/complete/expected/configmap-mapserver.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ metadata:
130130
service-type: wfs
131131
service-version: v1_0
132132
theme: theme
133-
name: complete-wfs-mapserver-d84299cgbk
133+
name: complete-wfs-mapserver-4dm5625f45
134134
namespace: default
135135
ownerReferences:
136136
- apiVersion: pdok.nl/v3

‎internal/controller/test_data/wfs/complete/expected/deployment.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ spec:
253253
- emptyDir: {}
254254
name: data
255255
- configMap:
256-
name: complete-wfs-mapserver-d84299cgbk
256+
name: complete-wfs-mapserver-4dm5625f45
257257
defaultMode: 420
258258
name: mapserver
259259
- configMap:

‎internal/controller/test_data/wfs/minimal/expected/configmap-mapserver.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ metadata:
1515
pdok.nl/inspire: "false"
1616
service-type: wfs
1717
service-version: v1_0
18-
name: minimal-wfs-mapserver-49t5fd5c5d
18+
name: minimal-wfs-mapserver-f5ch9b2bhh
1919
namespace: default
2020
ownerReferences:
2121
- apiVersion: pdok.nl/v3

‎internal/controller/test_data/wfs/minimal/expected/deployment.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ spec:
236236
- emptyDir: {}
237237
name: data
238238
- configMap:
239-
name: minimal-wfs-mapserver-49t5fd5c5d
239+
name: minimal-wfs-mapserver-f5ch9b2bhh
240240
defaultMode: 420
241241
name: mapserver
242242
- configMap:

‎internal/controller/test_data/wfs/noprefetch/expected/configmap-mapserver.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ metadata:
1515
pdok.nl/inspire: "false"
1616
service-type: wfs
1717
service-version: v1_0
18-
name: noprefetch-wfs-mapserver-49t5fd5c5d
18+
name: noprefetch-wfs-mapserver-f5ch9b2bhh
1919
namespace: default
2020
ownerReferences:
2121
- apiVersion: pdok.nl/v3

‎internal/controller/test_data/wfs/noprefetch/expected/deployment.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ spec:
232232
- emptyDir: {}
233233
name: data
234234
- configMap:
235-
name: noprefetch-wfs-mapserver-49t5fd5c5d
235+
name: noprefetch-wfs-mapserver-f5ch9b2bhh
236236
defaultMode: 420
237237
name: mapserver
238238
- configMap:

‎internal/controller/test_data/wms/complete/expected/configmap-mapserver.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ metadata:
136136
service-type: wms
137137
service-version: v1_0
138138
theme: "2016"
139-
name: complete-wms-mapserver-6k9496ckg7
139+
name: complete-wms-mapserver-84kmc4cbf6
140140
namespace: default
141141
ownerReferences:
142142
- apiVersion: pdok.nl/v3

0 commit comments

Comments
 (0)