diff --git a/ci/dpkg-versions.yaml b/ci/dpkg-versions.yaml index 3ea9f65c5b..83f7a48331 100644 --- a/ci/dpkg-versions.yaml +++ b/ci/dpkg-versions.yaml @@ -1401,6 +1401,7 @@ camptocamp/geomapfish-qgisserver:gmflatest-qgislr: ubuntu_24_04/tar: 1.35+dfsg-3build1 ubuntu_24_04/tzdata: 2024b-0ubuntu0.24.04.1 ubuntu_24_04/ubuntu-keyring: 2023.11.28.1 + ubuntu_24_04/unminimize: 0.2.1 ubuntu_24_04/unzip: 6.0-28ubuntu4.1 ubuntu_24_04/util-linux: 2.39.3-9ubuntu6.2 ubuntu_24_04/x11-common: 1:7.7+23ubuntu3 @@ -1818,6 +1819,7 @@ camptocamp/geomapfish-qgisserver:gmflatest-qgislr-debug: ubuntu_24_04/tzdata: 2024b-0ubuntu0.24.04.1 ubuntu_24_04/ubuntu-keyring: 2023.11.28.1 ubuntu_24_04/ucf: 3.0043+nmu1 + ubuntu_24_04/unminimize: 0.2.1 ubuntu_24_04/unzip: 6.0-28ubuntu4.1 ubuntu_24_04/util-linux: 2.39.3-9ubuntu6.2 ubuntu_24_04/x11-common: 1:7.7+23ubuntu3 @@ -2227,6 +2229,7 @@ camptocamp/geomapfish-qgisserver:gmflatest-qgisltr: ubuntu_24_04/tar: 1.35+dfsg-3build1 ubuntu_24_04/tzdata: 2024b-0ubuntu0.24.04.1 ubuntu_24_04/ubuntu-keyring: 2023.11.28.1 + ubuntu_24_04/unminimize: 0.2.1 ubuntu_24_04/unzip: 6.0-28ubuntu4.1 ubuntu_24_04/util-linux: 2.39.3-9ubuntu6.2 ubuntu_24_04/x11-common: 1:7.7+23ubuntu3 @@ -2636,6 +2639,7 @@ camptocamp/geomapfish-qgisserver:gmflatest-qgismaster: ubuntu_24_04/tar: 1.35+dfsg-3build1 ubuntu_24_04/tzdata: 2024a-3ubuntu1.1 ubuntu_24_04/ubuntu-keyring: 2023.11.28.1 + ubuntu_24_04/unminimize: 0.2.1 ubuntu_24_04/unzip: 6.0-28ubuntu4.1 ubuntu_24_04/util-linux: 2.39.3-9ubuntu6.1 ubuntu_24_04/x11-common: 1:7.7+23ubuntu3 diff --git a/geoportal/c2cgeoportal_geoportal/views/theme.py b/geoportal/c2cgeoportal_geoportal/views/theme.py index 35a4aa8c16..312a1ee522 100644 --- a/geoportal/c2cgeoportal_geoportal/views/theme.py +++ b/geoportal/c2cgeoportal_geoportal/views/theme.py @@ -1,4 +1,4 @@ -# Copyright (c) 2011-2024, Camptocamp SA +# Copyright (c) 2011-2025, Camptocamp SA # All rights reserved. # Redistribution and use in source and binary forms, with or without @@ -899,6 +899,7 @@ async def _wfs_get_features_type( ) -> tuple[xml.etree.ElementTree.Element | None, set[str]]: # pylint: disable=c-extension-no-member errors = set() + wfs_url = wfs_url.clone() wfs_url.add_query( { "SERVICE": "WFS", diff --git a/geoportal/tests/functional/test_themes_ogc_server_cache_clean.py b/geoportal/tests/functional/test_themes_ogc_server_cache_clean.py index 6f75bba8e5..5f67ddd9b9 100644 --- a/geoportal/tests/functional/test_themes_ogc_server_cache_clean.py +++ b/geoportal/tests/functional/test_themes_ogc_server_cache_clean.py @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2024, Camptocamp SA +# Copyright (c) 2022-2025, Camptocamp SA # All rights reserved. # Redistribution and use in source and binary forms, with or without @@ -274,7 +274,7 @@ def test_ogc_server_cache_clean(self) -> None: "c2cgeoportal_geoportal.lib|_get_intranet_networks", } assert set(self.ogc_cache.keys()) == { - "c2cgeoportal_geoportal.views.theme|_get_features_attributes_cache|http://mapserver:8080/?SERVICE=WFS&VERSION=1.0.0&REQUEST=DescribeFeatureType&ROLE_IDS=0&USER_ID=0|__test_ogc_server", + "c2cgeoportal_geoportal.views.theme|_get_features_attributes_cache|http://mapserver:8080/|__test_ogc_server", f"c2cgeoportal_geoportal.views.theme|build_web_map_service|{ogc_server.id}", "c2cgeoportal_geoportal.views.theme|do_get_http_cached|http://mapserver:8080/?SERVICE=WFS&VERSION=1.0.0&REQUEST=DescribeFeatureType&ROLE_IDS=0&USER_ID=0", "c2cgeoportal_geoportal.views.theme|do_get_http_cached|http://mapserver:8080/?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetCapabilities&ROLE_IDS=0&USER_ID=0", @@ -314,7 +314,7 @@ def test_ogc_server_cache_clean(self) -> None: "c2cgeoportal_geoportal.lib|_get_intranet_networks", } assert set(self.ogc_cache.keys()) == { - "c2cgeoportal_geoportal.views.theme|_get_features_attributes_cache|http://mapserver:8080/?SERVICE=WFS&VERSION=1.0.0&REQUEST=DescribeFeatureType&ROLE_IDS=0&USER_ID=0|__test_ogc_server", + "c2cgeoportal_geoportal.views.theme|_get_features_attributes_cache|http://mapserver:8080/|__test_ogc_server", f"c2cgeoportal_geoportal.views.theme|build_web_map_service|{ogc_server.id}", "c2cgeoportal_geoportal.views.theme|do_get_http_cached|http://mapserver:8080/?SERVICE=WFS&VERSION=1.0.0&REQUEST=DescribeFeatureType&ROLE_IDS=0&USER_ID=0", "c2cgeoportal_geoportal.views.theme|do_get_http_cached|http://mapserver:8080/?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetCapabilities&ROLE_IDS=0&USER_ID=0",