c2cgeoportal-geoportal 2.9rc28__py3-none-any.whl → 2.9rc30__py3-none-any.whl

c2cgeoportal_geoportal/lib/cacheversion.py

@@ -66,9 +66,11 @@ class CachebusterTween:
         self.cache_path = registry.settings["cache_path"]
 
     def __call__(self, request: pyramid.request.Request) -> pyramid.response.Response:
-        path = request.path_info.split("/")
+        path = request.path_info.split("/", 3)
         if len(path) > 1 and path[1] in self.cache_path:
-            # remove the cache buster
+            if len(path) == 2:
+                raise pyramid.httpexceptions.HTTPNotFound()
+            # Remove the cache buster
             path.pop(2)
             request.path_info = "/".join(path)
 

c2cgeoportal_geoportal/scripts/pcreate.py

@@ -26,7 +26,6 @@
 # either expressed or implied, of the FreeBSD Project.
 
 
-import json
 import os
 import re
 import subprocess
@@ -35,7 +34,7 @@ from argparse import ArgumentParser
 from typing import Any, Union, cast
 
 import pkg_resources
-import requests
+import pyproj
 import yaml
 from cookiecutter.log import configure_logger
 from cookiecutter.main import cookiecutter
@@ -277,31 +276,14 @@ class PCreateCommand:
     @staticmethod
     def epsg2bbox(srid: int) -> list[str] | None:
         try:
-            r = requests.get(f"https://epsg.io/?format=json&q={srid}", timeout=60)
-            bbox = r.json()["results"][0]["bbox"]
-            r = requests.get(
-                "https://epsg.io/trans?s_srs=4326&t_srs={srid}&data={bbox[1]},{bbox[0]}".format(
-                    srid=srid, bbox=bbox
-                ),
-                timeout=60,
-            )
-            r1 = r.json()[0]
-            r = requests.get(
-                "https://epsg.io/trans?s_srs=4326&t_srs={srid}&data={bbox[3]},{bbox[2]}".format(
-                    srid=srid, bbox=bbox
-                ),
-                timeout=60,
-            )
-            r2 = r.json()[0]
-            return [r1["x"], r2["y"], r2["x"], r1["y"]]
-        except requests.RequestException:
-            print("Failed to establish a connection to epsg.io.")
-        except json.JSONDecodeError:
-            print("epsg.io doesn't return a correct json.")
-        except IndexError:
-            print("Unable to get the bbox")
+            crs = pyproj.CRS.from_epsg(srid)
+            assert crs.area_of_use is not None
+            transformer = pyproj.Transformer.from_crs(4326, crs)
+            c1 = transformer.transform(crs.area_of_use.bounds[1], crs.area_of_use.bounds[0])
+            c2 = transformer.transform(crs.area_of_use.bounds[3], crs.area_of_use.bounds[2])
+            return [c1[0], c1[1], c2[0], c2[1]]
         except Exception as exception:  # pylint: disable=broad-exception-caught
-            print(f"unexpected error: {str(exception)}")
+            print(f"Unexpected error: {str(exception)}")
         return None
 
 

{c2cgeoportal_geoportal-2.9rc28.dist-info → c2cgeoportal_geoportal-2.9rc30.dist-info}/METADATA

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

{c2cgeoportal_geoportal-2.9rc28.dist-info → c2cgeoportal_geoportal-2.9rc30.dist-info}/RECORD

@@ -4,7 +4,7 @@ c2cgeoportal_geoportal/resources.py,sha256=n42Gns8DKw32GstDoUdNgud6xdAidaRwgAuNH
 c2cgeoportal_geoportal/lib/__init__.py,sha256=_67fO_aXQZRnxPXcShHBcs38mdYU5ch0FNX89RwMTgA,10431
 c2cgeoportal_geoportal/lib/authentication.py,sha256=Bfws50nNiboVa2qm3Hdy_-38tygnlB8sX5AW9Zfikw0,9833
 c2cgeoportal_geoportal/lib/bashcolor.py,sha256=LQgOgtFUvgJ4Ed3-YW3RPjvhBMZBbXBBkUZKE4unRCI,1889
