diff --git a/package.json b/package.json
index 0852f7e89..22ee644f0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "QWC2App",
-    "version": "2024.12.20-master",
+    "version": "2025.01.06-master",
     "description": "QGIS Web Client 2 application",
     "author": "Sourcepole",
     "license": "BSD-2-Clause",
diff --git a/qwc2 b/qwc2
index 0c7ed89f1..6d3240a8c 160000
--- a/qwc2
+++ b/qwc2
@@ -1 +1 @@
-Subproject commit 0c7ed89f15e424e27b49bc939ae966d005140711
+Subproject commit 6d3240a8c6ebac9283fdbfb0f07867990f5cffd2
diff --git a/static/translations/cs-CZ.json b/static/translations/cs-CZ.json
index cb3b093cc..fcd06977b 100644
--- a/static/translations/cs-CZ.json
+++ b/static/translations/cs-CZ.json
@@ -29,6 +29,7 @@
         "Logout": "Odhlášení",
         "MapLegend": "Legenda",
         "Measure": "Měření",
+        "Measure3D": "",
         "MeasureLineString": "Změřit úsek",
         "MeasurePolygon": "Měřit mnohoúhelník",
         "Portal": "",
@@ -340,8 +341,10 @@
       "windowtitle": "Legenda"
     },
     "measureComponent": {
+      "absolute": "",
       "areaLabel": "Plocha",
       "bearingLabel": "Střed",
+      "ground": "",
       "imperial": "Imperiálně",
       "lengthLabel": "Délka",
       "metric": "Metricky",
diff --git a/static/translations/de-CH.json b/static/translations/de-CH.json
index a85202685..af84e5c44 100644
--- a/static/translations/de-CH.json
+++ b/static/translations/de-CH.json
@@ -29,6 +29,7 @@
         "Logout": "Abmelden",
         "MapLegend": "Legende",
         "Measure": "Messen",
+        "Measure3D": "Messen",
         "MeasureLineString": "Messen Linie",
         "MeasurePolygon": "Messen Polygon",
         "Portal": "Portal",
@@ -214,8 +215,8 @@
       "download": "Herunterladen",
       "export": "Exportieren",
       "featureReport": "Objektblatt",
-      "featurecount": "",
-      "layerall": "",
+      "featurecount": "Anzahl Objekte",
+      "layerall": "Alle Ebenen",
       "link": "Link",
       "noattributes": "Keine Attribute",
       "noresults": "Keine Resultate an der ausgewählten Position",
@@ -340,8 +341,10 @@
       "windowtitle": "Legende"
     },
     "measureComponent": {
+      "absolute": "m ü.M.",
       "areaLabel": "Fläche",
       "bearingLabel": "Richtung",
+      "ground": "m ü.B.",
       "imperial": "Imperial",
       "lengthLabel": "Länge",
       "metric": "Metrisch",
diff --git a/static/translations/de-DE.json b/static/translations/de-DE.json
index b391a165c..5c90cfb36 100644
--- a/static/translations/de-DE.json
+++ b/static/translations/de-DE.json
@@ -29,6 +29,7 @@
         "Logout": "Abmelden",
         "MapLegend": "Legende",
         "Measure": "Messen",
+        "Measure3D": "Messen",
         "MeasureLineString": "Messen Linie",
         "MeasurePolygon": "Messen Polygon",
         "Portal": "Portal",
@@ -214,8 +215,8 @@
       "download": "Herunterladen",
       "export": "Exportieren",
       "featureReport": "Objektblatt",
-      "featurecount": "",
-      "layerall": "",
+      "featurecount": "Anzahl Objekte",
+      "layerall": "Alle Ebenen",
       "link": "Link",
       "noattributes": "Keine Attribute",
       "noresults": "Keine Resultate an der ausgewählten Position",
@@ -340,8 +341,10 @@
       "windowtitle": "Legende"
     },
     "measureComponent": {
+      "absolute": "m ü.M.",
       "areaLabel": "Fläche",
       "bearingLabel": "Richtung",
+      "ground": "m ü.B.",
       "imperial": "Imperial",
       "lengthLabel": "Länge",
       "metric": "Metrisch",
diff --git a/static/translations/en-US.json b/static/translations/en-US.json
index cf00177d8..f40ff5a59 100644
--- a/static/translations/en-US.json
+++ b/static/translations/en-US.json
@@ -29,6 +29,7 @@
         "Logout": "Logout",
         "MapLegend": "Legend",
         "Measure": "Measure",
+        "Measure3D": "Measure",
         "MeasureLineString": "Measure a line",
         "MeasurePolygon": "Measure a polygon",
         "Portal": "Portal",
@@ -340,8 +341,10 @@
       "windowtitle": "Legend"
     },
     "measureComponent": {
+      "absolute": "m AMSL",
       "areaLabel": "Area",
       "bearingLabel": "Bearing",
+      "ground": "m AGL",
       "imperial": "Imperial",
       "lengthLabel": "Length",
       "metric": "Metric",
@@ -415,7 +418,7 @@
       "draw": "Draw",
       "edit": "Edit",
       "ellipse": "Ellipse",
-      "export": "",
+      "export": "Export",
       "freehand": "Freehand drawing",
       "label": "Label",
       "layer": "Layer",
diff --git a/static/translations/es-ES.json b/static/translations/es-ES.json
index 2675a1737..71c2efa42 100644
--- a/static/translations/es-ES.json
+++ b/static/translations/es-ES.json
@@ -29,6 +29,7 @@
         "Logout": "Cierre de sesión",
         "MapLegend": "Leyenda",
         "Measure": "Medida",
+        "Measure3D": "",
         "MeasureLineString": "Medir una línea",
         "MeasurePolygon": "Medir un polígono",
         "Portal": "",
@@ -340,8 +341,10 @@
       "windowtitle": "Leyenda"
     },
     "measureComponent": {
+      "absolute": "",
       "areaLabel": "Area",
       "bearingLabel": "Dirección",
+      "ground": "",
       "imperial": "",
       "lengthLabel": "Longitud",
       "metric": "",
diff --git a/static/translations/fr-FR.json b/static/translations/fr-FR.json
index e3c2dc821..61255c48c 100644
--- a/static/translations/fr-FR.json
+++ b/static/translations/fr-FR.json
@@ -29,6 +29,7 @@
         "Logout": "Déconnexion",
         "MapLegend": "Légende",
         "Measure": "Mesurer",
+        "Measure3D": "Mesurer",
         "MeasureLineString": "Mesurer une ligne",
         "MeasurePolygon": "Mesurer un polygone",
         "Portal": "Portail",
@@ -340,8 +341,10 @@
       "windowtitle": "Légende"
     },
     "measureComponent": {
+      "absolute": "m alt.",
       "areaLabel": "Surface",
       "bearingLabel": "Direction",
+      "ground": "m a.d.s.",
       "imperial": "Impérial",
       "lengthLabel": "Longueur",
       "metric": "Métrique",
diff --git a/static/translations/it-IT.json b/static/translations/it-IT.json
index 06afbe4b7..4c92ecec8 100644
--- a/static/translations/it-IT.json
+++ b/static/translations/it-IT.json
@@ -29,6 +29,7 @@
         "Logout": "Disconnetti",
         "MapLegend": "Legenda",
         "Measure": "Misura",
+        "Measure3D": "Misura",
         "MeasureLineString": "Misura una linea",
         "MeasurePolygon": "Misura un poligono",
         "Portal": "Portale",
@@ -214,8 +215,8 @@
       "download": "Scarica",
       "export": "Esporta",
       "featureReport": "Oggetto formulario",
-      "featurecount": "",
-      "layerall": "",
+      "featurecount": "Number oggetti",
+      "layerall": "Tutti i livelli",
       "link": "Link",
       "noattributes": "Nessun attributo",
       "noresults": "Nessun risultato",
@@ -340,8 +341,10 @@
       "windowtitle": "Legenda"
     },
     "measureComponent": {
+      "absolute": "m s.l.m.",
       "areaLabel": "Area",
       "bearingLabel": "Direzione",
+      "ground": "m s.l.s.",
       "imperial": "Imperiale",
       "lengthLabel": "Lunghezza",
       "metric": "Metrico",
diff --git a/static/translations/pl-PL.json b/static/translations/pl-PL.json
index 25e224db4..bcfa5270b 100644
--- a/static/translations/pl-PL.json
+++ b/static/translations/pl-PL.json
@@ -29,6 +29,7 @@
         "Logout": "Wyloguj",
         "MapLegend": "",
         "Measure": "Pomiary",
+        "Measure3D": "",
         "MeasureLineString": "Zmierzyć linię",
         "MeasurePolygon": "Zmierzyć wielokąt",
         "Portal": "",
@@ -340,8 +341,10 @@
       "windowtitle": ""
     },
     "measureComponent": {
+      "absolute": "",
       "areaLabel": "Obszar",
       "bearingLabel": "Bearing",
+      "ground": "",
       "imperial": "",
       "lengthLabel": "Odległość",
       "metric": "",
diff --git a/static/translations/pt-BR.json b/static/translations/pt-BR.json
index 67f98ae75..61e5a7441 100644
--- a/static/translations/pt-BR.json
+++ b/static/translations/pt-BR.json
@@ -29,6 +29,7 @@
         "Logout": "Fim da sessão",
         "MapLegend": "Legenda do mapa",
         "Measure": "Medir",
+        "Measure3D": "",
         "MeasureLineString": "Medir uma linha",
         "MeasurePolygon": "Medir um polígono",
         "Portal": "",
@@ -340,8 +341,10 @@
       "windowtitle": "Titulo da janela"
     },
     "measureComponent": {
+      "absolute": "",
       "areaLabel": "Área",
       "bearingLabel": "Direção",
+      "ground": "",
       "imperial": "Imperial",
       "lengthLabel": "Distância",
       "metric": "Métrica",
diff --git a/static/translations/pt-PT.json b/static/translations/pt-PT.json
index de76c330b..1d5d2c691 100644
--- a/static/translations/pt-PT.json
+++ b/static/translations/pt-PT.json
@@ -29,6 +29,7 @@
         "Logout": "Terminar Sessão",
         "MapLegend": "Legenda do Mapa",
         "Measure": "Medir",
+        "Measure3D": "",
         "MeasureLineString": "Medir Linha",
         "MeasurePolygon": "Medir Polígono",
         "Portal": "",
@@ -340,8 +341,10 @@
       "windowtitle": "Legenda do Mapa"
     },
     "measureComponent": {
+      "absolute": "",
       "areaLabel": "Área",
       "bearingLabel": "Direção",
+      "ground": "",
       "imperial": "Imperial",
       "lengthLabel": "Comprimento",
       "metric": "Métrico",
diff --git a/static/translations/ro-RO.json b/static/translations/ro-RO.json
index b15f54342..2f52ff1d0 100644
--- a/static/translations/ro-RO.json
+++ b/static/translations/ro-RO.json
@@ -29,6 +29,7 @@
         "Logout": "Deconectează-te",
         "MapLegend": "Legenda",
         "Measure": "Măsoară",
+        "Measure3D": "",
         "MeasureLineString": "Măsoară o linie",
         "MeasurePolygon": "Măsoară un poligon",
         "Portal": "",
@@ -340,8 +341,10 @@
       "windowtitle": "Legenda"
     },
     "measureComponent": {
+      "absolute": "",
       "areaLabel": "Arie",
       "bearingLabel": "Direcție",
+      "ground": "",
       "imperial": "Mărimi imperiale",
       "lengthLabel": "Lungime",
       "metric": "Mărimi metrice",
diff --git a/static/translations/ru-RU.json b/static/translations/ru-RU.json
index d854fbef4..74b535f0c 100644
--- a/static/translations/ru-RU.json
+++ b/static/translations/ru-RU.json
@@ -29,6 +29,7 @@
         "Logout": "",
         "MapLegend": "",
         "Measure": "Измерения",
+        "Measure3D": "",
         "MeasureLineString": "измерить линию",
         "MeasurePolygon": "измерить многоугольник",
         "Portal": "",
@@ -340,8 +341,10 @@
       "windowtitle": ""
     },
     "measureComponent": {
+      "absolute": "",
       "areaLabel": "Площадь",
       "bearingLabel": "Пеленг",
+      "ground": "",
       "imperial": "",
       "lengthLabel": "Длина",
       "metric": "",
diff --git a/static/translations/sv-SE.json b/static/translations/sv-SE.json
index aeb973952..83ba5fe4a 100644
--- a/static/translations/sv-SE.json
+++ b/static/translations/sv-SE.json
@@ -29,6 +29,7 @@
         "Logout": "Logga ut",
         "MapLegend": "",
         "Measure": "Mät",
+        "Measure3D": "",
         "MeasureLineString": "Mäta en linje",
         "MeasurePolygon": "Mäta en polygon",
         "Portal": "",
@@ -340,8 +341,10 @@
       "windowtitle": ""
     },
     "measureComponent": {
+      "absolute": "",
       "areaLabel": "Area",
       "bearingLabel": "Bäring",
+      "ground": "",
       "imperial": "",
       "lengthLabel": "Längd",
       "metric": "",
diff --git a/static/translations/tr-TR.json b/static/translations/tr-TR.json
index a55cc320b..a3df2a2a7 100644
--- a/static/translations/tr-TR.json
+++ b/static/translations/tr-TR.json
@@ -29,6 +29,7 @@
         "Logout": "Çıkış",
         "MapLegend": "Harita Lejandı",
         "Measure": "Ölç",
+        "Measure3D": "",
         "MeasureLineString": "Çizgi Ölç",
         "MeasurePolygon": "Alan Ölç",
         "Portal": "Portal",
@@ -340,8 +341,10 @@
       "windowtitle": "Lejant"
     },
     "measureComponent": {
+      "absolute": "",
       "areaLabel": "Alan",
       "bearingLabel": "Doğrultu",
+      "ground": "",
       "imperial": "Imperial",
       "lengthLabel": "Uzunluk",
       "metric": "Metrik",
diff --git a/yarn.lock b/yarn.lock
index be607174d..b1cffffcd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -898,12 +898,13 @@
     ttf2woff "^3.0.0"
     wawoff2 "^2.0.0"
 
-"@giro3d/giro3d@^0.40.0":
-  version "0.40.0"
-  resolved "https://registry.yarnpkg.com/@giro3d/giro3d/-/giro3d-0.40.0.tgz#b00ca163eb13d619035818d61a8d8f1b5eb131a5"
-  integrity sha512-39e7KpPuL1LLUW3G+vG2kR2HnJUA8HIYRcwgwqil9V79pp/YErGKYWDxaw0ulx04veXdWQJ6x8uP3VJ3giY6Cw==
+"@giro3d/giro3d@^0.41.0":
+  version "0.41.0"
+  resolved "https://registry.yarnpkg.com/@giro3d/giro3d/-/giro3d-0.41.0.tgz#9cc00225fa669f6b64bc77f9f88d07b5143112d9"
+  integrity sha512-rRFQpV1tMNBdWoaeb56jL/X9JU529ViOx3730S++JlNIlM5X9+7WzRm2O5TCHRdMTRjtKIowNsHlPiing4h07w==
   dependencies:
     chart.js "^3.9.1"
+    copc "^0.0.7"
     earcut "^2.2.4"
     geotiff "^2.1.0"
     lil-gui "^0.17.0"
@@ -2515,6 +2516,14 @@ cookie@0.7.1:
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.7.1.tgz#2f73c42142d5d5cf71310a74fc4ae61670e5dbc9"
   integrity sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==
 
+copc@^0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/copc/-/copc-0.0.7.tgz#2aa1b2d5277f6d2c7b88eb843f3b92bcef0a6ae7"
+  integrity sha512-vAeqqORGwvtAuQG8ZDUAsRYpyTHhdzR5i2ZBt4BAGMkDgMv21oDBqUIVIKv8Xe04gbdcyBzzVmmiz8WKszFcsA==
+  dependencies:
+    cross-fetch "^3.1.5"
+    laz-perf "^0.0.5"
+
 copy-webpack-plugin@^12.0.2:
   version "12.0.2"
   resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-12.0.2.tgz#935e57b8e6183c82f95bd937df658a59f6a2da28"
@@ -2544,6 +2553,13 @@ core-util-is@~1.0.0:
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
   integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
 
+cross-fetch@^3.1.5:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.2.0.tgz#34e9192f53bc757d6614304d9e5e6fb4edb782e3"
+  integrity sha512-Q+xVJLoGOeIMXZmbUK4HYk+69cQH6LudR0Vu/pRm2YlU/hDV9CiS0gKUMaWY5f2NeUH9C1nV3bsTlCo0FsTV1Q==
+  dependencies:
+    node-fetch "^2.7.0"
+
 cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
   version "7.0.6"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
@@ -4413,6 +4429,11 @@ launch-editor@^2.6.1:
     picocolors "^1.0.0"
     shell-quote "^1.8.1"
 
+laz-perf@^0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/laz-perf/-/laz-perf-0.0.5.tgz#c19f273cd91f7589d8c6fe21a721713cd26798c9"
+  integrity sha512-unnaoahcikJ+AwOm6BhN0JYi2vRhMF7fns28HIsgIw/o0Gwhaizqoc/+txA397/5oUHlljaCIrwSatzrEKlxJQ==
+
 lerc@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lerc/-/lerc-3.0.0.tgz#36f36fbd4ba46f0abf4833799fff2e7d6865f5cb"
@@ -4767,6 +4788,13 @@ node-dir@^0.1.10:
   dependencies:
     minimatch "^3.0.2"
 
+node-fetch@^2.7.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d"
+  integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==
+  dependencies:
+    whatwg-url "^5.0.0"
+
 node-forge@^1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3"
@@ -6337,6 +6365,11 @@ toidentifier@1.0.1:
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
   integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
 
+tr46@~0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
+  integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
+
 tree-dump@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/tree-dump/-/tree-dump-1.0.2.tgz#c460d5921caeb197bde71d0e9a7b479848c5b8ac"
@@ -6597,6 +6630,11 @@ web-worker@^1.2.0:
   resolved "https://registry.yarnpkg.com/web-worker/-/web-worker-1.3.0.tgz#e5f2df5c7fe356755a5fb8f8410d4312627e6776"
   integrity sha512-BSR9wyRsy/KOValMgd5kMyr3JzpdeoR9KVId8u5GVlTTAtNChlsE4yTxeY7zMdNSyOmoKBv8NH2qeRY9Tg+IaA==
 
+webidl-conversions@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
+  integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
+
 webpack-bundle-size-analyzer@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/webpack-bundle-size-analyzer/-/webpack-bundle-size-analyzer-3.1.0.tgz#ff4a4a17d34b8858b56eecb87826365395264669"
@@ -6733,6 +6771,14 @@ wgs84@0.0.0:
   resolved "https://registry.yarnpkg.com/wgs84/-/wgs84-0.0.0.tgz#34fdc555917b6e57cf2a282ed043710c049cdc76"
   integrity sha512-ANHlY4Rb5kHw40D0NJ6moaVfOCMrp9Gpd1R/AIQYg2ko4/jzcJ+TVXYYF6kXJqQwITvEZP4yEthjM7U6rYlljQ==
 
+whatwg-url@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
+  integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==
+  dependencies:
+    tr46 "~0.0.3"
+    webidl-conversions "^3.0.0"
+
 which-boxed-primitive@^1.0.2:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.1.0.tgz#2d850d6c4ac37b95441a67890e19f3fda8b6c6d9"