c2cgeoportal-geoportal 2.9rc83__py3-none-any.whl → 2.9.0.352__py3-none-any.whl

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/Dockerfile

@@ -54,7 +54,7 @@ RUN \
     && mkdir --parent /usr/local/tomcat/webapps/ROOT/ \
     && mvif /tmp/config/print /tmp/config/print/print-apps /usr/local/tomcat/webapps/ROOT/ \
     && mv /tmp/config/geoportal/{{cookiecutter.package}}_geoportal/ /etc/geomapfish/ \
-    && mv /tmp/config/geoportal/* /etc/geomapfish/ || true \
+    && (mv /tmp/config/geoportal/* /etc/geomapfish/ || true) \
     && chmod g+w -R \
         /etc/geomapfish \
         /etc/mapserver \

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/Makefile

@@ -1,4 +1,4 @@
-PROJECT_PUBLIC_URL?=https://example.camptocamp.com/
+PROJECT_PUBLIC_URL?=https://localhost:8484/
 DUMP_FILE=dump.backup
 PACKAGE={{cookiecutter.package}}
 LANGUAGES=en fr de it
@@ -27,14 +27,14 @@ checks: prospector eslint ## Runs the checks
 
 .PHONY: prospector
 prospector: ## Runs the Prospector checks
-	docker compose run --entrypoint= --no-deps --rm --volume=$(CURDIR)/geoportal:/app geoportal \
+	docker compose run --entrypoint= --rm --volume=$(CURDIR)/geoportal:/app geoportal \
 		prospector --output-format=pylint --die-on-tool-error
 
 .PHONY: eslint
 eslint: ## Runs the eslint checks
-	docker compose run --entrypoint= --no-deps --rm --volume=$(CURDIR)/geoportal:/app geoportal \
+	docker compose run --entrypoint= --rm --volume=$(CURDIR)/geoportal:/app geoportal \
 		eslint $(find {{cookiecutter.package}} -type f -name '*.js' -print 2> /dev/null)
-	docker compose run --entrypoint= --no-deps --rm --volume=$(CURDIR)/geoportal:/app geoportal \
+	docker compose run --entrypoint= --rm --volume=$(CURDIR)/geoportal:/app geoportal \
 		eslint $(find {{cookiecutter.package}} -type f -name '*.ts' -print 2> /dev/null)
 
 .PHONY: qgis

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/build

@@ -149,6 +149,8 @@ def main() -> None:
             env = {"DOCKER_BUILDKIT": "1", "COMPOSE_DOCKER_CLI_BUILD": "1"}
             env.update(os.environ)
             run(args, docker_compose_build_cmd, env=env)  # nosec
+        except KeyboardInterrupt:
+            sys.exit(1)
         except subprocess.CalledProcessError as e:
             print("Error with command: " + " ".join(print_args))
             sys.exit(e.returncode)

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/ci/config.yaml

@@ -1,11 +1,4 @@
-# yaml-language-server: $schema=https://raw.githubusercontent.com/camptocamp/c2cciutils/master/c2cciutils/schema.json
-
-checks:
-  codespell: False
-  required_workflows: False
-  dependabot_config: False
-  prospector_config: False
-  setup: False
+# yaml-language-server: $schema=https://raw.githubusercontent.com/camptocamp/c2cciutils/1.7/c2cciutils/schema.json
 
 version:
   branch_to_version_re:

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/ci/requirements.txt

@@ -1,2 +1,2 @@
-c2cciutils[checks,publish]==1.7.3
-pre-commit==4.0.1
+c2cciutils[checks,publish]==1.7.5
+pre-commit==4.3.0

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose-lib.yaml

@@ -167,13 +167,13 @@ services:
       - '30'
 
   redis_master:
-    image: bitnami/redis:7.4.2
+    image: bitnami/redis:7.4
     environment:
       - REDIS_REPLICATION_MODE=master
       - ALLOW_EMPTY_PASSWORD=yes
 
   redis_slave:
-    image: bitnami/redis:7.4.2
+    image: bitnami/redis:7.4
     environment:
       - REDIS_REPLICATION_MODE=slave
       - REDIS_MASTER_HOST=redis_master
@@ -182,7 +182,7 @@ services:
       - redis_master
 
   redis_sentinel:
-    image: bitnami/redis-sentinel:7.4.2
+    image: bitnami/redis-sentinel:7.4
     environment:
       - REDIS_MASTER_HOST=redis_master
       - REDIS_MASTER_SET=mymaster
@@ -199,6 +199,8 @@ services:
       - DEVELOPMENT
       - VISIBLE_ENTRY_POINT
       - TILEGENERATION_CONFIGFILE=/etc/tilegeneration/config.yaml
+      - TILECLOUD_CHAIN_SESSION_SECRET
+      - TILECLOUD_CHAIN_SESSION_SALT
       - AWS_ACCESS_KEY_ID
       - AWS_SECRET_ACCESS_KEY
       - AZURE_STORAGE_CONNECTION_STRING
@@ -462,7 +464,7 @@ services:
     build: *geoportal-build
 
   front:
-    image: haproxy:2.6.7
+    image: haproxy:2.6
     restart: unless-stopped
     volumes:
       - ${FRONT_LOG_DIRECTORY}:/dev/log:rw
@@ -506,6 +508,8 @@ services:
       - AZURE_STORAGE_ACCESS_TOKEN
       - AZURE_STORAGE_ACCESS_KEY
       - AZURE_STORAGE_SAS_TOKEN
+    ports:
+      - 8080:8080
 
   db:
     image: camptocamp/postgres:${POSTGRES_TAG}

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/env.default

@@ -43,6 +43,9 @@ GEOPORTAL_INTERNAL_PORT=8080
 TILECLOUDCHAIN_INTERNAL_URL=http://tilecloudchain:8080
 TILECLOUDCHAIN_INTERNAL_HOST=tilecloudchain
 TILECLOUDCHAIN_INTERNAL_PORT=8080
+TILECLOUD_CHAIN_SESSION_SECRET={{cookiecutter.tilecloud_chain_session_secret}}
+TILECLOUD_CHAIN_SESSION_SALT={{cookiecutter.tilecloud_chain_session_salt}}
+
 # For internal print
 MAPSERVER_URL=http://mapserver:8080/
 TINYOWS_URL=http://tinyows:8080/

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/env.project

@@ -40,10 +40,6 @@ TILEGENERATION_SQS_QUEUE=<queue_name>
 TILEGENERATION_S3_BUCKET=<bucket_name>
 TILEGENERATION_AZURE_CONTAINER=<container_name>
 
-# Should be filed with a strong secret, with e.g. `pwgen --secure 16`
-# TILECLOUD_CHAIN_SESSION_SECRET=
-# TILECLOUD_CHAIN_SESSION_SALT=
-
 # For production
 # FRONT_INNER_PORT=80
 # FRONT_CONFIG=haproxy
@@ -69,7 +65,7 @@ C2C_AUTH_GITHUB_CLIENT_ID=210aefe26259de1e9532
 #C2C_AUTH_GITHUB_CLIENT_SECRET=<github OAuth application client secret>
 C2C_AUTH_GITHUB_SCOPE=repo
 #C2C_AUTH_GITHUB_SECRET=<secret>
-#C2C_AUTH_GITHUB_PROXY_URL=https://geoservicies.camptocamp.com/redirect
+#C2C_AUTH_GITHUB_PROXY_URL=https://geoservices.camptocamp.com/redirect
 C2C_USE_SESSION=true
 
 # For multi-tenant

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/geoportal/vars.yaml

@@ -197,6 +197,8 @@ vars:
       en: english
       de: german
       it: italian
+      # Fallback on italian for Romansh
+      rm: italian
 
   shortener:
     # Used to send a confirmation email
@@ -290,8 +292,6 @@ vars:
     #         longitudeFirst: True
     #         layers: []
     #       legend: {}
-    phantomjs:
-      disable: [apihelp]
 
   check_collector:
     hosts: []

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/project.yaml

@@ -10,6 +10,8 @@ template_vars:
   srid: {{cookiecutter.srid}}
   extent: {{cookiecutter.extent}}
   authtkt_secret: {{cookiecutter.authtkt_secret}}
+  tilecloud_chain_session_secret: {{cookiecutter.tilecloud_chain_session_secret}}
+  tilecloud_chain_session_salt: {{cookiecutter.tilecloud_chain_session_salt}}
 env:
   files:
     - env.default

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/scripts/db-backup

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright (c) 2021-2024, Camptocamp SA
+# Copyright (c) 2021-2025, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/scripts/db-restore

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright (c) 2021-2024, Camptocamp SA
+# Copyright (c) 2021-2025, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/tilegeneration/config.yaml.tmpl

@@ -39,15 +39,17 @@ defaults:
   layer: &layer
     type: wms
     grid: swissgrid_05
-    # The minimum resolution to seed, useful to use with mapcache, optional.
+    # the minimum resolution to seed, useful to use with mapcache, optional.
     # min_resolution_seed: 1
     # the URL of the WMS server to used
-    url: ${MAPSERVER_URL}
-    # Set the headers to get the right virtual host, and don't get any cached result
+    url: ${MAPSERVER_URL}/mapserv_proxy
+    # don't get any cached result
     headers:
-${DISABLE_LOCAL}      Host: '${VISIBLE_WEB_HOST}'
       Cache-Control: no-cache, no-store
       Pragma: no-cache
+    # get the right Mapfile
+    params:
+      MAP: MapServer
     # file name extension
     extension: png
     # legend file name extension

c2cgeoportal_geoportal/scaffolds/update/cookiecutter.json

@@ -5,6 +5,8 @@
   "extent": "",
   "extent_mapserver": "",
   "authtkt_secret": "",
+  "tilecloud_chain_session_secret": "",
+  "tilecloud_chain_session_salt": "",
   "unsafe_long_version": false,
   "geomapfish_version": "",
   "geomapfish_main_version": "",

c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/CONST_CHANGELOG.txt

@@ -26,12 +26,12 @@ Information to know before starting the upgrade
      See the related pull request: https://github.com/camptocamp/ngeo/pull/9470.
 
 3. For the OGC API, the MapServer configuration changes, now multi map files are supported by default and the URL in
-   the admin interface should be updated, see the OGC APT - Features documentation for more information.
+   the admin interface should be updated, see the OGC API - Features documentation for more information.
 
 Information
 ===========
 
-1. Hostname check:
+1. Hostname / Referer check:
    We add a hostname check on the `came_from` parameter, in the oauth2 login, allowed by
    `vars.authentication.allowed_hosts` and in the OGC server clear cache, allowed by `vars.admin_interface.allowed_hosts`.
    The behavior change a little bit in the `vars.shortener.allowed_hosts` and in the `vars.authorized_referers`.
@@ -65,10 +65,7 @@ Changes to apply
    be sure that you import the `gmf/controller/<interface>.scss` at the top of the file, before you
    can't use the variables.
 
-2. The environment variable TILECLOUD_CHAIN_SESSION_SECRET and TILECLOUD_CHAIN_SESSION_SALT from the file
-   `env.project` should be uncomment and filled with a strong secret, e.g. with `pwgen --secure 16`.
-
-3. Nginject migration:
+2. Nginject migration:
    the @ngInject annotation is no more used, you should pass an array in the function or use the $inject property.
    e.g. before:
    ```javascript
@@ -95,6 +92,17 @@ Changes to apply
    Controller.$inject = ['$scope', '$injector'];
    ```
 
+3. The OGC Server 'source for image/png' is renamed to 'MapServer' and
+   'source for image/jpeg' is renamed to 'MapServer_JPEG'.
+   This is done to be able to add them in the URL path, for OGC API compatibility.
+   If you use one of them in the `vars.yaml` you have to update them. Concerned variables are:
+   `main_ogc_server`, `api.ogc_server`, `tinyowsproxy.ogc_server`,
+   `interfaces_config.<interface>.routes.ngeoPermalinkOgcserverUrl.params.ogcserver`.
+
+5. Now MapServer will work in multi project mode by default, normally the Alembic migration script
+   update the MapServer OGC Server URL to `config://mapserver/mapserv_proxy/MapServer?map=MapServer`
+   to make it working for WMS/WFS and for OGC API.
+
 
 =============
 Version 2.8.0

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

@@ -351,6 +351,8 @@ mapping:
           themes: *header
           fulltextsearch: *header
           mapserver: *header
+          mapserver_ogcapi_mapserver: *header
+          mapserver_ogcapi_qgisserver: *header
           tinyows: *header
           layers: *header
           print: *header

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

@@ -310,8 +310,8 @@ vars:
           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
+          # 2 is also possible but it uses many network and can break on some mobile devices.
+          ratio: 1
 
       dynamic_constants:
         interface: interface
@@ -765,7 +765,7 @@ vars:
       - name: directedFilterAttributes
         type: list
         description: >
-          Comma-separated list of attributes names which should have rules already ready when using the
+          Comma-separated list of attribute names which should have rules already ready when using the
           filter tools.
         relevant_for:
           - layer_wms
@@ -805,6 +805,7 @@ vars:
         relevant_for:
           - layer_wmts
           - layer_cog
+          - layer_wms
       - name: printLayers
         description: >
           Comma-separated list of WMS layers used instead of the WMTS layer for printing.
@@ -842,6 +843,7 @@ vars:
           Background layer to load when this theme is selected.
         relevant_for:
           - theme
+          - role
       - name: default_theme
         single: true
         description: >
@@ -941,6 +943,9 @@ vars:
       fr: french
       en: english
       de: german
+      it: italian
+      # Fallback on italian for Romansh
+      rm: italian
 
   servers:
     internal: http://localhost/
@@ -974,8 +979,6 @@ vars:
 
   # The shortener base configuration
   shortener:
-    # The base of created URL
-    base_url: '{VISIBLE_WEB_PROTOCOL}://{VISIBLE_WEB_HOST}{VISIBLE_ENTRY_POINT}s/'
     length: 4
 
   # Define whether the MapServer proxy should hide the OGC capabilities.
@@ -1191,6 +1194,8 @@ vars:
     print: *auth_header
     fulltextsearch: *auth_header
     mapserver: *auth_header
+    mapserver_ogcapi_mapserver: *auth_header
+    mapserver_ogcapi_qgisserver: *auth_header
     tinyows: *auth_header
     layers:
       <<: *auth_header
@@ -1233,9 +1238,6 @@ vars:
             no_redirect: 'true'
           environment: *phantomjs-env
           level: 6
-        - name: apihelp
-          environment: *phantomjs-env
-          level: 6
     routes:
       disable: []
       routes:
@@ -1437,6 +1439,12 @@ runtime_postprocess:
       - headers.mapserver.access_control_max_age
       - headers.mapserver.cache_control_max_age
       - headers.mapserver.cache_control_max_age_nocache
+      - headers.mapserver_ogcapi_mapserver.access_control_max_age
+      - headers.mapserver_ogcapi_mapserver.cache_control_max_age
+      - headers.mapserver_ogcapi_mapserver.cache_control_max_age_nocache
+      - headers.mapserver_ogcapi_qgisserver.access_control_max_age
+      - headers.mapserver_ogcapi_qgisserver.cache_control_max_age
+      - headers.mapserver_ogcapi_qgisserver.cache_control_max_age_nocache
       - headers.tinyows.access_control_max_age
       - headers.tinyows.cache_control_max_age
       - headers.tinyows.cache_control_max_age_nocache

c2cgeoportal_geoportal/scripts/__init__.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

c2cgeoportal_geoportal/scripts/c2cupgrade.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2024, Camptocamp SA
+# Copyright (c) 2014-2025, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -867,7 +867,7 @@ class C2cUpgradeTool:
         print("")
         branch = check_output(["git", "rev-parse", "--abbrev-ref", "HEAD"]).decode("utf-8").strip()
         print("Now all your files are committed; you should do a git push:")
-        print(f"git push {self.options.git_remote} {branch}.")
+        print(f"git push {self.options.git_remote} {branch}")
 
 
 def check_git_status_output(args: list[str] | None = None) -> str:

c2cgeoportal_geoportal/scripts/create_demo_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

c2cgeoportal_geoportal/scripts/manage_users.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

c2cgeoportal_geoportal/scripts/pcreate.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2021-2024, Camptocamp SA
+# Copyright (c) 2021-2025, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -178,7 +178,9 @@ class PCreateCommand:
         context: dict[str, str | int] = {
             "project": project_name,
             "package": pkg_name,
-            "authtkt_secret": gen_authtkt_secret(),
+            "authtkt_secret": gen_secret(),
+            "tilecloud_chain_session_secret": "secret" if os.environ.get("CI") == "true" else gen_secret(),
+            "tilecloud_chain_session_salt": "secret" if os.environ.get("CI") == "true" else gen_secret(16),
         }
         context.update(self.read_project_file())
         if os.environ.get("CI") == "true":
@@ -287,9 +289,13 @@ class PCreateCommand:
         return None
 
 
-def gen_authtkt_secret() -> str:
-    """Generate a random authtkt secret."""
-    return subprocess.run(["pwgen", "64"], stdout=subprocess.PIPE, check=True).stdout.decode().strip()
+def gen_secret(length: int = 64) -> str:
+    """Generate a random secret."""
+    return (
+        subprocess.run(["pwgen", "--secure", str(length)], stdout=subprocess.PIPE, check=True)
+        .stdout.decode()
+        .strip()
+    )
 
 
 if __name__ == "__main__":  # pragma: no cover