diff --git a/package-lock.json b/package-lock.json
index 9c394273..020460e9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,7 +12,7 @@
         "@reduxjs/toolkit": "^2.8.2",
         "@terrestris/base-util": "^3.0.0",
         "@terrestris/ol-util": "^21.0.0",
-        "@terrestris/react-geo": "^26.2.1",
+        "@terrestris/react-geo": "^32.4.0",
         "@terrestris/react-util": "^10.0.1",
         "@terrestris/shogun-util": "^10.4.3",
         "antd": "^5.24.3",
@@ -73,46 +73,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@ag-grid-community/client-side-row-model": {
-      "version": "32.3.3",
-      "resolved": "https://registry.npmjs.org/@ag-grid-community/client-side-row-model/-/client-side-row-model-32.3.3.tgz",
-      "integrity": "sha512-/6OFltj9qax/xfOcYMOKGFQRFTrPX8hrELfS2jChWwpo/+rpnnFqN2iUlIiAB1tDJZsi2ryl8S4UoFSTcEv/VA==",
-      "license": "MIT",
-      "dependencies": {
-        "@ag-grid-community/core": "32.3.3",
-        "tslib": "^2.3.0"
-      }
-    },
-    "node_modules/@ag-grid-community/core": {
-      "version": "32.3.3",
-      "resolved": "https://registry.npmjs.org/@ag-grid-community/core/-/core-32.3.3.tgz",
-      "integrity": "sha512-JMr5ahDjjl+pvQbBM1/VrfVFlioCVnMl1PKWc6MC1ENhpXT1+CPQdfhUEUw2VytOulQeQ4eeP0pFKPuBZ5Jn2g==",
-      "license": "MIT",
-      "dependencies": {
-        "ag-charts-types": "10.3.3",
-        "tslib": "^2.3.0"
-      }
-    },
-    "node_modules/@ag-grid-community/react": {
-      "version": "32.3.3",
-      "resolved": "https://registry.npmjs.org/@ag-grid-community/react/-/react-32.3.3.tgz",
-      "integrity": "sha512-YU8nOMZjvJsrbbW41PT1jFZQw67p1RGvTk3W7w1dFmtzXFOoXzpB2pWf2jMxREyLYGvz2P9TwmfeHEM50osSPQ==",
-      "license": "MIT",
-      "dependencies": {
-        "prop-types": "^15.8.1"
-      },
-      "peerDependencies": {
-        "@ag-grid-community/core": "32.3.3",
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
-      }
-    },
-    "node_modules/@ag-grid-community/styles": {
-      "version": "32.3.3",
-      "resolved": "https://registry.npmjs.org/@ag-grid-community/styles/-/styles-32.3.3.tgz",
-      "integrity": "sha512-QAJc1CPbmFsAAq5M/8r0IOm8HL4Fb3eVK6tZXKzV9zibIereBjUwvvJRaSJa8iwtTlgxCtaULAQyE2gJcctphA==",
-      "license": "MIT"
-    },
     "node_modules/@ampproject/remapping": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
@@ -2247,16 +2207,16 @@
       }
     },
     "node_modules/@dnd-kit/sortable": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/@dnd-kit/sortable/-/sortable-9.0.0.tgz",
-      "integrity": "sha512-3/9r8Mmba0nKTbo8kPnVSFZKf/VSy94nXZ3aUwzPEh78j/LooQ/EFKRZENak4PHKBkN53mgTF/z+Sd8H+FcAnQ==",
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/@dnd-kit/sortable/-/sortable-10.0.0.tgz",
+      "integrity": "sha512-+xqhmIIzvAYMGfBYYnbKuNicfSsk4RksY2XdmJhT+HAC01nix6fHCztU68jooFiMUB01Ky3F0FyOvhG/BZrWkg==",
       "license": "MIT",
       "dependencies": {
         "@dnd-kit/utilities": "^3.2.2",
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
-        "@dnd-kit/core": "^6.2.0",
+        "@dnd-kit/core": "^6.3.0",
         "react": ">=16.8.0"
       }
     },
