PyPI - c2cgeoportal-geoportal - Versions diffs - 2.7.1.156__py2.py3-none-any.whl → 2.8.1.87__py2.py3-none-any.whl - Mend

c2cgeoportal-geoportal 2.7.1.156py2.py3-none-any.whl → 2.8.1.87py2.py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (101) hide show

c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/CONST_create_template/tests/test_testapp.py ADDED Viewed

@@ -0,0 +1,48 @@
+# This file should be used only on the test project in the c2cgeoportal CI
+import re
+import polib
+import pytest
+import requests
+@pytest.mark.parametrize("test_number", [0, 1])
+def test_po(test_number: int) -> None:
+    """Tests that the generated pot files are identical between the command line and the view."""
+    del test_number
+    response = requests.get("https://front/locale.pot", verify=False, timeout=30)  # nosec
+    assert response.status_code == 200, response.text
+    response_keys = {e.msgid for e in polib.pofile(response.text)}
+    with open(
+        "geoportal/{{cookiecutter.package}}_geoportal/locale/{{cookiecutter.package}}_geoportal-client.pot",
+        encoding="utf-8",
+    ) as current_file:
+        current_content = current_file.read()
+        current_content_keys = {e.msgid for e in polib.pofile(current_content)}
+    if response_keys != current_content_keys:
+        assert response.text == current_content
+@pytest.mark.parametrize("url", ["https://front/desktop_alt"])
+def test_desktop_alt(url: str) -> None:
+    """Tests the desktop alt page."""
+    response = requests.get(url, verify=False, timeout=30)  # nosec
+    assert response.status_code == 200, response.text
+    assert re.search(
+        r'<script src="https://front/static-ngeo-dist/desktop\..*\.js" crossorigin="anonymous"></script>',
+        response.text,
+    ), response.text
+    assert re.search(r'<html lang="{{"{{mainCtrl.lang}}"}}" ', response.text), response.text
+def test_enum() -> None:
+    """Test the enumerations view"""
+    response = requests.get("https://front/layers/test/values/type", verify=False, timeout=30)  # nosec
+    assert response.status_code == 200, response.text
+    assert response.json() == {"items": [{"value": "car"}, {"value": "train"}]}, response.text

c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/geoportal/CONST_config-schema.yaml CHANGED Viewed

@@ -44,6 +44,8 @@ mapping:
       package:
         type: str
         required: True
+      main_ogc_server:
+        type: str
       enable_admin_interface:
         type: scalar
         required: True
@@ -123,7 +125,7 @@ mapping:
         required: True
         type: map
         mapping:
-          regex;.+:
+          regex;(.+):
             type: map
             mapping:
               extends:
@@ -131,17 +133,17 @@ mapping:
               constants:
                 type: map
                 mapping:
-                  regex;.+:
+                  regex;(.+):
                     type: any
               dynamic_constants:
                 type: map
                 mapping:
-                  regex;.+:
+                  regex;(.+):
                     type: str
               routes:
                 type: map
                 mapping:
-                  regex;.+:
+                  regex;(.+):
                     type: map
                     mapping:
                       name:
@@ -155,22 +157,22 @@ mapping:
                       kw:
                         type: map
                         mapping:
-                          regex;.+:
+                          regex;(.+):
                             type: str
                       params:
                         type: map
                         mapping:
-                          regex;.+:
+                          regex;(.+):
                             type: text
                       dynamic_params:
                         type: map
                         mapping:
-                          regex;.+:
+                          regex;(.+):
                             type: str
               static:
                 type: map
                 mapping:
-                  regex;.+:
+                  regex;(.+):
                     type: map
                     mapping:
                       name:
@@ -227,7 +229,7 @@ mapping:
                 type: map
                 required: True
                 mapping:
-                  regex;.+:
+                  regex;(.+):
                     type: str
       headers:
         type: map
@@ -253,7 +255,7 @@ mapping:
               headers:
                 type: map
                 mapping:
-                  regex;.+:
+                  regex;(.+):
                     type: str
           index: *header
           dynamic: *header
@@ -283,7 +285,7 @@ mapping:
         type: map
         required: True
         mapping:
-          regex;.+:
+          regex;(.+):
             type: map
             mapping:
               backend:
@@ -292,7 +294,7 @@ mapping:
               arguments:
                 type: map
                 mapping:
-                  regex;.+:
+                  regex;(.+):
                     type: any
       admin_interface:
         type: map
