Default extent

Author: Jelle Dijkstra

api/v2beta1/wfs_conversion.go

@@ -84,10 +84,19 @@ func (src *WFS) ConvertTo(dstRaw conversion.Hub) error {
 		}
 	}
 
-	if src.Spec.Service.Extent != nil {
-		service.Bbox = pdoknlv3.Bbox{
+	if src.Spec.Service.Extent != nil && *src.Spec.Service.Extent != "" {
+		service.Bbox = &pdoknlv3.Bbox{
 			DefaultCRS: sharedModel.ExtentToBBox(*src.Spec.Service.Extent),
 		}
+	} else {
+		service.Bbox = &pdoknlv3.Bbox{
+			DefaultCRS: sharedModel.BBox{
+				MinX: "-25000",
+				MaxX: "280000",
+				MinY: "250000",
+				MaxY: "860000",
+			},
+		}
 	}
 
 	// TODO - where to place the MetadataIdentifier and FeatureTypes[0].SourceMetadataIdentifier if the service is not inspire?
@@ -129,7 +138,6 @@ func convertV2FeatureTypeToV3(src FeatureType) pdoknlv3.FeatureType {
 	if src.Extent != nil {
 		featureTypeV3.Bbox = &pdoknlv3.FeatureBbox{
 			DefaultCRS: sharedModel.ExtentToBBox(*src.Extent),
-			// TODO do we need Wgs84?
 		}
 	}
 
@@ -225,7 +233,6 @@ func (dst *WFS) ConvertFrom(srcRaw conversion.Hub) error {
 		Abstract:          src.Spec.Service.Abstract,
 		Keywords:          src.Spec.Service.Keywords,
 		AccessConstraints: src.Spec.Service.AccessConstraints,
-		Extent:            Pointer(src.Spec.Service.Bbox.DefaultCRS.ToExtent()),
 		DataEPSG:          src.Spec.Service.DefaultCrs,
 		Maxfeatures:       src.Spec.Service.CountDefault,
 		Authority: Authority{
@@ -234,6 +241,12 @@ func (dst *WFS) ConvertFrom(srcRaw conversion.Hub) error {
 		},
 	}
 
+	if src.Spec.Service.Bbox != nil {
+		service.Extent = Pointer(src.Spec.Service.Bbox.DefaultCRS.ToExtent())
+	} else {
+		service.Extent = Pointer("-25000 250000 280000 860000")
+	}
+
 	if src.Spec.Service.Mapfile != nil {
 		service.Mapfile = &Mapfile{
 			ConfigMapKeyRef: src.Spec.Service.Mapfile.ConfigMapKeyRef,

api/v3/wfs_types.go

@@ -90,7 +90,7 @@ type Service struct {
 	AccessConstraints string   `json:"accessConstraints"`
 	DefaultCrs        string   `json:"defaultCrs"`
 	OtherCrs          []string `json:"otherCrs,omitempty"`
-	Bbox              Bbox     `json:"bbox"`
+	Bbox              *Bbox    `json:"bbox"`
 	// CountDefault -> wfs_maxfeatures in mapfile
 	CountDefault *string       `json:"countDefault"`
 	FeatureTypes []FeatureType `json:"featureTypes"`

api/v3/zz_generated.deepcopy.go

@@ -5,4 +5,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: local-registry:5000/wfs-operator
-  newTag: v3.0.18
+  newTag: v3.0.25