Merge pull request #99 from PDOK/wr/fix-diffs

fixes

Author: jelledijkstra97

internal/controller/capabilitiesgenerator/mapper.go

@@ -49,8 +49,8 @@ func MapWFSToCapabilitiesGeneratorInput(wfs *pdoknlv3.WFS, ownerInfo *smoothoper
 
 					ServiceProvider: mapServiceProvider(&ownerInfo.Spec.WFS.ServiceProvider),
 					ServiceIdentification: wfs200.ServiceIdentification{
-						Title:             mapperutils.EscapeQuotes(wfs.Spec.Service.Title),
-						Abstract:          mapperutils.EscapeQuotes(wfs.Spec.Service.Abstract),
+						Title:             wfs.Spec.Service.Title,
+						Abstract:          wfs.Spec.Service.Abstract,
 						AccessConstraints: wfs.Spec.Service.AccessConstraints.String(),
 						Keywords: &wsc110.Keywords{
 							Keyword: wfs.Spec.Service.KeywordsIncludingInspireKeyword(),
@@ -163,8 +163,8 @@ func getFeatureTypeList(wfs *pdoknlv3.WFS, ownerInfo *smoothoperatorv1.OwnerInfo
 
 		featureType := wfs200.FeatureType{
 			Name:     wfs.Spec.Service.Prefix + ":" + fType.Name,
-			Title:    mapperutils.EscapeQuotes(fType.Title),
-			Abstract: mapperutils.EscapeQuotes(fType.Abstract),
+			Title:    fType.Title,
+			Abstract: fType.Abstract,
 			Keywords: &[]wsc110.Keywords{
 				{
 					Keyword: fType.Keywords,
@@ -272,8 +272,6 @@ func MapWMSToCapabilitiesGeneratorInput(wms *pdoknlv3.WMS, ownerInfo *smoothoper
 		return nil, err
 	}
 
-	abstract := mapperutils.EscapeQuotes(wms.Spec.Service.Abstract)
-
 	config := capabilitiesgenerator.Config{
 		Global: capabilitiesgenerator.Global{
 			// Prefix is unused for the WMS, but doesn't hurt to pass it
@@ -288,10 +286,10 @@ func MapWMSToCapabilitiesGeneratorInput(wms *pdoknlv3.WMS, ownerInfo *smoothoper
 				Wms130: wms130.GetCapabilitiesResponse{
 					WMSService: wms130.WMSService{
 						Name:               "WMS",
-						Title:              mapperutils.EscapeQuotes(wms.Spec.Service.Title),
-						Abstract:           &abstract,
+						Title:              wms.Spec.Service.Title,
+						Abstract:           &wms.Spec.Service.Abstract,
 						KeywordList:        &wms130.Keywords{Keyword: wms.Spec.Service.KeywordsIncludingInspireKeyword()},
-						OnlineResource:     wms130.OnlineResource{Href: smoothoperatorutils.Pointer(wms.URL().Scheme + "://" + wms.URL().Host)},
+						OnlineResource:     wms130.OnlineResource{Href: smoothoperatorutils.Pointer(wms.URL().Scheme + "://" + wms.URL().Host + "/")},
 						ContactInformation: getContactInformation(ownerInfo),
 						Fees:               wms.Spec.Service.Fees,
 						AccessConstraints:  ptr.To(wms.Spec.Service.AccessConstraints.String()),
@@ -316,7 +314,7 @@ func MapWMSToCapabilitiesGeneratorInput(wms *pdoknlv3.WMS, ownerInfo *smoothoper
 									DCPType: getDcpType(canonicalServiceURL.String(), true),
 								},
 							},
-							Exception:            wms130.ExceptionType{Format: []string{"XML", "BLANK"}},
+							Exception:            wms130.ExceptionType{Format: []string{"XML", "INIMAGE", "BLANK"}},
 							ExtendedCapabilities: nil,
 							Layer:                layer,
 						},
@@ -400,13 +398,19 @@ func getDcpType(url string, fillPost bool) *wms130.DCPType {
 		OnlineResource: wms130.OnlineResource{
 			Xlink: smoothoperatorutils.Pointer(XLinkURL),
 			Type:  nil,
-			Href:  smoothoperatorutils.Pointer(url),
+			Href:  smoothoperatorutils.Pointer(url + "?"),
 		},
 	}
 
 	var post *wms130.Method
 	if fillPost {
-		post = &get
+		post = &wms130.Method{
+			OnlineResource: wms130.OnlineResource{
+				Xlink: smoothoperatorutils.Pointer(XLinkURL),
+				Type:  nil,
+				Href:  smoothoperatorutils.Pointer(url),
+			},
+		}
 	}
 
 	result := wms130.DCPType{
@@ -434,7 +438,7 @@ func mapLayer(layer pdoknlv3.Layer, canonicalURL string, authorityURL *wms130.Au
 		authorityURL = &wms130.AuthorityURL{
 			Name: layer.Authority.Name,
 			OnlineResource: wms130.OnlineResource{
-				Xlink: smoothoperatorutils.Pointer(XLinkURL),
+				Xlink: nil,
 				Type:  nil,
 				Href:  &layer.Authority.URL,
 			},
@@ -454,8 +458,8 @@ func mapLayer(layer pdoknlv3.Layer, canonicalURL string, authorityURL *wms130.Au
 		Queryable:               smoothoperatorutils.Pointer(1),
 		Opaque:                  nil,
 		Name:                    layer.Name,
-		Title:                   mapperutils.EscapeQuotes(smoothoperatorutils.PointerVal(layer.Title, "")),
-		Abstract:                smoothoperatorutils.Pointer(mapperutils.EscapeQuotes(smoothoperatorutils.PointerVal(layer.Abstract, ""))),
+		Title:                   smoothoperatorutils.PointerVal(layer.Title, ""),
+		Abstract:                smoothoperatorutils.Pointer(smoothoperatorutils.PointerVal(layer.Abstract, "")),
 		KeywordList:             &wms130.Keywords{Keyword: layer.Keywords},
 		CRS:                     crsses,
 		EXGeographicBoundingBox: exBbox,

internal/controller/capabilitiesgenerator/test_data/wfs_input.yaml

@@ -10,7 +10,7 @@ services:
     definition:
       serviceIdentification:
         title: some Service title
-        abstract: some \"Service\" abstract
+        abstract: 'some "Service" abstract'
         keywords:
           keyword:
             - service-keyword-1
@@ -37,7 +37,7 @@ services:
           featureType:
             - name: prefix:featuretype-1-name
               title: featuretype-1-title
-              abstract: feature \"1\" abstract
+              abstract: 'feature "1" abstract'
               keywords:
                 - keyword:
                     - featuretype-1-keyword-1
@@ -59,7 +59,7 @@ services:
                 href: 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=datadata-data-data-data-datadatadata
             - name: prefix:featuretype-2-name
               title: featuretype-2-title
-              abstract: feature \"2\" abstract
+              abstract: 'feature "2" abstract'
               keywords:
                 - keyword:
                     - featuretype-2-keyword-1

internal/controller/capabilitiesgenerator/test_data/wms_input.yaml

@@ -31,7 +31,7 @@ services:
         onlineResource:
           xlink: null
           type: null
-          href: http://localhost
+          href: http://localhost/
         contactInformation:
           contactPersonPrimary:
             contactPerson: KlantContactCenter PDOK
@@ -63,7 +63,7 @@ services:
                     onlineResource:
                       xlink: http://www.w3.org/1999/xlink
                       type: null
-                      href: http://localhost/rws/nwbwegen/wms/v1_0
+                      href: http://localhost/rws/nwbwegen/wms/v1_0?
                   post: null
             getMap:
               format:
@@ -78,7 +78,7 @@ services:
                     onlineResource:
                       xlink: http://www.w3.org/1999/xlink
                       type: null
-                      href: http://localhost/rws/nwbwegen/wms/v1_0
+                      href: http://localhost/rws/nwbwegen/wms/v1_0?
                   post:
                     onlineResource:
                       xlink: http://www.w3.org/1999/xlink
@@ -99,7 +99,7 @@ services:
                     onlineResource:
                       xlink: http://www.w3.org/1999/xlink
                       type: null
-                      href: http://localhost/rws/nwbwegen/wms/v1_0
+                      href: http://localhost/rws/nwbwegen/wms/v1_0?
                   post:
                     onlineResource:
                       xlink: http://www.w3.org/1999/xlink
@@ -108,6 +108,7 @@ services:
           exception:
             format:
               - XML
+              - INIMAGE
               - BLANK
           extendedCapabilities:
             metadataUrl:
@@ -277,7 +278,7 @@ services:
                     onlineResource:
                       href: https://www.rijkswaterstaat.nl
                       type: null
-                      xlink: http://www.w3.org/1999/xlink
+                      xlink: null
                   identifier:
                     authority: rws
                     value: 8f0497f0-dbd7-4bee-b85a-5fdec484a7ff
@@ -380,7 +381,7 @@ services:
                     onlineResource:
                       href: https://www.rijkswaterstaat.nl
                       type: null
-                      xlink: http://www.w3.org/1999/xlink
+                      xlink: null
                   identifier:
                     authority: rws
                     value: 8f0497f0-dbd7-4bee-b85a-5fdec484a7ff

internal/controller/mapfilegenerator/mapper.go

@@ -43,8 +43,8 @@ func MapWFSToMapfileGeneratorInput(wfs *pdoknlv3.WFS, ownerInfo *smoothoperatorv
 
 	input := WFSInput{
 		BaseServiceInput: BaseServiceInput{
-			Title:             mapperutils.EscapeQuotes(wfs.Spec.Service.Title),
-			Abstract:          mapperutils.EscapeQuotes(wfs.Spec.Service.Abstract),
+			Title:             wfs.Spec.Service.Title,
+			Abstract:          wfs.Spec.Service.Abstract,
 			Keywords:          strings.Join(wfs.Spec.Service.KeywordsIncludingInspireKeyword(), ","),
 			OnlineResource:    wfs.URL().Scheme + "://" + wfs.URL().Host,
 			Path:              wfs.URL().Path,
@@ -70,8 +70,8 @@ func getWFSLayers(service pdoknlv3.WFSService) (layers []WFSLayer) {
 		layer := WFSLayer{
 			BaseLayer: BaseLayer{
 				Name:           featureType.Name,
-				Title:          mapperutils.EscapeQuotes(featureType.Title),
-				Abstract:       mapperutils.EscapeQuotes(featureType.Abstract),
+				Title:          featureType.Title,
+				Abstract:       featureType.Abstract,
 				Keywords:       strings.Join(featureType.Keywords, ","),
 				Extent:         getWFSExtent(featureType, service),
 				MetadataID:     featureType.DatasetMetadataURL.CSW.MetadataIdentifier,

internal/controller/mapfilegenerator/test_data/expected/wfs.json

@@ -1,6 +1,6 @@
 {
   "service_title": "some Service title",
-  "service_abstract": "some \\\"Service\\\" abstract",
+  "service_abstract": "some \"Service\" abstract",
   "service_keywords": "service-keyword-1,service-keyword-2,infoFeatureAccessService",
   "service_extent": "0.0 2.0 1.0 3.0",
   "service_wfs_maxfeatures": "1000",
@@ -27,7 +27,7 @@
     {
       "name": "featuretype-1-name",
       "title": "featuretype-1-title",
-      "abstract": "feature \\\"1\\\" abstract",
+      "abstract": "feature \"1\" abstract",
       "keywords": "featuretype-1-keyword-1,featuretype-1-keyword-2",
       "layer_extent": "0.0 2.0 1.0 3.0",
       "dataset_metadata_id": "datadata-data-data-data-datadatadata",
@@ -49,7 +49,7 @@
     {
       "name": "featuretype-2-name",
       "title": "featuretype-2-title",
-      "abstract": "feature \\\"2\\\" abstract",
+      "abstract": "feature \"2\" abstract",
       "keywords": "featuretype-2-keyword-1,featuretype-2-keyword-2",
       "layer_extent": "0.0 2.0 1.0 3.0",
       "dataset_metadata_id": "datadata-data-data-data-datadatadata",

internal/controller/mapperutils/utils.go

@@ -62,19 +62,6 @@ func GetNamespaceURI(prefix string, ownerInfo *smoothoperatorv1.OwnerInfo) strin
 	return strings.ReplaceAll(*ownerInfo.Spec.NamespaceTemplate, "{{prefix}}", prefix)
 }
 
-func EscapeQuotes(s string) string {
-	return strings.ReplaceAll(s, "\"", "\\\"")
-}
-
-func GetLabelValueByKey(labels map[string]string, key string) *string {
-	for k, v := range labels {
-		if k == key {
-			return &v
-		}
-	}
-	return nil
-}
-
 func AnyMatch[S ~[]E, E any](slice S, eql func(E) bool) bool {
 	for _, elem := range slice {
 		if eql(elem) {

internal/controller/test_data/wfs/complete/expected/configmap-capabilities-generator.yaml

@@ -107,7 +107,7 @@ metadata:
     service-type: wfs
     service-version: v1_0
     theme: theme
-  name: complete-wfs-capabilities-generator-g7fh2dbt4m
+  name: complete-wfs-capabilities-generator-mfbh8cgh5c
   namespace: default
   ownerReferences:
     - apiVersion: pdok.nl/v3

internal/controller/test_data/wfs/complete/expected/configmap-mapfile-generator.yaml

@@ -111,7 +111,7 @@ metadata:
     service-type: wfs
     service-version: v1_0
     theme: theme
-  name: complete-wfs-mapfile-generator-c4f5ctgfmb
+  name: complete-wfs-mapfile-generator-dkmmf7b5hf
   namespace: default
   ownerReferences:
     - apiVersion: pdok.nl/v3

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

@@ -261,10 +261,10 @@ spec:
             name: complete-wfs-init-scripts-fft29bbtdd
           name: init-scripts
         - configMap:
-            name: complete-wfs-capabilities-generator-g7fh2dbt4m
+            name: complete-wfs-capabilities-generator-mfbh8cgh5c
             defaultMode: 420
           name: capabilities-generator-config
         - configMap:
-            name: complete-wfs-mapfile-generator-c4f5ctgfmb
+            name: complete-wfs-mapfile-generator-dkmmf7b5hf
             defaultMode: 420
           name: mapfile-generator-config

internal/controller/test_data/wms/complete/expected/configmap-capabilities-generator.yaml

@@ -233,7 +233,7 @@ metadata:
     service-type: wms
     service-version: v1_0
     theme: '2016'
-  name: complete-wms-capabilities-generator-ccc59c7dhm
+  name: complete-wms-capabilities-generator-gk8t45g7g2
   namespace: default
   ownerReferences:
     - apiVersion: pdok.nl/v3