Update submodule

qgis · Sep 30, 2024 · 046300c · 046300c
1 parent 529ae48
commit 046300c
Show file tree

Hide file tree

Showing 17 changed files with 202 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "QWC2App",
-    "version": "2024.09.24-master",
+    "version": "2024.09.30-master",
     "description": "QGIS Web Client 2 application",
     "author": "Sourcepole",
     "license": "BSD-2-Clause",

diff --git a/qwc2 b/qwc2
diff --git a/static/translations/cs-CZ.json b/static/translations/cs-CZ.json
@@ -19,6 +19,7 @@
         "LayerTree": "Vrstvy & legenda",
         "Login": "Přihlášení",
         "Logout": "Odhlášení",
+        "Map3D": "",
         "MapLegend": "Legenda",
         "Measure": "Měření",
         "MeasureLineString": "Změřit úsek",
@@ -303,6 +304,9 @@
       "loading": "Načítání...",
       "resetrotation": "Obnovit orientaci mapy"
     },
+    "map3d": {
+      "title": ""
+    },
     "mapexport": {
       "configuration": "",
       "format": "Formát:",

diff --git a/static/translations/de-CH.json b/static/translations/de-CH.json
@@ -19,6 +19,7 @@
         "LayerTree": "Ebenen und Legende",
         "Login": "Anmelden",
         "Logout": "Abmelden",
+        "Map3D": "3D Ansicht",
         "MapLegend": "Legende",
         "Measure": "Messen",
         "MeasureLineString": "Messen Linie",
@@ -303,6 +304,9 @@
       "loading": "Karte wird geladen...",
       "resetrotation": "Drehung zurücksetzen"
     },
+    "map3d": {
+      "title": "3D Ansicht"
+    },
     "mapexport": {
       "configuration": "Konfiguration",
       "format": "Format",

diff --git a/static/translations/de-DE.json b/static/translations/de-DE.json
@@ -19,6 +19,7 @@
         "LayerTree": "Ebenen und Legende",
         "Login": "Anmelden",
         "Logout": "Abmelden",
+        "Map3D": "3D Ansicht",
         "MapLegend": "Legende",
         "Measure": "Messen",
         "MeasureLineString": "Messen Linie",
@@ -303,6 +304,9 @@
       "loading": "Karte wird geladen...",
       "resetrotation": "Drehung zurücksetzen"
     },
+    "map3d": {
+      "title": "3D Ansicht"
+    },
     "mapexport": {
       "configuration": "Konfiguration",
       "format": "Format",

diff --git a/static/translations/en-US.json b/static/translations/en-US.json
@@ -19,6 +19,7 @@
         "LayerTree": "Layers & Legend",
         "Login": "Login",
         "Logout": "Logout",
+        "Map3D": "3D View",
         "MapLegend": "Legend",
         "Measure": "Measure",
         "MeasureLineString": "Measure a line",
@@ -303,6 +304,9 @@
       "loading": "Loading...",
       "resetrotation": "Reset rotation"
     },
+    "map3d": {
+      "title": "3D View"
+    },
     "mapexport": {
       "configuration": "Configuration",
       "format": "Format",

diff --git a/static/translations/es-ES.json b/static/translations/es-ES.json
@@ -19,6 +19,7 @@
         "LayerTree": "Capas & Leyenda",
         "Login": "Inicio de sesión",
         "Logout": "Cierre de sesión",
+        "Map3D": "",
         "MapLegend": "Leyenda",
         "Measure": "Medida",
         "MeasureLineString": "Medir una línea",
@@ -303,6 +304,9 @@
       "loading": "Cargando...",
       "resetrotation": "Reiniciar rotación"
     },
