Skip to content

fix #12044: fix wfs layer hidden in 3D + scale arrow not rendering#12155

Merged
MV88 merged 6 commits intogeosolutions-it:masterfrom
mahmoudadel54:fix_12044
Mar 31, 2026
Merged

fix #12044: fix wfs layer hidden in 3D + scale arrow not rendering#12155
MV88 merged 6 commits intogeosolutions-it:masterfrom
mahmoudadel54:fix_12044

Conversation

@mahmoudadel54
Copy link
Copy Markdown
Contributor

@mahmoudadel54 mahmoudadel54 commented Mar 25, 2026 •
edited
Loading

Description

This PR includes:

  • fix not hidding wfs layers with scale limits for 3D cesium map
  • handle showing arrow for current scale in scales DD for scaleDenominator
  • handle max scale to be excluded and min to be included in filter

Please check if the PR fulfills these requirements

What kind of change does this PR introduce? (check one with "x", remove the others)

  • Bugfix
  • Feature
  • Code style update (formatting, local variables)
  • Refactoring (no functional changes, no api changes)
  • Build related changes
  • CI related changes
  • Other... Please describe:

Issue

What is the current behavior?

#
#12044 (comment)
What is the new behavior?

recording.10.webm

Breaking change

Does this PR introduce a breaking change? (check one with "x", remove the other)

  • Yes, and I documented them in migration notes
  • No

Other useful information

@mahmoudadel54
fix geosolutions-it#12044: fix wfs layer hidden in 3D + scale arrow n…
1df2889 
…ot rendering

- fix not hidding wfs layers with scale limits
- handle showing arrow for current scale in scales DD for scaleDenominator
@mahmoudadel54 mahmoudadel54 added this to the 2026.01.01 milestone Mar 25, 2026
@mahmoudadel54 mahmoudadel54 requested a review from MV88 March 25, 2026 12:11
@mahmoudadel54 mahmoudadel54 self-assigned this Mar 25, 2026
@cla-bot cla-bot bot added the CLA Ready label Mar 25, 2026
@mahmoudadel54 mahmoudadel54 linked an issue Mar 25, 2026 that may be closed by this pull request
Ability to setup scale limits for vector/WFS styling rules #12044
Open
2 tasks
MV88
MV88 requested changes Mar 25, 2026
View reviewed changes
Copy link
Copy Markdown
Contributor

@MV88 MV88 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if you open styler while being in 3d and you start zooming out then arrows goes away

@mahmoudadel54 mahmoudadel54 requested a review from MV88 March 25, 2026 20:25
MV88
MV88 requested changes Mar 26, 2026
View reviewed changes
Copy link
Copy Markdown
Contributor

@MV88 MV88 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i cannot see the layer when going to this scenario

Image

it should be visible when scale is here, because min is always included, and max is excluded

if i have scales A B C
max A (excluded)
min C (included)

it means the when i am on the scale B or C i should apply the style rule

Image

please play a lot with zoom and values in the dropdown, because there might be some more issues

it should work as the display tab

Image

here is a video showing to reproduce this

scale.denominator.mp4

@mahmoudadel54
- fix the scale limit filter to exclude max value and include min sca…
cc6d8f7 
…le value
@mahmoudadel54
- for 3D, ehnace getMapScaleForCesium to take camera prependicular po…
a1afdc0 
…osition into account

- enhance calc. scale value in geoStylerStyleToOlParserStyleFct to match the predefined scale values list
- fix FE unit test
@mahmoudadel54
- fix FE unit test
8d0c3b2
@mahmoudadel54 mahmoudadel54 requested a review from MV88 March 27, 2026 09:32
MV88
MV88 requested changes Mar 27, 2026
View reviewed changes
Copy link
Copy Markdown
Contributor

@MV88 MV88 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

functionality works, but is there room to add some more unit tests considering that we had a lot of back and forth?

@mahmoudadel54 mahmoudadel54 requested a review from MV88 March 27, 2026 12:50
MV88
MV88 approved these changes Mar 31, 2026
View reviewed changes
Copy link
Copy Markdown
Contributor