@@ -4192,28 +4152,28 @@
       }
     },
     "node_modules/@terrestris/react-geo": {
-      "version": "26.2.1",
-      "resolved": "https://registry.npmjs.org/@terrestris/react-geo/-/react-geo-26.2.1.tgz",
-      "integrity": "sha512-PQUBsHtMVPQRDHALL4ijVXba8+CTvB1/tiRAZV5VWDcoXsnwzpPSgqIKwvs8vGd/JOQQ2R+kl6nblIHjpuLjUg==",
+      "version": "32.4.0",
+      "resolved": "https://registry.npmjs.org/@terrestris/react-geo/-/react-geo-32.4.0.tgz",
+      "integrity": "sha512-l3OeCOLI6CwrGy4CyoGQ7USoCiUZ9/0bq9r8TyZJCvOzONT6rJJWADWlrHs8yetLWC040t7W77IEzgUTh+08Ew==",
       "license": "BSD-2-Clause",
       "dependencies": {
-        "@ag-grid-community/client-side-row-model": "^32.3.2",
-        "@ag-grid-community/react": "^32.3.2",
-        "@ag-grid-community/styles": "^32.3.2",
         "@dnd-kit/core": "^6.1.0",
         "@dnd-kit/modifiers": "^8.0.0",
-        "@dnd-kit/sortable": "^9.0.0",
+        "@dnd-kit/sortable": "^10.0.0",
         "@fortawesome/fontawesome-svg-core": "^6.5.2",
         "@fortawesome/free-brands-svg-icons": "^6.5.2",
         "@fortawesome/free-regular-svg-icons": "^6.5.2",
         "@fortawesome/free-solid-svg-icons": "^6.5.2",
         "@fortawesome/react-fontawesome": "^0.2.2",
         "@terrestris/base-util": "^3.0.0",
-        "@terrestris/react-util": "^10.0.1",
+        "@terrestris/react-util": "^12.1.1",
         "@types/lodash": "^4.17.4",
-        "jspdf": "^2.5.1",
+        "ag-grid-react": "^33.0.4",
+        "dayjs": "^1.11.13",
+        "iso8601-duration": "^2.1.2",
+        "jspdf": "^3.0.1",
+        "jsts": "^2.12.1",
         "lodash": "^4.17.21",
-        "moment": "^2.30.1",
         "proj4": "^2.11.0",
         "prop-types": "^15.8.1"
       },
@@ -4222,7 +4182,7 @@
         "npm": ">=9"
       },
       "peerDependencies": {
-        "@terrestris/ol-util": ">=20",
+        "@terrestris/ol-util": ">=21",
         "@types/react": ">=18",
         "antd": "^5",
         "ol": ">=10",
@@ -4231,6 +4191,38 @@
         "react-dom": ">=18"
       }
     },