+    "map3d": {
+      "title": ""
+    },
     "mapexport": {
       "configuration": "",
       "format": "Formato:",

diff --git a/static/translations/fr-FR.json b/static/translations/fr-FR.json
@@ -19,6 +19,7 @@
         "LayerTree": "Couches",
         "Login": "Connexion",
         "Logout": "Déconnexion",
+        "Map3D": "Vue 3D",
         "MapLegend": "Légende",
         "Measure": "Mesurer",
         "MeasureLineString": "Mesurer une ligne",
@@ -303,6 +304,9 @@
       "loading": "Chargement de la carte...",
       "resetrotation": "Réinitialiser la rotation"
     },
+    "map3d": {
+      "title": "Vue 3D"
+    },
     "mapexport": {
       "configuration": "Configuration",
       "format": "Format",

diff --git a/static/translations/it-IT.json b/static/translations/it-IT.json
@@ -19,6 +19,7 @@
         "LayerTree": "Livelli",
         "Login": "Accedi",
         "Logout": "Disconnetti",
+        "Map3D": "Visuale 3D",
         "MapLegend": "Legenda",
         "Measure": "Misura",
         "MeasureLineString": "Misura una linea",
@@ -303,6 +304,9 @@
       "loading": "In caricamento...",
       "resetrotation": "Resetta orientamento"
     },
+    "map3d": {
+      "title": "Visuale 3D"
+    },
     "mapexport": {
       "configuration": "Configurazione",
       "format": "Formato",

diff --git a/static/translations/pl-PL.json b/static/translations/pl-PL.json
@@ -19,6 +19,7 @@
         "LayerTree": "Warstwy i ich legendy",
         "Login": "Zaloguj",
         "Logout": "Wyloguj",
+        "Map3D": "",
         "MapLegend": "",
         "Measure": "Pomiary",
         "MeasureLineString": "Zmierzyć linię",
@@ -303,6 +304,9 @@
       "loading": "Ładowanie...",
       "resetrotation": ""
     },
+    "map3d": {
+      "title": ""
+    },
     "mapexport": {
       "configuration": "",
       "format": "Format:",

diff --git a/static/translations/pt-BR.json b/static/translations/pt-BR.json
@@ -19,6 +19,7 @@
         "LayerTree": "Camadas & Legendas",
         "Login": "Inicio da sessão",
         "Logout": "Fim da sessão",
+        "Map3D": "",
         "MapLegend": "Legenda do mapa",
         "Measure": "Medir",
         "MeasureLineString": "Medir uma linha",
@@ -303,6 +304,9 @@
       "loading": "Carregar...",
       "resetrotation": "Redefinir rotação"
     },
+    "map3d": {
+      "title": ""
+    },
     "mapexport": {
       "configuration": "Configuração",
       "format": "Formato:",

diff --git a/static/translations/pt-PT.json b/static/translations/pt-PT.json
@@ -19,6 +19,7 @@
         "LayerTree": "Árvore de Camadas",
         "Login": "Iniciar Sessão",
         "Logout": "Terminar Sessão",
+        "Map3D": "",
         "MapLegend": "Legenda do Mapa",
         "Measure": "Medir",
         "MeasureLineString": "Medir Linha",
@@ -303,6 +304,9 @@
       "loading": "A carregar...",
       "resetrotation": "Redefinir Rotação"
     },
+    "map3d": {
+      "title": ""
+    },
     "mapexport": {
       "configuration": "Configuração",
       "format": "Formato:",

diff --git a/static/translations/ro-RO.json b/static/translations/ro-RO.json
@@ -19,6 +19,7 @@
         "LayerTree": "Straturi & Legendă",
         "Login": "Conectează-te",
         "Logout": "Deconectează-te",
+        "Map3D": "",
         "MapLegend": "Legenda",
         "Measure": "Măsoară",
         "MeasureLineString": "Măsoară o linie",
@@ -303,6 +304,9 @@
       "loading": "Se încarcă...",
       "resetrotation": "Resetează rotația"
     },
