Update from base branch

From the artifact of the previous workflow run
camptocamp · Nov 2, 2024 · 2e5b43b · 2e5b43b
1 parent ccc0253
commit 2e5b43b
Show file tree

Hide file tree

Showing 13 changed files with 2,030 additions and 299 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -95,7 +95,7 @@ repos:
           )$
       - id: poetry-lock
         additional_dependencies:
-          - poetry==1.8.3 # pypi
+          - poetry==1.8.4 # pypi
         exclude: |-
           (?x)^(
             pyproject\.toml

diff --git a/.python-version b/.python-version
@@ -1 +1 @@
-3.11
+3.13
diff --git a/custom/Dockerfile b/custom/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/osgeo/gdal:ubuntu-small-3.9.2 AS base-all
+FROM ghcr.io/osgeo/gdal:ubuntu-small-3.9.3 AS base-all
 
 # Fail on error on pipe, see: https://github.com/hadolint/hadolint/wiki/DL4006.
 # Treat unset variables as an error when substituting.

diff --git a/geoportal/geomapfish_geoportal/locale/de/LC_MESSAGES/geomapfish_geoportal-client.po b/geoportal/geomapfish_geoportal/locale/de/LC_MESSAGES/geomapfish_geoportal-client.po
@@ -47,6 +47,9 @@ msgstr "Alternative Mobile Applikation"
 msgid "Area"
 msgstr "Fläche"
 
+msgid "Aster copier"
+msgstr ""
+
 msgid "BS Offizieller Stadtplan farbig 1:12'500"
 msgstr ""
 
@@ -334,6 +337,12 @@ msgstr "Abfrage"
 msgid "SRTM"
 msgstr ""
 
+msgid "SRTM copier"
+msgstr ""
+
+msgid "SRTM shadow"
+msgstr ""
+
 msgid "Selection"
 msgstr "Selektion"
 
@@ -1149,6 +1158,10 @@ msgstr "Eisenbahn"
 msgid "railways_ingrp"
 msgstr "Eisenbahn (in einer Gruppe)"
 
+#, fuzzy
+msgid "raster"
+msgstr "ASTER"
+
 msgid "recycling"
 msgstr "Sammelstelle"
 
@@ -1164,6 +1177,9 @@ msgstr "Restaurant"
 msgid "restricted"
 msgstr "Bezirk"
 
+msgid "restricted_group"
+msgstr "Begrenzte Gruppe"
+
 msgid "roads10"
 msgstr "Straßen"
 
@@ -1422,9 +1438,6 @@ msgstr ""
 #~ msgid "last_update_user"
 #~ msgstr "zuletzt aktualisierter Nutzer"
 
-#~ msgid "restricted_group"
-#~ msgstr "Begrenzte Gruppe"
-
 #, fuzzy
 #~ msgid "standard application"
 #~ msgstr "Desktop-Applikation"

diff --git a/geoportal/geomapfish_geoportal/locale/en/LC_MESSAGES/geomapfish_geoportal-client.po b/geoportal/geomapfish_geoportal/locale/en/LC_MESSAGES/geomapfish_geoportal-client.po
@@ -51,6 +51,9 @@ msgstr "Alternative Mobile Application"
 msgid "Area"
 msgstr "Area"
 
+msgid "Aster copier"
+msgstr "Aster copy"
+
 msgid "BS Offizieller Stadtplan farbig 1:12'500"
 msgstr ""
 
@@ -335,10 +338,16 @@ msgid "Query"
 msgstr "Query"
 
 msgid "SRTM"
-msgstr ""
+msgstr "SRTM"
+
+msgid "SRTM copier"
+msgstr "SRTM copy"
+
+msgid "SRTM shadow"
+msgstr "SRTM shadow"
 
 msgid "Selection"
-msgstr ""
+msgstr "Selection"
 
 msgid "Share this map"
 msgstr "Share this map"
@@ -1140,6 +1149,9 @@ msgstr "Railways"
 msgid "railways_ingrp"
 msgstr "Railways in group"
 
+msgid "raster"
+msgstr "Raster"
+
 msgid "recycling"
 msgstr "Recycling"
 
@@ -1155,6 +1167,9 @@ msgstr "Restaurant"
 msgid "restricted"
 msgstr "Restricted"
 
+msgid "restricted_group"
+msgstr "Restricted group"
+
 msgid "roads10"
 msgstr "Roads"
 
@@ -1459,9 +1474,6 @@ msgstr ""
 #~ msgid "last_update_user"
 #~ msgstr "User"
 
-#~ msgid "restricted_group"
-#~ msgstr "Restricted group"
-
 #~ msgid "standard application"
 #~ msgstr "Standard version"
 

diff --git a/geoportal/geomapfish_geoportal/locale/fr/LC_MESSAGES/geomapfish_geoportal-client.po b/geoportal/geomapfish_geoportal/locale/fr/LC_MESSAGES/geomapfish_geoportal-client.po
@@ -49,6 +49,9 @@ msgstr "Application mobile alternative"
 msgid "Area"
 msgstr "Aire"
 
+msgid "Aster copier"
+msgstr "Aster copie"
+
 msgid "BS Offizieller Stadtplan farbig 1:12'500"
 msgstr ""
 
@@ -335,6 +338,12 @@ msgstr "Interrogation"
 msgid "SRTM"
 msgstr "SRTM"
 
+msgid "SRTM copier"
+msgstr "SRTM copie"
+
+msgid "SRTM shadow"
+msgstr "SRTM ombre"
+
 msgid "Selection"
 msgstr "Sélection"
 
@@ -1140,6 +1149,9 @@ msgstr "Voies ferrées"
 msgid "railways_ingrp"
 msgstr "Voies ferrées dans groupe"
 
+msgid "raster"
+msgstr "matriciel"
+
 msgid "recycling"
 msgstr "Recyclage"
 
@@ -1155,6 +1167,9 @@ msgstr "Restaurants"
 msgid "restricted"
 msgstr "Restrain"
 
+msgid "restricted_group"
+msgstr "Restrain dans groupe"
+
 msgid "roads10"
 msgstr "Routes"
 
@@ -1469,9 +1484,6 @@ msgstr ""
 #~ msgid "last_update_user"
 #~ msgstr "User"
 
-#~ msgid "restricted_group"
-#~ msgstr "Restrain dans groupe"
-
 #~ msgid "standard application"
 #~ msgstr "Application bureau"
 

diff --git a/geoportal/geomapfish_geoportal/locale/it/LC_MESSAGES/geomapfish_geoportal-client.po b/geoportal/geomapfish_geoportal/locale/it/LC_MESSAGES/geomapfish_geoportal-client.po
@@ -53,6 +53,9 @@ msgstr ""
 msgid "Area"
 msgstr ""
 
+msgid "Aster copier"
+msgstr ""
+
 msgid "BS Offizieller Stadtplan farbig 1:12'500"
 msgstr ""
 
@@ -337,6 +340,12 @@ msgstr ""
 msgid "SRTM"
 msgstr ""
 
+msgid "SRTM copier"
+msgstr ""
+
+msgid "SRTM shadow"
+msgstr ""
+
 msgid "Selection"
 msgstr ""
 
@@ -1140,6 +1149,9 @@ msgstr ""
 msgid "railways_ingrp"
 msgstr ""
 
+msgid "raster"
+msgstr ""
+
 msgid "recycling"
 msgstr ""
 
@@ -1155,6 +1167,9 @@ msgstr ""
 msgid "restricted"
 msgstr ""
 
+msgid "restricted_group"
+msgstr ""
+
 msgid "roads10"
 msgstr ""
 

diff --git a/geoportal/geomapfish_geoportal/static/story-map.html b/geoportal/geomapfish_geoportal/static/story-map.html
@@ -16,13 +16,13 @@
 
     <script
       crossorigin="anonymous"
-      integrity="sha384-vP/z9aans6YI3BbsSTDsd8QAz2AZgddRu3zU/QGw/ojfZD6wMQdwgD8A0g81Cl5B"
+      integrity="sha384-Tst5eZUUqKjNJxc1yyYT4riv8EBy46MR+9CC1y/hg09jlJiNTdqWVPb3ojWK09g4"
       referrerpolicy="no-referrer"
-      src="https://cdn.jsdelivr.net/npm/ol-ext@4.0.23/dist/ol-ext.min.js"
+      src="https://cdn.jsdelivr.net/npm/ol-ext@4.0.24/dist/ol-ext.min.js"
     ></script>
     <link
       crossorigin="anonymous"
-      href="https://cdn.jsdelivr.net/npm/ol-ext@4.0.23/dist/ol-ext.min.css"
+      href="https://cdn.jsdelivr.net/npm/ol-ext@4.0.24/dist/ol-ext.min.css"
       integrity="sha384-Whi7nF+7F+e1FpzL960zlMNB4nMpn7JRdxDRJuedzooO5XZbg+cN+Rp1kTq6nexh"
       referrerpolicy="no-referrer"
       rel="stylesheet"

diff --git a/ui/desktop.html b/ui/desktop.html
@@ -535,9 +535,9 @@
     ></script>
     <script
       crossorigin="anonymous"
-      integrity="sha384-0pUGZvbkm6XF6gxjEnlmuGrJXVbNuzT9qBBavbLwCsOGabYfZo0T0to5eqruptLy"
+      integrity="sha384-+sLIOodYLS7CIrQpBjl+C7nPvqq+FbNUBDunl/OZv93DB7Ln/533i8e/mZXLi/P+"
       referrerpolicy="no-referrer"
-      src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.min.js"
+      src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/js/bootstrap.min.js"
     ></script>
   </body>
 </html>
diff --git a/ui/iframe_api.html b/ui/iframe_api.html
@@ -191,9 +191,9 @@
     ></script>
     <script
       crossorigin="anonymous"
-      integrity="sha384-0pUGZvbkm6XF6gxjEnlmuGrJXVbNuzT9qBBavbLwCsOGabYfZo0T0to5eqruptLy"
+      integrity="sha384-+sLIOodYLS7CIrQpBjl+C7nPvqq+FbNUBDunl/OZv93DB7Ln/533i8e/mZXLi/P+"
       referrerpolicy="no-referrer"
-      src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.min.js"
+      src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/js/bootstrap.min.js"
     ></script>
   </body>
 </html>
diff --git a/ui/mobile.html b/ui/mobile.html
@@ -365,9 +365,9 @@
     ></script>
     <script
       crossorigin="anonymous"
-      integrity="sha384-0pUGZvbkm6XF6gxjEnlmuGrJXVbNuzT9qBBavbLwCsOGabYfZo0T0to5eqruptLy"
+      integrity="sha384-+sLIOodYLS7CIrQpBjl+C7nPvqq+FbNUBDunl/OZv93DB7Ln/533i8e/mZXLi/P+"
       referrerpolicy="no-referrer"
-      src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.min.js"
+      src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/js/bootstrap.min.js"
     ></script>
   </body>
 </html>