+    "node_modules/@terrestris/react-geo/node_modules/@terrestris/react-util": {
+      "version": "12.1.1",
+      "resolved": "https://registry.npmjs.org/@terrestris/react-util/-/react-util-12.1.1.tgz",
+      "integrity": "sha512-C+ycWYHaX6qwFm0mDhXqWMkheFyLVl6zoLn0+3jGiJbItMdK/ljp/1TUAffJxWwGA6XdYkOkNhv0P838dHQWMg==",
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "@camptocamp/inkmap": "^1.4.0",
+        "@terrestris/base-util": "^3.0.0",
+        "jsts": "^2.12.1",
+        "lodash": "^4.17.21",
+        "moment": "^2.30.1"
+      },
+      "peerDependencies": {
+        "@terrestris/ol-util": ">=21",
+        "ol": ">=10",
+        "ol-mapbox-style": ">=12",
+        "react": ">=18",
+        "react-dom": ">=18"
+      }
+    },
+    "node_modules/@terrestris/react-geo/node_modules/jsts": {
+      "version": "2.12.1",
+      "resolved": "https://registry.npmjs.org/jsts/-/jsts-2.12.1.tgz",
+      "integrity": "sha512-aaiCZeGfeU5o9TbrYF1KF0VvhGGLtG3w7vNynmaTjC8XRmS2v15lq+2Bxa8lMtprsFFJiIpAayJZguLruiHd0w==",
+      "license": "(EDL-1.0 OR EPL-1.0)",
+      "dependencies": {
+        "fastpriorityqueue": "^0.7.5"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
     "node_modules/@terrestris/react-util": {
       "version": "10.0.1",
       "resolved": "https://registry.npmjs.org/@terrestris/react-util/-/react-util-10.0.1.tgz",
@@ -6699,6 +6691,12 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/pako": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@types/pako/-/pako-2.0.4.tgz",
+      "integrity": "sha512-VWDCbrLeVXJM9fihYodcLiIv0ku+AlOa/TQ1SvYOaBuyrSKgEcro95LJyIsJ4vSo6BXIxOKxiJAat04CmST9Fw==",
+      "license": "MIT"
+    },
     "node_modules/@types/prop-types": {
       "version": "15.7.14",
       "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.14.tgz",
@@ -6818,6 +6816,13 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@types/trusted-types": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz",
+      "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==",
+      "license": "MIT",
+      "optional": true
+    },
     "node_modules/@types/use-sync-external-store": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/@types/use-sync-external-store/-/use-sync-external-store-0.0.6.tgz",
@@ -7514,11 +7519,34 @@
       }
     },
     "node_modules/ag-charts-types": {
-      "version": "10.3.3",
-      "resolved": "https://registry.npmjs.org/ag-charts-types/-/ag-charts-types-10.3.3.tgz",
-      "integrity": "sha512-8rmyquaTkwfP4Lzei/W/cbkq9wwEl8+grIo3z97mtxrMIXh9sHJK1oJipd/u08MmBZrca5Jjtn5F1+UNPu/4fQ==",
+      "version": "11.3.2",
+      "resolved": "https://registry.npmjs.org/ag-charts-types/-/ag-charts-types-11.3.2.tgz",
+      "integrity": "sha512-trPGqgGYiTeLgtf9nLuztDYOPOFOLbqHn1g2D99phf7QowcwdX0TPx0wfWG8Hm90LjB8IH+G2s3AZe2vrdAtMQ==",
       "license": "MIT"
     },
+    "node_modules/ag-grid-community": {
+      "version": "33.3.2",
+      "resolved": "https://registry.npmjs.org/ag-grid-community/-/ag-grid-community-33.3.2.tgz",
+      "integrity": "sha512-9bx0e/+ykOyLvUxHqmdy0cRVANH6JAtv0yZdnBZEXYYqBAwN+G5a4NY+2I1KvoOCYzbk8SnStG7y4hCdVAAWOQ==",
+      "license": "MIT",
+      "dependencies": {
+        "ag-charts-types": "11.3.2"
+      }
+    },
+    "node_modules/ag-grid-react": {
+      "version": "33.3.2",
+      "resolved": "https://registry.npmjs.org/ag-grid-react/-/ag-grid-react-33.3.2.tgz",
+      "integrity": "sha512-5bv4JIJvGov23sduIUIyQTqpa/qhoQrRkQm5pFOQb7RMwusfx6xBPrkLwIIlCJiQ8g0OOinxWzZ2kQ2Zml6tLw==",
+      "license": "MIT",
+      "dependencies": {
+        "ag-grid-community": "33.3.2",
+        "prop-types": "^15.8.1"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+      }
+    },
     "node_modules/agent-base": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
@@ -7944,18 +7972,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/atob": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
-      "license": "(MIT OR Apache-2.0)",
-      "bin": {
-        "atob": "bin/atob.js"
-      },
-      "engines": {
-        "node": ">= 4.5.0"
-      }
-    },
     "node_modules/available-typed-arrays": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