+    "map3d": {
+      "title": ""
+    },
     "mapexport": {
       "configuration": "",
       "format": "",

diff --git a/static/translations/ru-RU.json b/static/translations/ru-RU.json
@@ -19,6 +19,7 @@
         "LayerTree": "Слои и легенда",
         "Login": "",
         "Logout": "",
+        "Map3D": "",
         "MapLegend": "",
         "Measure": "Измерения",
         "MeasureLineString": "измерить линию",
@@ -303,6 +304,9 @@
       "loading": "Загрузка...",
       "resetrotation": ""
     },
+    "map3d": {
+      "title": ""
+    },
     "mapexport": {
       "configuration": "",
       "format": "Формат бумаги:",

diff --git a/static/translations/sv-SE.json b/static/translations/sv-SE.json
@@ -19,6 +19,7 @@
         "LayerTree": "Lager & teckenförklaring",
         "Login": "Logga in",
         "Logout": "Logga ut",
+        "Map3D": "",
         "MapLegend": "",
         "Measure": "Mät",
         "MeasureLineString": "Mäta en linje",
@@ -303,6 +304,9 @@
       "loading": "Laddar...",
       "resetrotation": ""
     },
+    "map3d": {
+      "title": ""
+    },
     "mapexport": {
       "configuration": "",
       "format": "Format:",

diff --git a/static/translations/tr-TR.json b/static/translations/tr-TR.json
@@ -19,6 +19,7 @@
         "LayerTree": "Katmanlar & Gösterim",
         "Login": "Giriş",
         "Logout": "Çıkış",
+        "Map3D": "",
         "MapLegend": "Harita Lejandı",
         "Measure": "Ölç",
         "MeasureLineString": "Çizgi Ölç",
@@ -303,6 +304,9 @@
       "loading": "Yükleniyor...",
       "resetrotation": "Dönüklüğü sıfırla"
     },
+    "map3d": {
+      "title": ""
+    },
     "mapexport": {
       "configuration": "Yapılandırma",
       "format": "Format:",
+5 −3		.github/workflows/eslint.yml
+4 −1		components/ResizeableWindow.jsx
+19 −7		components/StandardApp.jsx
+3 −1		components/map/OlMap.jsx
+0 −1		components/map/layers/MVTLayer.js
+9 −0		components/map/layers/WMTSLayer.js
+51 −0		components/map3d/BottomBar.jsx
+67 −0		components/map3d/style/BottomBar.css
+4 −4		components/widgets/ComboBox.jsx
+51 −0		icons/map3d.svg
+4 −1		package.json
+19 −14		plugins/BackgroundSwitcher.jsx
+2 −2		plugins/Bookmark.jsx
+1 −1		plugins/BottomBar.jsx
+3 −3		plugins/LayerTree.jsx
+278 −0		plugins/Map3D.jsx
+0 −1		plugins/MapTip.jsx
+1 −1		plugins/NewsPopup.jsx
+2 −2		plugins/Print.jsx
+19 −17		plugins/Reports.jsx
+2 −1		plugins/style/LayerTree.css
+33 −0		plugins/style/Map3D.css
+1 −2		reducers/windows.js
+4 −0		translations/ca-ES.json
+4 −0		translations/cs-CZ.json
+4 −0		translations/de-CH.json
+4 −0		translations/de-DE.json
+4 −0		translations/en-US.json
+4 −0		translations/es-ES.json
+4 −0		translations/fi-FI.json
+4 −0		translations/fr-FR.json
+4 −0		translations/hu-HU.json
+4 −0		translations/it-IT.json
+4 −0		translations/no-NO.json
+4 −0		translations/pl-PL.json
+4 −0		translations/pt-BR.json
+4 −0		translations/pt-PT.json
+4 −0		translations/ro-RO.json
+4 −0		translations/ru-RU.json
+4 −0		translations/sv-SE.json
+4 −0		translations/tr-TR.json
+2 −0		translations/tsconfig.json
+3 −2		utils/CoordinatesUtils.js
+4 −4		utils/ServiceLayerUtils.js