@@ -308,7 +310,7 @@ mapping:
                 sequence:
                   - type: map
                     mapping:
-                      regex;.+:
+                      regex;(.+):
                         type: any
               fitSource:
                 type: bool
@@ -344,7 +346,7 @@ mapping:
                     type: str
                   zoom:
                     type: int
-                  regex;.+:
+                  regex;(.+):
                     type: any
           available_metadata:
             type: seq
@@ -417,7 +419,7 @@ mapping:
             required: True
           map:
             <<: *map_config
-          regex;.+:
+          regex;(.+):
             type: any
       layers:

c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/geoportal/CONST_vars.yaml CHANGED Viewed

@@ -51,6 +51,7 @@ vars:
     ns:
       - geomapfish
     defaultNS: geomapfish
+    keySeparator: false
     debug: false
     detection:
       order:
@@ -210,7 +211,7 @@ vars:
         gmfBackgroundLayerSelectorOptions: {}
         defaultTheme: Demo
         defaultLang: en
-        gmfOptions:
+        gmfOptions: &gmfOptions
           map: {}
           view:
             srid: '{srid}'
@@ -219,6 +220,7 @@ vars:
             resolutions: [250, 100, 50, 20, 10, 5, 2, 1, 0.5, 0.25, 0.1, 0.05]
             extent: [2420000, 1030000, 2900000, 1350000]
             constrainRotation: false
+            constrainResolution: true
         gmfSearchOptions:
           styles:
             default:
@@ -297,6 +299,11 @@ vars:
               width: 2
           zoom:
           autoRotate: False
+        gmfWMSSourceOptions:
+          # The default value is 1.5 but it add a slight blur on the layer,
+          # 1 is also possible but the application will do a getMap on all the pan.
+          ratio: 2
       dynamic_constants:
         interface: interface
         cacheVersion: cache_version
@@ -343,6 +350,7 @@ vars:
       redirect_interface: mobile
       do_redirect: True
       constants:
+        gmfOptions: *gmfOptions
         ngeoProfileOptions: {}
         ngeoStreetviewOptions:
           viewer: 'mapillary'
@@ -363,7 +371,9 @@ vars:
                 LAYERFONTSIZE: '10'
                 ITEMFONTSIZE: '8'
           hiddenAttributes:
+            - debug
             - timezone
+            - username
         gmfDisplayQueryGridOptions:
           featuresStyle: *featureStyle
           selectedFeatureStyle: *selectedFeatureStyle
@@ -392,15 +402,20 @@ vars:
                 radius: 3
         gmfShareOptions:
           enableEmail: True
+        gmfFitOptions:
+          # Padding (in pixels) to be correctly fitted inside the view. Values in the array are top, right, bottom and left padding.
+          padding: [50, 10, 50, 50]
       routes:
         gmfProfileJsonUrl:
           name: profile.json
         gmfPrintUrl:
           name: printproxy
     mobile:
       extends: default
       redirect_interface: desktop
       constants:
+        gmfOptions: *gmfOptions
         gmfMobileMeasureAreaOptions:
           precision: 2
           sketchStyle: &mobileMeasureStyle
@@ -440,10 +455,19 @@ vars:
               radius: 8
               radius2: 0
               angle: 0
+        gmfFitOptions:
+          # Padding (in pixels) to be correctly fitted inside the view. Values in the array are top, right, bottom and left padding.
+          padding: [60, 60, 42, 10]
     iframe_api:
       extends: default
       constants:
+        gmfOptions: *gmfOptions
         gmfSearchGroups: []
+        gmfFitOptions:
+          # Padding (in pixels) to be correctly fitted inside the view. Values in the array are top, right, bottom and left padding.
+          padding: [20, 20, 20, 20]
     api:
       constants:
         projections: *projections
@@ -469,15 +493,19 @@ vars:
   cache:
     std:
       backend: c2cgeoportal.hybridsentinel
-      arguments:
+      arguments: &redis-cache-arguments
         lock_timeout: '{REDIS_LOCK_TIMEOUT}' # seconds
         redis_expiration_time: '{REDIS_EXPIRATION_TIME}' # seconds
         distributed_lock: True
+        thread_local_lock: False
         service_name: '{REDIS_SERVICENAME}'
         socket_timeout: '{REDIS_TIMEOUT}' # seconds
         db: 0
     obj:
       backend: dogpile.cache.memory