@@ -8301,18 +8317,6 @@
         "node-int64": "^0.4.0"
       }
     },
-    "node_modules/btoa": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/btoa/-/btoa-1.2.1.tgz",
-      "integrity": "sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g==",
-      "license": "(MIT OR Apache-2.0)",
-      "bin": {
-        "btoa": "bin/btoa.js"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
     "node_modules/buffer": {
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
@@ -8468,9 +8472,9 @@
       "license": "CC-BY-4.0"
     },
     "node_modules/canvg": {
-      "version": "3.0.10",
-      "resolved": "https://registry.npmjs.org/canvg/-/canvg-3.0.10.tgz",
-      "integrity": "sha512-qwR2FRNO9NlzTeKIPIKpnTY6fqwuYSequ8Ru8c0YkYU7U0oW+hLUvWadLvAu1Rl72OMNiFhoLu4f8eUjQ7l/+Q==",
+      "version": "3.0.11",
+      "resolved": "https://registry.npmjs.org/canvg/-/canvg-3.0.11.tgz",
+      "integrity": "sha512-5ON+q7jCTgMp9cjpu4Jo6XbvfYwSB2Ow3kzHKfIyJfaCAOHLbdKPQqGKgfED/R5B+3TFFfe8pegYA+b423SRyA==",
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -8487,13 +8491,6 @@
         "node": ">=10.0.0"
       }
     },
-    "node_modules/canvg/node_modules/regenerator-runtime": {
-      "version": "0.13.11",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
-      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==",
-      "license": "MIT",
-      "optional": true
-    },
     "node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -8858,9 +8855,9 @@
       }
     },
     "node_modules/core-js": {
-      "version": "3.39.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.39.0.tgz",
-      "integrity": "sha512-raM0ew0/jJUqkJ0E6e8UDtl+y/7ktFivgWvqw8dNSQeNWoSDLvQ1H/RN3aPXB9tBd4/FhyR4RDPGhsNIMsAn7g==",
+      "version": "3.46.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.46.0.tgz",
+      "integrity": "sha512-vDMm9B0xnqqZ8uSBpZ8sNtRtOdmfShrvT6h2TuQGLs0Is+cR0DYbj/KWP6ALVNbWPpqA/qPLoOuppJN07humpA==",
       "hasInstallScript": true,
       "license": "MIT",
       "optional": true,
@@ -9820,11 +9817,14 @@
       }
     },
     "node_modules/dompurify": {
-      "version": "2.5.7",
-      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.5.7.tgz",
-      "integrity": "sha512-2q4bEI+coQM8f5ez7kt2xclg1XsecaV9ASJk/54vwlfRRNQfDqJz2pzQ8t0Ix/ToBpXlVjrRIx7pFC/o8itG2Q==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.3.0.tgz",
+      "integrity": "sha512-r+f6MYR1gGN1eJv0TVQbhA7if/U7P87cdPl3HN5rikqaBSBxLiCb/b9O+2eG0cxz0ghyU+mU1QkbsOwERMYlWQ==",
       "license": "(MPL-2.0 OR Apache-2.0)",
-      "optional": true
+      "optional": true,
+      "optionalDependencies": {
+        "@types/trusted-types": "^2.0.7"
+      }
     },
     "node_modules/dunder-proto": {
       "version": "1.0.1",
@@ -10821,6 +10821,17 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/fast-png": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/fast-png/-/fast-png-6.4.0.tgz",
+      "integrity": "sha512-kAqZq1TlgBjZcLr5mcN6NP5Rv4V2f22z00c3g8vRrwkcqjerx7BEhPbOnWCPqaHUl2XWQBJQvOT/FQhdMT7X/Q==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/pako": "^2.0.3",
+        "iobuffer": "^5.3.2",
+        "pako": "^2.1.0"
+      }
+    },
     "node_modules/fast-uri": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz",
