pointers

Author: Shalucik

api/v3/shared_types.go

@@ -42,19 +42,21 @@ type Mapfile struct {
 	ConfigMapKeyRef corev1.ConfigMapKeySelector `json:"configMapKeyRef"`
 }
 
+// TODO moeten allemaal default waardes hebben
+// TODO WMS/WFS splitsen
 type Options struct {
-	IncludeIngress              bool  `json:"includeIngress"`
-	AutomaticCasing             bool  `json:"automaticCasing"`
-	ValidateRequests            *bool `json:"validateRequests,omitempty"`
-	RewriteGroupToDataLayers    *bool `json:"rewriteGroupToDataLayers,omitempty"`
-	DisableWebserviceProxy      *bool `json:"disableWebserviceProxy,omitempty"`
-	PrefetchData                *bool `json:"prefetchData,omitempty"`
-	ValidateChildStyleNameEqual *bool `json:"validateChildStyleNameEqual,omitempty"`
+	IncludeIngress              bool `json:"includeIngress"`              // default true
+	AutomaticCasing             bool `json:"automaticCasing"`             // default true
+	ValidateRequests            bool `json:"validateRequests"`            // default true
+	RewriteGroupToDataLayers    bool `json:"rewriteGroupToDataLayers"`    // default false
+	DisableWebserviceProxy      bool `json:"disableWebserviceProxy"`      // default false
+	PrefetchData                bool `json:"prefetchData"`                // default true
+	ValidateChildStyleNameEqual bool `json:"validateChildStyleNameEqual"` // default true, moeten eigenlijk weg
 }
 
 type Inspire struct {
 	ServiceMetadataURL       MetadataURL `json:"serviceMetadataUrl"`
-	SpatialDatasetIdentifier string      `json:"spatialDatasetIdentifier"`
+	SpatialDatasetIdentifier *string     `json:"spatialDatasetIdentifier,omitempty"` // TODO required for WFS, doesn't exist in WMS, mogelijk uitsplitsen
 	Language                 string      `json:"language"`
 }
 
@@ -72,24 +74,25 @@ type Custom struct {
 	Type string `json:"type"`
 }
 
+// minstens 1 verplicht, mogelijk splitsing wms/wfs
 type Data struct {
 	Gpkg    *Gpkg    `json:"gpkg,omitempty"`
 	Postgis *Postgis `json:"postgis,omitempty"`
-	TIF     *TIF     `json:"tif,omitempty"`
+	TIF     *TIF     `json:"tif,omitempty"` // kan niet voor WFS
 }
 
 type Gpkg struct {
 	BlobKey      string   `json:"blobKey"`
 	TableName    string   `json:"tableName"`
 	GeometryType string   `json:"geometryType"`
-	Columns      []Column `json:"columns"`
+	Columns      []Column `json:"columns"` // minlenght 1
 }
 
 // Postgis - reference to table in a Postgres database
 type Postgis struct {
 	TableName    string   `json:"tableName"`
 	GeometryType string   `json:"geometryType"`
-	Columns      []Column `json:"columns"`
+	Columns      []Column `json:"columns"` // minlenght 1
 }
 
 type TIF struct {

api/v3/wfs_types.go

@@ -47,8 +47,8 @@ type WFS struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   WFSSpec                     `json:"spec,omitempty"`
-	Status shared_model.OperatorStatus `json:"status,omitempty"`
+	Spec   WFSSpec                      `json:"spec"`
+	Status *shared_model.OperatorStatus `json:"status,omitempty"`
 }
 
 // +kubebuilder:object:root=true
@@ -73,28 +73,28 @@ type WFSSpec struct {
 	// Optional strategic merge patch for the pod in the deployment. E.g. to patch the resources or add extra env vars.
 	PodSpecPatch                 *corev1.PodSpec                            `json:"podSpecPatch,omitempty"`
 	HorizontalPodAutoscalerPatch *autoscalingv2.HorizontalPodAutoscalerSpec `json:"horizontalPodAutoscalerPatch,omitempty"`
-	Options                      Options                                    `json:"options,omitempty"`
+	Options                      Options                                    `json:"options"` // default waardes, mogelijk omitempty
 	Service                      WFSService                                 `json:"service"`
 }
 
 type WFSService struct {
-	Prefix       string   `json:"prefix"`
+	Prefix       string   `json:"prefix"` // XML Namespace prefix, mag niet met een cijfer beginnen
 	URL          string   `json:"url"`
 	Inspire      *Inspire `json:"inspire,omitempty"`
 	Mapfile      *Mapfile `json:"mapfile,omitempty"`
 	OwnerInfoRef string   `json:"ownerInfoRef"`
 	Title        string   `json:"title"`
 	Abstract     string   `json:"abstract"`
 	Keywords     []string `json:"keywords"`
-	Fees         *string  `json:"fees,omitempty"`
+	Fees         *string  `json:"fees,omitempty"` // maybe deprecated, has default value in capabilities-generator
 	// +kubebuilder:default="https://creativecommons.org/publicdomain/zero/1.0/deed.nl"
 	AccessConstraints string   `json:"accessConstraints"`
 	DefaultCrs        string   `json:"defaultCrs"`
-	OtherCrs          []string `json:"otherCrs,omitempty"`
-	Bbox              *Bbox    `json:"bbox,omitempty"`
+	OtherCrs          []string `json:"otherCrs,omitempty"` // mag default lijstje zijn
+	Bbox              Bbox     `json:"bbox"`
 	// CountDefault -> wfs_maxfeatures in mapfile
-	CountDefault *string       `json:"countDefault,omitempty"`
-	FeatureTypes []FeatureType `json:"featureTypes"`
+	CountDefault *string       `json:"countDefault,omitempty"` // TODO ook goed zetten in capabilities, mogelijk int maken
+	FeatureTypes []FeatureType `json:"featureTypes"`           // TODO minlength 1
 }
 
 type Bbox struct {
@@ -108,15 +108,15 @@ type FeatureType struct {
 	Title              string       `json:"title"`
 	Abstract           string       `json:"abstract"`
 	Keywords           []string     `json:"keywords"`
-	DatasetMetadataURL MetadataURL  `json:"datasetMetadataUrl"`
-	Bbox               *FeatureBbox `json:"bbox,omitempty"`
+	DatasetMetadataURL *MetadataURL `json:"datasetMetadataUrl,omitempty"`
+	Bbox               FeatureBbox  `json:"bbox"`
 	Data               Data         `json:"data"`
 }
 
 type FeatureBbox struct {
 	//nolint:tagliatelle
-	DefaultCRS shared_model.BBox  `json:"defaultCRS"`
-	WGS84      *shared_model.BBox `json:"wgs84,omitempty"`
+	DefaultCRS shared_model.BBox `json:"defaultCRS"`
+	WGS84      shared_model.BBox `json:"wgs84"`
 }
 
 func (wfs *WFS) HasPostgisData() bool {