+    ogc-server:
+      backend: c2cgeoportal.hybridsentinel
+      arguments: *redis-cache-arguments
   admin_interface:
     layer_tree_max_nodes: 1000
@@ -493,6 +521,18 @@ vars:
           tree item will match when searching for the search aliases.
         relevant_for:
           - treeitem
+      - name: searchLabelPattern
+        description: >
+          Template string for the label of tree items in the search results, for example: "{name} ({theme})"
+          Supported parameters:
+          <ul>
+              <li>name (name of the tree item)</li>
+              <li>parent (parent of the item, may be a group, a block or a theme)</li>
+              <li>block (name of the block to which the item belongs)</li>
+              <li>theme (name of the theme to which the item belongs)</li>
+          </ul>
+        relevant_for:
+          - treeitem
       # Layers group
       - name: exclusiveGroup
         type: boolean
@@ -935,6 +975,7 @@ vars:
   content_security_policy_main_script_src: "
     'self'
     'unsafe-inline'
+    https://cdn.polyfill.io/
     {content_security_policy_main_script_src_extra}"
   content_security_policy_main_style_src: "
     'self'
@@ -987,6 +1028,7 @@ vars:
     'self'
     'unsafe-inline'
     'unsafe-eval'
+    https://cdn.polyfill.io/
     {content_security_policy_apihelp_script_src_extra}"
   content_security_policy_apihelp_style_src: "
     'self'
@@ -1313,6 +1355,10 @@ runtime_postprocess:
       - cache.std.arguments.redis_expiration_time
       - cache.std.arguments.socket_timeout
       - cache.std.arguments.db
+      - cache.ogc-server.arguments.lock_timeout
+      - cache.ogc-server.arguments.redis_expiration_time
+      - cache.ogc-server.arguments.socket_timeout
+      - cache.ogc-server.arguments.db
       - sqlalchemy\.pool_recycle
       - sqlalchemy\.pool_size
       - sqlalchemy\.max_overflow

c2cgeoportal_geoportal/scripts/__init__.py CHANGED Viewed

@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2024, Camptocamp SA
+# Copyright (c) 2011-2023, Camptocamp SA
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
@@ -38,14 +38,12 @@ from sqlalchemy import engine_from_config
 from sqlalchemy.orm import Session, configure_mappers, sessionmaker
-def fill_arguments(parser: ArgumentParser, use_attribute: bool = False) -> None:
+def fill_arguments(parser: ArgumentParser) -> None:
     """Fill the command line argument description."""
     default_config_uri = (
         "c2c://development.ini" if os.path.isfile("development.ini") else "c2c://geoportal/development.ini"
     )
-    c2cwsgiutils.setup_process.fill_arguments(
-        parser, default_config_uri=default_config_uri, use_attribute=use_attribute
-    )
+    c2cwsgiutils.setup_process.fill_arguments(parser, default_config_uri=default_config_uri)
 def get_appsettings(options: Namespace) -> pyramid.config.Configurator:

c2cgeoportal_geoportal/scripts/c2cupgrade.py CHANGED Viewed

@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2021, Camptocamp SA
+# Copyright (c) 2014-2023, Camptocamp SA
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
@@ -247,7 +247,6 @@ class C2cUpgradeTool:
         except ConnectionRefusedError as exception:
             return False, "\n".join([f"Connection refused: {exception}", run_curl])
         if resp.status_code < 200 or resp.status_code >= 300:
             print(colorize("=============", Color.RED))
             print(colorize("Checker error", Color.RED))
             try:

c2cgeoportal_geoportal/scripts/pcreate.py CHANGED Viewed

@@ -1,4 +1,4 @@
-# Copyright (c) 2021-2024, Camptocamp SA
+# Copyright (c) 2021-2023, Camptocamp SA
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
@@ -183,9 +183,9 @@ class PCreateCommand:
         }
         context.update(self.read_project_file())
         if os.environ.get("CI") == "true":
-            context["authtkt_secret"] = (  # nosec
-                "io7heoDui8xaikie1rushaeGeiph8Bequei6ohchaequob6viejei0xooWeuvohf"
-            )
+            context[  # nosec
+                "authtkt_secret"
+            ] = "io7heoDui8xaikie1rushaeGeiph8Bequei6ohchaequob6viejei0xooWeuvohf"
         self.get_var(context, "srid", "Spatial Reference System Identifier (e.g. 2056): ", int)
         srid = cast(int, context["srid"])
