Skip to content

feat(mapfilegenerator): inherit min/max scale from parent layer #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
damienmulder merged 1 commit into from
Oct 28, 2026
Merged

feat(mapfilegenerator): inherit min/max scale from parent layer #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion internal/controller/mapfilegenerator/mapper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ func getWMSLayer(serviceLayer pdoknlv3.Layer, serviceExtent string, wms *pdoknlv
groupName := ""
parent := wms.Spec.Service.GetParentLayer(serviceLayer)
// If the layer falls directly under the toplayer, the groupname is omitted
if !parent.IsTopLayer() && parent.IsGroupLayer() && parent.Name != nil && parent.Visible {
if parent != nil && !parent.IsTopLayer() && parent.IsGroupLayer() && parent.Name != nil && parent.Visible {
groupName = *parent.Name
}

Expand Down Expand Up @@ -300,6 +300,16 @@ func getWMSLayer(serviceLayer pdoknlv3.Layer, serviceExtent string, wms *pdoknlv
Offsite: "",
}

// Let child Layers inherit Scale denominators from their parent if not explicitly set.
if parent != nil {
if result.MinScale == nil {
result.MinScale = parent.MinScaleDenominator
}
if result.MaxScale == nil {
result.MaxScale = parent.MaxScaleDenominator
}
}

for _, style := range serviceLayer.Styles {
stylePath := "/styling/" + smoothoperatorutils.PointerVal(style.Visualization, "")
result.Styles = append(result.Styles, Style{
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/mapfilegenerator/test_data/expected/wms_group.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@
"keywords": "Man Made,Duikersifonhevel,Aquaduct,Brug,Stuw,Vastedam,Waterkering,Sluis.",
"layer_extent": "-59188.44333693248 304984.64144318487 308126.88473339565 858328.516489961",
"maxscale": "50000",
"minscale": "1",
"minscale": "2",
"name": "HY.PhysicalWaters.ManMadeObject.crossingpoint",
"styles": [
{
Expand Down Expand Up @@ -292,7 +292,7 @@
"group_name": "HY.PhysicalWaters.ManMadeObject",
"keywords": "Man Made,Duikersifonhevel,Aquaduct,Brug,Stuw,Vastedam,Waterkering,Sluis.",
"layer_extent": "-59188.44333693248 304984.64144318487 308126.88473339565 858328.516489961",
"maxscale": "50000",
"maxscale": "25000",
"minscale": "1",
"name": "HY.PhysicalWaters.ManMadeObject.sluice",
"styles": [
Expand Down
8 changes: 2 additions & 6 deletions internal/controller/mapfilegenerator/test_data/input/wms_group.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,8 +300,6 @@ spec:
- Vastedam
- Waterkering
- Sluis.
maxscaledenominator: "50000"
minscaledenominator: "1"
name: HY.PhysicalWaters.ManMadeObject.lock
styles:
- name: HY.PhysicalWaters.ManMadeObject.Default
Expand Down Expand Up @@ -348,8 +346,7 @@ spec:
- Vastedam
- Waterkering
- Sluis.
maxscaledenominator: "50000"
minscaledenominator: "1"
minscaledenominator: "2"
name: HY.PhysicalWaters.ManMadeObject.crossingpoint
styles:
- name: HY.PhysicalWaters.ManMadeObject.Default
Expand Down Expand Up @@ -395,8 +392,7 @@ spec:
- Vastedam
- Waterkering
- Sluis.
maxscaledenominator: "50000"
minscaledenominator: "1"
maxscaledenominator: "25000"
name: HY.PhysicalWaters.ManMadeObject.sluice
styles:
- name: HY.PhysicalWaters.ManMadeObject.Default
Expand Down
1 change: 0 additions & 1 deletion internal/controller/mapfilegenerator/test_data/input/wms_group_and_toplayer.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,6 @@ spec:
keywords:
- Grens
- Kadastrale grenzen
maxscaledenominator: "6001"
minscaledenominator: "50"
name: KadastraleGrens
styles:
Expand Down
Loading