Skip to content

fix displaying WMS layers from data.geopf.fr in 3d mode#10732

Merged
allyoucanmap merged 1 commit intogeosolutions-it:masterfrom
landryb:fix/10592
Jan 13, 2025
Merged

fix displaying WMS layers from data.geopf.fr in 3d mode#10732
allyoucanmap merged 1 commit intogeosolutions-it:masterfrom
landryb:fix/10592

Conversation

@landryb
Copy link
Copy Markdown
Contributor

@landryb landryb commented Dec 31, 2024

Description

https://data.geopf.fr/wms-r/wms & https://data.geopf.fr/wms-v/wms services only supports WMS 1.3.0. Cesium defaults to 1.1.1, so right now loading a layer from those services in 3d mode only results in 400 error codes. Pass the version from the options, and default to 1.1.1 if unset.

Please check if the PR fulfills these requirements

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

  • Bugfix

Issue

What is the current behavior?

#10592

What is the new behavior?

loading WMS layers in 3d mode from data.geopf.fr works.

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

This might have the side effect of changing lots of WMS layers in existing 3d maps to now use WMS 1.3.0 ? At least it now allows me to load WMS layers from https://data.geopf.fr/wms-r/wms and https://data.geopf.fr/wms-v/wms.

Other useful information

@landryb
fix displaying WMS layers from data.geopf.fr in 3d mode (geosolutions…
d009bad 
…-it#10592)

data.geopf.fr only supports WMS 1.3.0. Cesium defaults to 1.1.1.
Pass the version from the options, and default to 1.1.1 if unset.
@landryb
Copy link
Copy Markdown
Contributor Author

landryb commented Dec 31, 2024 •
edited
Loading

i've blindly added tests, but havent been able to run them locally...

31 12 2024 14:31:25.435:INFO [karma-server]: Karma v6.4.0 server started at http://localhost:9876/
31 12 2024 14:31:25.435:INFO [launcher]: Launching browsers ChromeHeadless with concurrency unlimited
31 12 2024 14:31:25.444:INFO [launcher]: Starting browser ChromeHeadless
31 12 2024 14:32:25.482:WARN [launcher]: ChromeHeadless has not captured in 60000 ms, killing.
31 12 2024 14:32:25.627:INFO [launcher]: Trying to start ChromeHeadless again (1/2).
31 12 2024 14:33:25.685:WARN [launcher]: ChromeHeadless has not captured in 60000 ms, killing.
31 12 2024 14:33:25.752:INFO [launcher]: Trying to start ChromeHeadless again (2/2).
31 12 2024 14:34:25.815:WARN [launcher]: ChromeHeadless has not captured in 60000 ms, killing.
31 12 2024 14:34:25.894:ERROR [launcher]: ChromeHeadless failed 2 times (timeout). Giving up.

trusting GH actions to do it for me.

edit: my tests are green

2024-12-31T14:52:05.2464475Z ✔ wmsToCesiumOptions
2024-12-31T14:52:05.2476496Z ✔ wmsToCesiumOptions with version

@tdipisa tdipisa added this to the 2025.01.00 milestone Jan 7, 2025
@tdipisa tdipisa linked an issue Jan 7, 2025 that may be closed by this pull request
cesium/3d mode forces wms requests to version 1.1.1 #10592
Closed
1 task
@tdipisa tdipisa added bug 3D All issues related to the 3D rendering in CesiumJs External Contribution labels Jan 7, 2025
@tdipisa tdipisa requested a review from allyoucanmap January 7, 2025 09:32
@tdipisa
Copy link
Copy Markdown
Member

tdipisa commented Jan 7, 2025

@landryb thank you for your contribution. We will review it soon. Added to next 2025.01

@allyoucanmap allyoucanmap merged commit ad51ceb into geosolutions-it:master Jan 13, 2025
@allyoucanmap
Copy link
Copy Markdown
Contributor

allyoucanmap commented Jan 13, 2025

@landryb thanks for the contribution!
@ElenaGallo please test this fix on dev, thanks

@landryb
Copy link
Copy Markdown
Contributor Author

landryb commented Jan 14, 2025

@tdipisa @allyoucanmap can that eventually be backported to 2024.02 ? since lots of georchestra platforms are in france and potentially use layers from data.geopf.fr, and we're just about to migrate to 2024.02, this way we'll get the bugfix upon stable branch updates in ms2-geor..

@tdipisa
Copy link
Copy Markdown
Member

tdipisa commented Jan 14, 2025

@tdipisa @allyoucanmap can that eventually be backported to 2024.02 ? since lots of georchestra platforms are in france and potentially use layers from data.geopf.fr, and we're just about to migrate to 2024.02, this way we'll get the bugfix upon stable branch updates in ms2-geor..

Hi @landryb I don't think it is a problem as it is a bug fix and also functional test is passed. You can backport, thank you.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@allyoucanmap allyoucanmap allyoucanmap approved these changes

Assignees

@landryb landryb

Labels

3D All issues related to the 3D rendering in CesiumJs bug External Contribution Internal

Projects

None yet

Milestone

2025.01.00

Development

Successfully merging this pull request may close these issues.

cesium/3d mode forces wms requests to version 1.1.1

3 participants

@landryb @tdipisa @allyoucanmap