@@ -193,12 +193,10 @@ class PCreateCommand:
         self.get_var(
             context,
             "extent",
-            (
-                f"Extent (minx miny maxx maxy): in EPSG: {srid} projection, default is "
-                f"[{extent[0]} {extent[1]} {extent[2]} {extent[3]}]: "
-                if extent
-                else f"Extent (minx miny maxx maxy): in EPSG: {srid} projection: "
-            ),
+            f"Extent (minx miny maxx maxy): in EPSG: {srid} projection, default is "
+            f"[{extent[0]} {extent[1]} {extent[2]} {extent[3]}]: "
+            if extent
+            else f"Extent (minx miny maxx maxy): in EPSG: {srid} projection: ",
         )
         match = re.match(
             r"([\d.]+)[,; ] *([\d.]+)[,; ] *([\d.]+)[,; ] *([\d.]+)",

c2cgeoportal_geoportal/scripts/theme2fts.py CHANGED Viewed

@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2021, Camptocamp SA
+# Copyright (c) 2014-2023, Camptocamp SA
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
@@ -30,7 +30,7 @@ import gettext
 import os
 import sys
 from argparse import ArgumentParser, Namespace
-from typing import TYPE_CHECKING, Any, Dict, List, Optional, Set
+from typing import TYPE_CHECKING, Any, Dict, Iterator, List, Optional, Set
 import pyramid.config
 import transaction
@@ -190,7 +190,7 @@ class Import:
             self.imported.add(key)
             for lang in self.languages:
                 fts = FullTextSearch()
-                fts.label = self._[lang].gettext(item.name)
+                fts.label = self._render_label(item, lang)
                 fts.role = role
                 fts.interface = interface
                 fts.lang = lang
@@ -289,3 +289,58 @@ class Import:
             self._add_fts(layer, interface, "add_layer", role)
         return fill
+    def _render_label(
+        self,
+        item: "c2cgeoportal_commons.models.main.TreeItem",
+        lang: str,
+    ) -> str:
+        patterns = item.get_metadata("searchLabelPattern")
+        if not patterns:
+            return self._[lang].gettext(item.name)
+        pattern = patterns[0]
+        assert isinstance(pattern.value, str)
+        tree_paths = list(self._get_paths(item))
+        # Remove paths where the last element isn't a theme
+        tree_paths = [p for p in tree_paths if p[-1].item_type == "theme"]
+        result = None
+        current_result = None
+        if tree_paths:
+            for path in tree_paths:
+                if len(path) == 2:
+                    current_result = pattern.value.format(
+                        name=self._[lang].gettext(item.name),
+                        theme=self._[lang].gettext(path[-1].name),
+                        parent=self._[lang].gettext(path[1].name),
+                    )
+                elif len(path) > 2:
+                    current_result = pattern.value.format(
+                        name=self._[lang].gettext(item.name),
+                        theme=self._[lang].gettext(path[-1].name),
+                        parent=self._[lang].gettext(path[1].name),
+                        block=self._[lang].gettext(path[-2].name),
+                    )
+                if result and current_result != result:
+                    sys.stderr.write(
+                        f"WARNING: the item {item.name} (id: {item.id}) has a label pattern and inconsistent "
+                        f"multiple parents\n"
+                    )
+                    return self._[lang].gettext(item.name)
+                result = current_result
+        return result or pattern.value.format(
+            name=self._[lang].gettext(item.name),
+            theme=self._[lang].gettext(item.name),
+        )
+    def _get_paths(
+        self,
+        item: "c2cgeoportal_commons.models.main.TreeItem",
+    ) -> Iterator[List["c2cgeoportal_commons.models.main.TreeItem"]]:
+        if item is None:
+            return
+        if any(item.parents):
+            for parent in item.parents:
+                for path in self._get_paths(parent):
+                    yield [item, *path]
+        else:
+            yield [item]

c2cgeoportal_geoportal/scripts/urllogin.py CHANGED Viewed

@@ -1,4 +1,4 @@
-# Copyright (c) 2012-2024, Camptocamp SA
+# Copyright (c) 2012-2023, Camptocamp SA
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
@@ -58,7 +58,7 @@ def get_argparser() -> argparse.ArgumentParser:
     """Get the argument parser for this script."""
     parser = argparse.ArgumentParser(description="Generate an auth token")
-    fill_arguments(parser, use_attribute=True)
+    fill_arguments(parser)
     parser.add_argument("user", help="The username")
     parser.add_argument("password", help="The password")
     parser.add_argument("valid", type=int, default=1, nargs="?", help="Is valid for, in days")

c2cgeoportal_geoportal/views/__init__.py CHANGED Viewed

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2011-2021, Camptocamp SA
+# Copyright (c) 2011-2023, Camptocamp SA
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without

c2cgeoportal_geoportal/views/dynamic.py CHANGED Viewed

@@ -1,4 +1,4 @@
-# Copyright (c) 2018-2025, Camptocamp SA
+# Copyright (c) 2018-2023, Camptocamp SA
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
@@ -56,7 +56,7 @@ class DynamicView:
         return cast(Dict[str, Any], self.interfaces_config.get(interface, {}).get(value, {}))
     @CACHE_REGION.cache_on_arguments()  # type: ignore
-    def _fulltextsearch_groups(self) -> List[str]:  # pylint: disable=no-self-use
+    def _fulltextsearch_groups(self) -> List[str]:
         return [
             group[0]
             for group in models.DBSession.query(func.distinct(main.FullTextSearch.layer_name))
@@ -121,7 +121,6 @@ class DynamicView:
     @view_config(route_name="dynamic", renderer="json")  # type: ignore
     def dynamic(self) -> Dict[str, Any]:
-        self.request.response.headers["Vary"] = "Host"
         original_interface_name = self.request.params.get("interface")
         interface_name = self.request.get_organization_interface(original_interface_name)

c2cgeoportal_geoportal/views/entry.py CHANGED Viewed

@@ -28,7 +28,6 @@
 import glob
 import logging
-import os
 from typing import Any, Dict, List, Optional
 import pyramid.request
@@ -57,7 +56,7 @@ class Entry:
     def get_ngeo_index_vars(self) -> Dict[str, Any]:
         set_common_headers(self.request, "index", Cache.PUBLIC_NO, content_type="text/html")
         # Force urllogin to be converted to cookie when requesting the main HTML page
-        self.request.user  # noqa
+        self.request.user  # pylint: disable=pointless-statement
         return {}
     @staticmethod
@@ -105,14 +104,7 @@ class Entry:
 def _get_ngeo_resources(pattern: str) -> List[str]:
     """Return the list of ngeo dist files matching the pattern."""
-    results = glob.glob(f"/opt/c2cgeoportal/geoportal/node_modules/ngeo/dist/{pattern}")
-    if not results:
-        LOG.error(
-            "No file found for pattern %s, in: [%s]",
-            pattern,
-            ", ".join(os.listdir("/opt/c2cgeoportal/geoportal/node_modules/ngeo/dist/")),
-        )
-    return results
+    return glob.glob(f"/opt/c2cgeoportal/geoportal/node_modules/ngeo/dist/{pattern}")
 def canvas_view(request: pyramid.request.Request, interface_config: Dict[str, Any]) -> Dict[str, Any]:

c2cgeoportal_geoportal/views/fulltextsearch.py CHANGED Viewed

@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2021, Camptocamp SA
+# Copyright (c) 2011-2023, Camptocamp SA
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without

c2cgeoportal_geoportal/views/geometry_processing.py CHANGED Viewed

@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2021, Camptocamp SA
+# Copyright (c) 2011-2023, Camptocamp SA
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
@@ -33,7 +33,7 @@ from geoalchemy2.shape import from_shape, to_shape
 from geojson import loads
 from pyramid.httpexceptions import HTTPBadRequest
 from pyramid.view import view_config
-from shapely.geometry import asShape
+from shapely.geometry import shape
 from shapely.geometry.base import BaseGeometry
 from sqlalchemy import func
@@ -69,7 +69,7 @@ class GeometryProcessing:
         return to_shape(
             DBSession.query(
                 func.ST_Difference(
-                    from_shape(asShape(body["geometries"][0])), from_shape(asShape(body["geometries"][1]))
+                    from_shape(shape(body["geometries"][0])), from_shape(shape(body["geometries"][1]))
                 )
             ).scalar()
         )

c2cgeoportal-geoportal 2.7.1.156__py2.py3-none-any.whl → 2.8.1.87__py2.py3-none-any.whl

c2cgeoportal-geoportal 2.7.1.156py2.py3-none-any.whl → 2.8.1.87py2.py3-none-any.whl