-c2cgeoportal_geoportal/lib/cacheversion.py,sha256=8ETNA02fh7AX39pNAkDrEJsCmPXVzYRShjTzJHoAJL0,2946
+c2cgeoportal_geoportal/lib/cacheversion.py,sha256=jc8jIKH_yE1NReC2kvUkTkpGERHObdWjPp6kGCWAU1o,3040
 c2cgeoportal_geoportal/lib/caching.py,sha256=BZzIjgEUfv7puP8XvWY6PAni7HybcLMZrGam3D3mCyA,7124
 c2cgeoportal_geoportal/lib/check_collector.py,sha256=98N43jvjzCOh19Agipf8varCD9S9I9V8XYQcrSujv0k,3396
 c2cgeoportal_geoportal/lib/checker.py,sha256=QLe0SUzfSwKYQFpGgFecWkJJlVjA1O2phwf-FvQQOUc,12547
@@ -144,7 +144,7 @@ c2cgeoportal_geoportal/scripts/__init__.py,sha256=hHwjhQaM_T2EaupeFIyjl0N67Bcl3M
 c2cgeoportal_geoportal/scripts/c2cupgrade.py,sha256=7smnq2yxs1hAF1CiyE9WfgAqNKjjtrtHevY321i-wio,36826
 c2cgeoportal_geoportal/scripts/create_demo_theme.py,sha256=-SL-fvAPjgiJZEKYcbhXsZm713txhtWQB18X231k6xQ,3263
 c2cgeoportal_geoportal/scripts/manage_users.py,sha256=Ih3X_V_xUw59Ums4a1x6qQQtz9VtE7PaxAj-tiZIOPg,5586
-c2cgeoportal_geoportal/scripts/pcreate.py,sha256=1zy-khluuf2gnqA_hJAFy6HFBxDdrqf-__iSZx4R9rs,11588
+c2cgeoportal_geoportal/scripts/pcreate.py,sha256=AcBIGBQJCvr5fch6HbseKuOCBEpuwr_3w6uokuREZJM,10984
 c2cgeoportal_geoportal/scripts/theme2fts.py,sha256=Tx1jUfDUwNtwZ5TCyfpldZIbIkzZiQ3dq-kv_YQ9yFE,13737
 c2cgeoportal_geoportal/scripts/urllogin.py,sha256=qGOOvx2ZN3qnENGzo8NScRqfFC06l1yc48vU6Qx3MBo,3319
 c2cgeoportal_geoportal/templates/login.html,sha256=Jy8CUw2KrSviePknsvWJLDqCUXam-vPhnMUv7UcD4Pc,2475
@@ -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.9rc28.dist-info/METADATA,sha256=Sm57rHnvZ1swZ8nMjFcXIp1KIZHiEWlzWCb3SdnxPb4,1886
-c2cgeoportal_geoportal-2.9rc28.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-c2cgeoportal_geoportal-2.9rc28.dist-info/entry_points.txt,sha256=3dnX260FsLX_AubeNMdyeta_z1X4CxcD3steAlfPx2I,1414
-c2cgeoportal_geoportal-2.9rc28.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
-c2cgeoportal_geoportal-2.9rc28.dist-info/RECORD,,
+c2cgeoportal_geoportal-2.9rc30.dist-info/METADATA,sha256=KoadPR3OC7_t1NyggMrZqRHPlpfldpIMCvYRxYOGuRk,1886
+c2cgeoportal_geoportal-2.9rc30.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+c2cgeoportal_geoportal-2.9rc30.dist-info/entry_points.txt,sha256=3dnX260FsLX_AubeNMdyeta_z1X4CxcD3steAlfPx2I,1414
+c2cgeoportal_geoportal-2.9rc30.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
+c2cgeoportal_geoportal-2.9rc30.dist-info/RECORD,,