@@ -10860,6 +10871,12 @@
         "fxparser": "src/cli/cli.js"
       }
     },
+    "node_modules/fastpriorityqueue": {
+      "version": "0.7.5",
+      "resolved": "https://registry.npmjs.org/fastpriorityqueue/-/fastpriorityqueue-0.7.5.tgz",
+      "integrity": "sha512-3Pa0n9gwy8yIbEsT3m2j/E9DXgWvvjfiZjjqcJ+AdNKTAlVMIuFYrYG5Y3RHEM8O6cwv9hOpOWY/NaMfywoQVA==",
+      "license": "Apache-2.0"
+    },
     "node_modules/fastq": {
       "version": "1.19.1",
       "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz",
@@ -12166,6 +12183,12 @@
         "node": ">=10.13.0"
       }
     },
+    "node_modules/iobuffer": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/iobuffer/-/iobuffer-5.4.0.tgz",
+      "integrity": "sha512-DRebOWuqDvxunfkNJAlc3IzWIPD5xVxwUNbHr7xKB8E6aLJxIPfNX3CoMJghcFjpv6RWQsrcJbghtEwSPoJqMA==",
+      "license": "MIT"
+    },
     "node_modules/ipaddr.js": {
       "version": "1.9.1",
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
@@ -12704,6 +12727,12 @@
       "dev": true,
       "license": "ISC"
     },
+    "node_modules/iso8601-duration": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/iso8601-duration/-/iso8601-duration-2.1.3.tgz",
+      "integrity": "sha512-OwkROKDXYhqKTl9uyB+/+lQ/Tx+L9LVb9tNRcsO4LtCSBDrmYbzyJLg9rGjYKAPDabD6IVdjMyUnnULHpejrCg==",
+      "license": "MIT"
+    },
     "node_modules/isobject": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
@@ -13945,20 +13974,19 @@
       }
     },
     "node_modules/jspdf": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jspdf/-/jspdf-2.5.2.tgz",
-      "integrity": "sha512-myeX9c+p7znDWPk0eTrujCzNjT+CXdXyk7YmJq5nD5V7uLLKmSXnlQ/Jn/kuo3X09Op70Apm0rQSnFWyGK8uEQ==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/jspdf/-/jspdf-3.0.3.tgz",
+      "integrity": "sha512-eURjAyz5iX1H8BOYAfzvdPfIKK53V7mCpBTe7Kb16PaM8JSXEcUQNBQaiWMI8wY5RvNOPj4GccMjTlfwRBd+oQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.23.2",
-        "atob": "^2.1.2",
-        "btoa": "^1.2.1",
+        "@babel/runtime": "^7.26.9",
+        "fast-png": "^6.2.0",
         "fflate": "^0.8.1"
       },
       "optionalDependencies": {
-        "canvg": "^3.0.6",
+        "canvg": "^3.0.11",
         "core-js": "^3.6.0",
-        "dompurify": "^2.5.4",
+        "dompurify": "^3.2.4",
         "html2canvas": "^1.0.0-rc.5"
       }
     },
@@ -16646,6 +16674,13 @@
         "node": ">=4"
       }
     },
+    "node_modules/regenerator-runtime": {
+      "version": "0.13.11",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
+      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==",
+      "license": "MIT",
+      "optional": true
+    },
     "node_modules/regexp.prototype.flags": {
       "version": "1.5.3",
       "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.3.tgz",
diff --git a/package.json b/package.json
index c54f8ef7..b2eddf83 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
     "@reduxjs/toolkit": "^2.8.2",
     "@terrestris/base-util": "^3.0.0",
     "@terrestris/ol-util": "^21.0.0",
-    "@terrestris/react-geo": "^26.2.1",
+    "@terrestris/react-geo": "^32.4.0",
     "@terrestris/react-util": "^10.0.1",
     "@terrestris/shogun-util": "^10.4.3",
     "antd": "^5.24.3",