@MV88 MV88 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@MV88 MV88 merged commit 4bfa0c1 into geosolutions-it:master Mar 31, 2026
12 checks passed
MV88 pushed a commit to MV88/MapStore2 that referenced this pull request Mar 31, 2026
@mahmoudadel54 @MV88
Fix geosolutions-it#12044: fix wfs layer hidden in 3D + scale arrow n…
aa98747 
…ot rendering (geosolutions-it#12155)

* fix geosolutions-it#12044: fix wfs layer hidden in 3D + scale arrow not rendering

- fix not hidding wfs layers with scale limits
- handle showing arrow for current scale in scales DD for scaleDenominator

* - Fix: Arrow UI disappears when zooming out in 3D styler view

* - fix the scale limit filter to exclude max value and include min scale value

* - for 3D, ehnace getMapScaleForCesium to take camera prependicular poosition into account
- enhance calc. scale value in geoStylerStyleToOlParserStyleFct to match the predefined scale values list
- fix FE unit test

* - fix FE unit test

* - add unit tests for getMapScaleForCesium and isCameraPerpendicularToSurface
MV88 pushed a commit that referenced this pull request Mar 31, 2026
@mahmoudadel54 @MV88
Fix #12044: fix wfs layer hidden in 3D + scale arrow not rendering (#…
87eeaf7 
…12155)

* fix #12044: fix wfs layer hidden in 3D + scale arrow not rendering

- fix not hidding wfs layers with scale limits
- handle showing arrow for current scale in scales DD for scaleDenominator

* - Fix: Arrow UI disappears when zooming out in 3D styler view

* - fix the scale limit filter to exclude max value and include min scale value

* - for 3D, ehnace getMapScaleForCesium to take camera prependicular poosition into account
- enhance calc. scale value in geoStylerStyleToOlParserStyleFct to match the predefined scale values list
- fix FE unit test

* - fix FE unit test

* - add unit tests for getMapScaleForCesium and isCameraPerpendicularToSurface
@offtherailz offtherailz mentioned this pull request Apr 10, 2026
Draft
@offtherailz
Copy link
Copy Markdown
Member

offtherailz commented Apr 10, 2026

Created backport PR for 2026.01.xx:

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin backport-12155-to-2026.01.xx
git worktree add --checkout .worktree/backport-12155-to-2026.01.xx backport-12155-to-2026.01.xx
cd .worktree/backport-12155-to-2026.01.xx
git reset --hard HEAD^
git cherry-pick -x 4bfa0c115cdaf68e8a396407f1f9b9d776e8b92d
git push --force-with-lease

@tdipisa
Copy link
Copy Markdown
Member

tdipisa commented Apr 10, 2026

Created backport PR for 2026.01.xx:

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin backport-12155-to-2026.01.xx
git worktree add --checkout .worktree/backport-12155-to-2026.01.xx backport-12155-to-2026.01.xx
cd .worktree/backport-12155-to-2026.01.xx
git reset --hard HEAD^
git cherry-pick -x 4bfa0c115cdaf68e8a396407f1f9b9d776e8b92d
git push --force-with-lease

@mahmoudadel54 there was no backport label for this, therefore the backport was not created and now conflicts need to be fixed.

mahmoudadel54 added a commit that referenced this pull request Apr 10, 2026
@mahmoudadel54
Fix #12044: fix wfs layer hidden in 3D + scale arrow not rendering (#…
f25d7a7 
…12155)

* fix #12044: fix wfs layer hidden in 3D + scale arrow not rendering

- fix not hidding wfs layers with scale limits
- handle showing arrow for current scale in scales DD for scaleDenominator

* - Fix: Arrow UI disappears when zooming out in 3D styler view

* - fix the scale limit filter to exclude max value and include min scale value

* - for 3D, ehnace getMapScaleForCesium to take camera prependicular poosition into account
- enhance calc. scale value in geoStylerStyleToOlParserStyleFct to match the predefined scale values list
- fix FE unit test

* - fix FE unit test

* - add unit tests for getMapScaleForCesium and isCameraPerpendicularToSurface
mahmoudadel54 added a commit that referenced this pull request Apr 10, 2026
@mahmoudadel54
Fix #12044: fix wfs layer hidden in 3D + scale arrow not rendering (#…
bc7e209 
…12155)

* fix #12044: fix wfs layer hidden in 3D + scale arrow not rendering

- fix not hidding wfs layers with scale limits
- handle showing arrow for current scale in scales DD for scaleDenominator

* - Fix: Arrow UI disappears when zooming out in 3D styler view

* - fix the scale limit filter to exclude max value and include min scale value

* - for 3D, ehnace getMapScaleForCesium to take camera prependicular poosition into account
- enhance calc. scale value in geoStylerStyleToOlParserStyleFct to match the predefined scale values list
- fix FE unit test

* - fix FE unit test

* - add unit tests for getMapScaleForCesium and isCameraPerpendicularToSurface
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MV88 MV88 MV88 approved these changes

Assignees

@MV88 MV88

@mahmoudadel54 mahmoudadel54

Labels

backport 2026.01.xx CLA Ready enhancement

Projects

None yet

Milestone

2026.01.01

Development

Successfully merging this pull request may close these issues.

Ability to setup scale limits for vector/WFS styling rules

4 participants

@mahmoudadel54 @offtherailz @tdipisa @MV88