Remove duplicate IsGroupLayer() func

Author: damienmulder

api/v3/wms_types.go

@@ -214,7 +214,7 @@ func (layer *Layer) hasTIFData() bool {
 
 func (layer *Layer) GetLayerType(service *WMSService) (layerType string) {
 	switch {
-	case layer.hasData() && layer.Layers == nil:
+	case layer.IsDataLayer():
 		return DataLayer
 	case layer.Name == service.Layer.Name:
 		return TopLayer
@@ -223,12 +223,12 @@ func (layer *Layer) GetLayerType(service *WMSService) (layerType string) {
 	}
 }
 
-func (layer *Layer) IsDataLayer(service *WMSService) bool {
-	return layer.GetLayerType(service) == DataLayer
+func (layer *Layer) IsDataLayer() bool {
+	return layer.hasData() && (layer.Layers == nil || len(*layer.Layers) == 0)
 }
 
-func (layer *Layer) IsGroupLayer(service *WMSService) bool {
-	return layer.GetLayerType(service) == GroupLayer
+func (layer *Layer) IsGroupLayer() bool {
+	return layer.Layers != nil && len(*layer.Layers) > 0
 }
 
 func (layer *Layer) hasBoundingBoxForCRS(crs string) bool {
@@ -259,10 +259,6 @@ func (layer *Layer) setInheritedBoundingBoxes() {
 	*layer.Layers = updatedLayers
 }
 
-func (layer *Layer) IsGroupLayer() bool {
-	return layer.Layers != nil && len(*layer.Layers) > 0
-}
-
 func (wms *WMS) GetAllLayersWithLegend() (layers []Layer) {
 	for _, layer := range wms.Spec.Service.Layer.GetAllLayers() {
 		if !layer.hasData() || len(layer.Styles) == 0 {

api/v3/wms_validation.go

@@ -163,7 +163,7 @@ func validateWMS(wms *WMS, warnings *[]string, reasons *[]string) {
 			}
 		}
 
-		if layer.IsDataLayer(&wms.Spec.Service) {
+		if layer.IsDataLayer() {
 			for _, style := range layer.Styles {
 				if wms.Spec.Service.Mapfile == nil && style.Visualization == nil {
 					layerReasons = append(layerReasons, fmt.Sprintf("invalid style: '%s': style.visualization must be set on a dataLayer", style.Name))

internal/controller/featureinfogenerator/mapper.go

@@ -18,7 +18,7 @@ func MapWMSToFeatureinfoGeneratorInput(wms *pdoknlv3.WMS) (*featureinfo.Scheme,
 	}
 
 	for _, layer := range wms.Spec.Service.Layer.GetAllLayers() {
-		if !layer.IsDataLayer(&wms.Spec.Service) {
+		if !layer.IsDataLayer() {
 			continue
 		}
 		l := featureinfo.Layer{
@@ -27,7 +27,7 @@ func MapWMSToFeatureinfoGeneratorInput(wms *pdoknlv3.WMS) (*featureinfo.Scheme,
 		}
 
 		parentLayer := layer.GetParent(&wms.Spec.Service.Layer)
-		if parentLayer != nil && parentLayer.IsGroupLayer(&wms.Spec.Service) {
+		if parentLayer != nil && parentLayer.IsGroupLayer() {
 			l.GroupName = parentLayer.Name
 		}