c2cgeoportal-geoportal 2.9rc11__py3-none-any.whl → 2.9rc12__py3-none-any.whl

c2cgeoportal_geoportal/views/theme.py

@@ -985,18 +985,18 @@ class Theme:
         assert models.DBSession is not None
         tasks = set()
 
-        for ogc_server in models.DBSession.query(main.OGCServer).all():
+        for ogc_server, nb_layers in (
+            models.DBSession.query(
+                main.OGCServer, sqlalchemy.func.count(main.LayerWMS.id)  # pylint: disable=not-callable
+            )
+            .filter(main.LayerWMS.ogc_server_id == main.OGCServer.id)
+            .group_by(main.OGCServer.id)
+            .all()
+        ):
             # Don't load unused OGC servers, required for landing page, because the related OGC server
             # will be on error in those functions.
-            nb_layers = (
-                models.DBSession.query(
-                    sqlalchemy.func.count(main.LayerWMS.id)  # pylint: disable=not-callable
-                )
-                .filter(main.LayerWMS.ogc_server_id == ogc_server.id)
-                .one()
-            )
-            _LOG.debug("%i layers for OGC server '%s'", nb_layers[0], ogc_server.name)
-            if nb_layers[0] > 0:
+            _LOG.debug("%i layers for OGC server '%s'", nb_layers, ogc_server.name)
+            if nb_layers > 0:
                 _LOG.debug("Preload OGC server '%s'", ogc_server.name)
                 url_internal_wfs, _, _ = self.get_url_internal_wfs(ogc_server, errors)
                 if url_internal_wfs is not None:
@@ -1143,15 +1143,15 @@ class Theme:
                 _LOG.info("Do preload in %.3fs.", time.time() - start_time)
             _LOG.debug("Run garbage collection: %s", ", ".join([str(gc.collect(n)) for n in range(3)]))
             result["ogcServers"] = {}
-            for ogc_server in models.DBSession.query(main.OGCServer).all():
-                nb_layers = (
-                    models.DBSession.query(
-                        sqlalchemy.func.count(main.LayerWMS.id)  # pylint: disable=not-callable
-                    )
-                    .filter(main.LayerWMS.ogc_server_id == ogc_server.id)
-                    .one()
+            for ogc_server, nb_layers in (
+                models.DBSession.query(
+                    main.OGCServer, sqlalchemy.func.count(main.LayerWMS.id)  # pylint: disable=not-callable
                 )
-                if nb_layers[0] == 0:
+                .filter(main.LayerWMS.ogc_server_id == main.OGCServer.id)
+                .group_by(main.OGCServer.id)
+                .all()
+            ):
+                if nb_layers == 0:
                     # QGIS Server landing page requires an OGC server that can't be used here.
                     continue
 
@@ -1190,7 +1190,7 @@ class Theme:
                             if name in attributes:
                                 del attributes[name]
 
-                result["ogcServers"][ogc_server.name] = {  # type: ignore[call-overload]
+                result["ogcServers"][ogc_server.name] = {
                     "url": url.url() if url else None,
                     "urlWfs": url_wfs.url() if url_wfs else None,
                     "type": ogc_server.type,

{c2cgeoportal_geoportal-2.9rc11.dist-info → c2cgeoportal_geoportal-2.9rc12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: c2cgeoportal-geoportal
-Version: 2.9rc11
+Version: 2.9rc12
 Summary: c2cgeoportal geoportal
 Home-page: https://github.com/camptocamp/c2cgeoportal/
 Author: Camptocamp

{c2cgeoportal_geoportal-2.9rc11.dist-info → c2cgeoportal_geoportal-2.9rc12.dist-info}/RECORD

@@ -169,7 +169,7 @@ c2cgeoportal_geoportal/views/proxy.py,sha256=BCjFtnsrIQ2U30wk08YFLyt3Cq0yX3Rtwv5
 c2cgeoportal_geoportal/views/raster.py,sha256=94rMGBQ7zHTvlKewBl-18LdoYRdLjW4880XlODDvhsE,7535
 c2cgeoportal_geoportal/views/resourceproxy.py,sha256=S8PEqBpeJKsoLJlzA5lsqQoVDvh8pu5FEPh4OhJQU0Y,3183
 c2cgeoportal_geoportal/views/shortener.py,sha256=54HNEDpueIdsKIpbWuk1MDpFC2gyo01MoAXc0uMVcl8,6167
-c2cgeoportal_geoportal/views/theme.py,sha256=jVp5DWObPL4YGJRDetbzL4iBx1V-E0goag9uCEhZFvs,55966
+c2cgeoportal_geoportal/views/theme.py,sha256=aX2v3p9R9be7u4YL_avHQ7ixQKO7FRMDinxiNzY4MSA,55884
 c2cgeoportal_geoportal/views/tinyowsproxy.py,sha256=ydq3mKFd_KeQ0DG5ct59BlcIY8_2rsMAtGrAFE0407g,7916
 c2cgeoportal_geoportal/views/vector_tiles.py,sha256=t_pZ4l6JpispZFr42EodcDIwAwG2q-MX12yI03w7Y6I,3569
 tests/__init__.py,sha256=KxmbgvRWDSJoEDH1cXnDIjbfBsgCzs2KdkTPuzYMq84,3826
@@ -185,8 +185,8 @@ tests/test_mapserverproxy_route_predicate.py,sha256=SzILSSzIuilzIkUYVPZiVzLwW1du
 tests/test_raster.py,sha256=82NJ2MXgZlMqs0ytN-VgNw376iURdk4PkAg__dyh5ns,11948
 tests/test_wmstparsing.py,sha256=xjA8nJuXFl3H5Bfs4sJw_8qX8E8qvAALK7Hs2-DTP2A,9054
 tests/xmlstr.py,sha256=rkTKSU4FGjupBKLx75H8o-goB0KbQrxDvdpc6xVX_uQ,5985
-c2cgeoportal_geoportal-2.9rc11.dist-info/METADATA,sha256=eYjUQAmiBf6Ny6ETtc2qcJAX45ctlFyb5HDstOe8s24,1886
-c2cgeoportal_geoportal-2.9rc11.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-c2cgeoportal_geoportal-2.9rc11.dist-info/entry_points.txt,sha256=3dnX260FsLX_AubeNMdyeta_z1X4CxcD3steAlfPx2I,1414
-c2cgeoportal_geoportal-2.9rc11.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
-c2cgeoportal_geoportal-2.9rc11.dist-info/RECORD,,
+c2cgeoportal_geoportal-2.9rc12.dist-info/METADATA,sha256=1Y-RRG51DQAoUHiJty2Ahmx84p_Co6uVJznARQZKPQA,1886
+c2cgeoportal_geoportal-2.9rc12.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+c2cgeoportal_geoportal-2.9rc12.dist-info/entry_points.txt,sha256=3dnX260FsLX_AubeNMdyeta_z1X4CxcD3steAlfPx2I,1414
+c2cgeoportal_geoportal-2.9rc12.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
+c2cgeoportal_geoportal-2.9rc12.dist-info/RECORD,,