From c1b17d7801ec1c436efb88834f3936f9544f7df5 Mon Sep 17 00:00:00 2001
From: Daniel Kastl <daniel@georepublic.de>
Date: Wed, 9 Oct 2024 21:23:23 +0900
Subject: [PATCH 01/17] Updates dependencies

---
 package.json |  16 +++---
 yarn.lock    | 159 ++++++++++++++++-----------------------------------
 2 files changed, 58 insertions(+), 117 deletions(-)

diff --git a/package.json b/package.json
index e4fc70c..cafec5d 100644
--- a/package.json
+++ b/package.json
@@ -22,10 +22,10 @@
   "dependencies": {
     "@juggle/resize-observer": "^3.4.0",
     "@mdi/font": "^7.4.47",
-    "dompurify": "^3.1.6",
+    "dompurify": "^3.1.7",
     "fontfaceobserver": "^2.3.0",
     "geojson": "^0.5.0",
-    "ol": "^10.1.0",
+    "ol": "^10.2.1",
     "ol-ext": "^4.0.23",
     "ol-mapbox-style": "^12.3.5"
   },
@@ -33,17 +33,17 @@
     "@types/dompurify": "^3.0.5",
     "@types/fontfaceobserver": "^2.1.3",
     "@types/geojson": "^7946.0.14",
-    "@types/google.maps": "^3.58.0",
-    "@types/jquery": "^3.5.30",
+    "@types/google.maps": "^3.58.1",
+    "@types/jquery": "^3.5.31",
     "@types/jqueryui": "^1.12.23",
     "@types/ol-ext": "npm:@siedlerchr/types-ol-ext",
     "css-loader": "^7.1.2",
-    "sass": "^1.78.0",
-    "sass-loader": "^16.0.1",
+    "sass": "^1.79.4",
+    "sass-loader": "^16.0.2",
     "style-loader": "^4.0.0",
     "ts-loader": "^9.5.1",
-    "typescript": "^5.6.2",
-    "webpack": "^5.94.0",
+    "typescript": "^5.6.3",
+    "webpack": "^5.95.0",
     "webpack-cli": "^5.1.4"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 8e5b776..e891409 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -131,10 +131,10 @@
   resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.14.tgz#319b63ad6df705ee2a65a73ef042c8271e696613"
   integrity sha512-WCfD5Ht3ZesJUsONdhvm84dmzWOiOzOAqOncN0++w0lBw1o8OuDNJF2McvvCef/yBqb/HYRahp1BYtODFQ8bRg==
 
-"@types/google.maps@^3.58.0":
-  version "3.58.0"
-  resolved "https://registry.yarnpkg.com/@types/google.maps/-/google.maps-3.58.0.tgz#98de7bc271cc9edf81dbe8c317fc9ce130b99311"
-  integrity sha512-rZPrbNHoGxeY70uuQYFLGQqcz5mLd3pZy0u286GSugvN7PLFsHNRF2wN2QXtUgNiC33IC0LX+MD3LGAC3wN7Eg==
+"@types/google.maps@^3.58.1":
+  version "3.58.1"
+  resolved "https://registry.yarnpkg.com/@types/google.maps/-/google.maps-3.58.1.tgz#71ce3dec44de1452f56641d2c87c7dd8ea964b4d"
+  integrity sha512-X9QTSvGJ0nCfMzYOnaVs/k6/4L+7F5uCS+4iUmkLEls6J9S/Phv+m/i3mDeyc49ZBgwab3EFO1HEoBY7k98EGQ==
 
 "@types/jquery@*":
   version "3.5.16"
@@ -143,10 +143,10 @@
   dependencies:
     "@types/sizzle" "*"
 
-"@types/jquery@^3.5.30":
-  version "3.5.30"
-  resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.5.30.tgz#888d584cbf844d3df56834b69925085038fd80f7"
-  integrity sha512-nbWKkkyb919DOUxjmRVk8vwtDb0/k8FKncmUKFi+NY+QXqWltooxTrswvz4LspQwxvLdvzBN1TImr6cw3aQx2A==
+"@types/jquery@^3.5.31":
+  version "3.5.31"
+  resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.5.31.tgz#3605df86427f6c4e6b5b5a470ba180f74107cffa"
+  integrity sha512-rf/iB+cPJ/YZfMwr+FVuQbm7IaWC4y3FVYfVDxRGqmUCFjjPII0HWaP0vTPJGp6m4o13AXySCcMbWfrWtBFAKw==
   dependencies:
     "@types/sizzle" "*"
 
@@ -172,10 +172,10 @@
   resolved "https://registry.yarnpkg.com/@siedlerchr/types-ol-ext/-/types-ol-ext-3.4.0.tgz#e57292b89fc6b00226a751479c41e78d266c283a"
   integrity sha512-LtS9YNitiQ2UZV+RHVOS0Pehlkpcsp6qX9Sa2I33l4ZNqFCRB0T8YefGj0Se4SP8cPr1jc9+q1UU86BjFpg8ww==
 
-"@types/rbush@^3.0.3":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@types/rbush/-/rbush-3.0.4.tgz#265d84ec76dc48e464e95ae4f58e085f28f0a227"
-  integrity sha512-knSt9cCW8jj1ZSFcFeBZaX++OucmfPxxHiRwTahZfJlnQsek7O0bazTJHWD2RVj9LEoejUYF2de3/stf+QXcXw==
+"@types/rbush@3.0.3":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@types/rbush/-/rbush-3.0.3.tgz#f7ba6bc940e0913678f5df119e7a7803f1842ece"
+  integrity sha512-lX55lR0iYCgapxD3IrgujpQA1zDxwZI5qMRelKvmKAsSMplFVr7wmMpG7/6+Op2tjrgEex8o3vjg8CRDrRNYxg==
 
 "@types/sizzle@*":
   version "2.3.3"
@@ -370,20 +370,7 @@ ansi-styles@^4.1.0:
   dependencies:
     color-convert "^2.0.1"
 
-anymatch@~3.1.2:
-  version "3.1.3"
-  resolved "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz"
-  integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
-  dependencies:
-    normalize-path "^3.0.0"
-    picomatch "^2.0.4"
-
-binary-extensions@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz"
-  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
-
-braces@^3.0.2, braces@~3.0.2:
+braces@^3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
   integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
@@ -418,20 +405,12 @@ chalk@^4.1.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-"chokidar@>=3.0.0 <4.0.0":
-  version "3.5.3"
-  resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz"
-  integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
-  dependencies:
-    anymatch "~3.1.2"
-    braces "~3.0.2"
-    glob-parent "~5.1.2"
-    is-binary-path "~2.1.0"
-    is-glob "~4.0.1"
-    normalize-path "~3.0.0"
-    readdirp "~3.6.0"
-  optionalDependencies:
-    fsevents "~2.3.2"
+chokidar@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-4.0.1.tgz#4a6dff66798fb0f72a94f616abbd7e1a19f31d41"
+  integrity sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==
+  dependencies:
+    readdirp "^4.0.1"
 
 chrome-trace-event@^1.0.2:
   version "1.0.3"
@@ -527,10 +506,10 @@ cssesc@^3.0.0:
   resolved "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz"
   integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
 
-dompurify@^3.1.6:
-  version "3.1.6"
-  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.1.6.tgz#43c714a94c6a7b8801850f82e756685300a027e2"
-  integrity sha512-cTOAhc36AalkjtBpfG6O8JimdTMWNXjiePT2xQH/ppBGi/4uIpmj8eKyIkMJErXWARyINV/sB38yf8JCLF5pbQ==
+dompurify@^3.1.7:
+  version "3.1.7"
+  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.1.7.tgz#711a8c96479fb6ced93453732c160c3c72418a6a"
+  integrity sha512-VaTstWtsneJY8xzy7DekmYWEOZcmzIe3Qb3zPd4STve1OBTa+e+WmS1ITQec1fZYXI3HCsOZZiSMpG6oxoWMWQ==
 
 earcut@^3.0.0:
   version "3.0.0"
@@ -638,11 +617,6 @@ fontfaceobserver@^2.3.0:
   resolved "https://registry.npmjs.org/fontfaceobserver/-/fontfaceobserver-2.3.0.tgz"
   integrity sha512-6FPvD/IVyT4ZlNe7Wcn5Fb/4ChigpucKYSvD6a+0iMoLn2inpo711eyIcKjmDtE5XNcgAkSH9uN/nfAeZzHEfg==
 
-fsevents@~2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
-  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
-
 function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"
@@ -666,13 +640,6 @@ geotiff@^2.0.7:
     web-worker "^1.2.0"
     xml-utils "^1.0.2"
 
-glob-parent@~5.1.2:
-  version "5.1.2"
-  resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"
-  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
-  dependencies:
-    is-glob "^4.0.1"
-
 glob-to-regexp@^0.4.1:
   version "0.4.1"
   resolved "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz"
@@ -718,13 +685,6 @@ interpret@^3.1.1:
   resolved "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz"
   integrity sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==
 
-is-binary-path@~2.1.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz"
-  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
-  dependencies:
-    binary-extensions "^2.0.0"
-
 is-core-module@^2.11.0:
   version "2.12.0"
   resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.0.tgz"
@@ -732,18 +692,6 @@ is-core-module@^2.11.0:
   dependencies:
     has "^1.0.3"
 
-is-extglob@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"
-  integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
-
-is-glob@^4.0.1, is-glob@~4.0.1:
-  version "4.0.3"
-  resolved "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz"
-  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
-  dependencies:
-    is-extglob "^2.1.1"
-
 is-number@^7.0.0:
   version "7.0.0"
   resolved "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"
@@ -869,11 +817,6 @@ node-releases@^2.0.14:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b"
   integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==
 
-normalize-path@^3.0.0, normalize-path@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz"
-  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
-
 ol-ext@^4.0.23:
   version "4.0.23"
   resolved "https://registry.yarnpkg.com/ol-ext/-/ol-ext-4.0.23.tgz#13b405451f7696ce4d0a6bd466ce5b6b69786c1b"
@@ -887,12 +830,12 @@ ol-mapbox-style@^12.3.5:
     "@mapbox/mapbox-gl-style-spec" "^13.23.1"
     mapbox-to-css-font "^2.4.1"
 
-ol@^10.1.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/ol/-/ol-10.1.0.tgz#f163fc57585c454c149a87f201c207fe642d2f46"
-  integrity sha512-/efepydpzhFoeczA9KAN5t7G0WpFhP46ZXEfSl6JbZ7ipQZ2axpkYB2qt0qcOUlPFYMt7/XQFApH652KB08tTg==
+ol@^10.2.1:
+  version "10.2.1"
+  resolved "https://registry.yarnpkg.com/ol/-/ol-10.2.1.tgz#05143d0bbc0d8761385e0acae4ec9074a570bf64"
+  integrity sha512-2bB/y2vEnmzjqynP0NA7Cp8k86No3Psn63Dueicep3E3i09axWRVIG5IS/bylEAGfWQx0QXD/uljkyFoY60Wig==
   dependencies:
-    "@types/rbush" "^3.0.3"
+    "@types/rbush" "3.0.3"
     color-rgba "^3.0.0"
     color-space "^2.0.1"
     earcut "^3.0.0"
@@ -956,7 +899,7 @@ picocolors@^1.0.0:
   resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
-picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
+picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
@@ -1052,12 +995,10 @@ rbush@^4.0.0:
   dependencies:
     quickselect "^2.0.0"
 
-readdirp@~3.6.0:
-  version "3.6.0"
-  resolved "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz"
-  integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
-  dependencies:
-    picomatch "^2.2.1"
+readdirp@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-4.0.2.tgz#388fccb8b75665da3abffe2d8f8ed59fe74c230a"
+  integrity sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==
 
 rechoir@^0.8.0:
   version "0.8.0"
@@ -1104,19 +1045,19 @@ safe-buffer@^5.1.0:
   resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
-sass-loader@^16.0.1:
-  version "16.0.1"
-  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-16.0.1.tgz#57049c1787076e923b21a1dccc612546ecaf4295"
-  integrity sha512-xACl1ToTsKnL9Ce5yYpRxrLj9QUDCnwZNhzpC7tKiFyA8zXsd3Ap+HGVnbCgkdQcm43E+i6oKAWBsvGA6ZoiMw==
+sass-loader@^16.0.2:
+  version "16.0.2"
+  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-16.0.2.tgz#e581bc13d7cb5090e27f155c6aa2855c08cafe86"
+  integrity sha512-Ll6iXZ1EYwYT19SqW4mSBb76vSSi8JgzElmzIerhEGgzB5hRjDQIWsPmuk1UrAXkR16KJHqVY0eH+5/uw9Tmfw==
   dependencies:
     neo-async "^2.6.2"
 
-sass@^1.78.0:
-  version "1.78.0"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.78.0.tgz#cef369b2f9dc21ea1d2cf22c979f52365da60841"
-  integrity sha512-AaIqGSrjo5lA2Yg7RvFZrlXDBCp3nV4XP73GrLGvdRWWwk+8H3l0SDvq/5bA4eF+0RFPLuWUk3E+P1U/YqnpsQ==
+sass@^1.79.4:
+  version "1.79.4"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.79.4.tgz#f9c45af35fbeb53d2c386850ec842098d9935267"
+  integrity sha512-K0QDSNPXgyqO4GZq2HO5Q70TLxTH6cIT59RdoCHMivrC8rqzaTw5ab9prjz9KUN1El4FLXrBXJhik61JR4HcGg==
   dependencies:
-    chokidar ">=3.0.0 <4.0.0"
+    chokidar "^4.0.0"
     immutable "^4.0.0"
     source-map-js ">=0.6.2 <2.0.0"
 
@@ -1287,10 +1228,10 @@ ts-loader@^9.5.1:
     semver "^7.3.4"
     source-map "^0.7.4"
 
-typescript@^5.6.2:
-  version "5.6.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.2.tgz#d1de67b6bef77c41823f822df8f0b3bcff60a5a0"
-  integrity sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==
+typescript@^5.6.3:
+  version "5.6.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.3.tgz#5f3449e31c9d94febb17de03cc081dd56d81db5b"
+  integrity sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==
 
 update-browserslist-db@^1.0.13:
   version "1.0.13"
@@ -1357,10 +1298,10 @@ webpack-sources@^3.2.3:
   resolved "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz"
   integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
 
-webpack@^5.94.0:
-  version "5.94.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.94.0.tgz#77a6089c716e7ab90c1c67574a28da518a20970f"
-  integrity sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==
+webpack@^5.95.0:
+  version "5.95.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.95.0.tgz#8fd8c454fa60dad186fbe36c400a55848307b4c0"
+  integrity sha512-2t3XstrKULz41MNMBF+cJ97TyHdyQ8HCt//pqErqDvNjU9YQBnZxIHa11VXsi7F3mb5/aO2tuDxdeTPdU7xu9Q==
   dependencies:
     "@types/estree" "^1.0.5"
     "@webassemblyjs/ast" "^1.12.1"

From 5a9b477d06ca6391966f7835e854a5b98fee6c2b Mon Sep 17 00:00:00 2001
From: Daniel Kastl <daniel@georepublic.de>
Date: Wed, 13 Nov 2024 16:27:35 +0900
Subject: [PATCH 02/17] Refactor settings views to remove unnecessary divs and
 improve layout with horizontal rules

---
 app/views/settings/gtt/_general.html.erb  |  9 +++----
 app/views/settings/gtt/_geocoder.html.erb |  2 --
 app/views/settings/gtt/_settings.html.erb |  2 +-
 app/views/settings/gtt/_styling.html.erb  | 30 +++++++++++------------
 config/locales/en.yml                     |  2 ++
 5 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/app/views/settings/gtt/_general.html.erb b/app/views/settings/gtt/_general.html.erb
index 0a07239..178c901 100644
--- a/app/views/settings/gtt/_general.html.erb
+++ b/app/views/settings/gtt/_general.html.erb
@@ -1,4 +1,3 @@
-<div class="box tabular settings">
 <h3><%= l(:select_default_map_settings) %></h3>
 
 <p>
@@ -41,9 +40,8 @@
       :size => 10) %>
 </p>
 
-</div>
+<hr>
 
-<div class="box tabular settings">
 <h3><%= l(:select_edit_geometry_settings) %></h3>
 
 <p>
@@ -62,9 +60,9 @@
   <%= content_tag(:label, l(:label_enable_geojson_upload_on_issue_map)) %>
   <%= check_box_tag 'settings[enable_geojson_upload_on_issue_map]', true, @settings[:enable_geojson_upload_on_issue_map] %>
 </p>
-</div>
 
-<div class="box tabular settings">
+<hr>
+
 <h3><%= l(:select_other_gtt_settings) %></h3>
 
 <p>
@@ -81,4 +79,3 @@
   <%= content_tag(:label, l(:label_hide_map_for_invalid_geom)) %>
   <%= check_box_tag 'settings[hide_map_for_invalid_geom]', 1, Setting.plugin_redmine_gtt['hide_map_for_invalid_geom'] %>
 </p>
-</div>
diff --git a/app/views/settings/gtt/_geocoder.html.erb b/app/views/settings/gtt/_geocoder.html.erb
index 49e053d..6a0ebc2 100644
--- a/app/views/settings/gtt/_geocoder.html.erb
+++ b/app/views/settings/gtt/_geocoder.html.erb
@@ -1,4 +1,3 @@
-<div class="box tabular settings">
 <h3><%= l(:select_default_geocoder_settings) %></h3>
 
 <p>
@@ -27,7 +26,6 @@
       :rows => 10,
       :cols => 100) %>
 </p>
-</div>
 
 <script>
   document.getElementById('geocoder_load_example').addEventListener('click', (event) => {
diff --git a/app/views/settings/gtt/_settings.html.erb b/app/views/settings/gtt/_settings.html.erb
index 9b3f775..103d0db 100644
--- a/app/views/settings/gtt/_settings.html.erb
+++ b/app/views/settings/gtt/_settings.html.erb
@@ -32,5 +32,5 @@
   });
 
   // Apply settings
-  window.gtt_setting()
+  window.gtt_setting();
 <% end %>
diff --git a/app/views/settings/gtt/_styling.html.erb b/app/views/settings/gtt/_styling.html.erb
index 4e7b70c..0637d87 100644
--- a/app/views/settings/gtt/_styling.html.erb
+++ b/app/views/settings/gtt/_styling.html.erb
@@ -1,31 +1,31 @@
-<div class="box tabular settings">
 <h3><%= l(:select_default_tracker_icon) %></h3>
 
 <% Tracker.sorted.each do |t| %>
-  <p>
-    <%= content_tag :label, t.name %>
-    <%= select_tag "settings[tracker_#{t.id}]", "<option>#{@settings["tracker_#{t.id}"]}</option>".html_safe %>
-    <i id="icon_settings_tracker_<%= t.id %>"></i>
-  </p>
+<p>
+  <%= content_tag :label, t.name %>
+  <%= select_tag "settings[tracker_#{t.id}]", "<option>#{@settings["tracker_#{t.id}"]}</option>".html_safe %>
+  <i id="icon_settings_tracker_<%= t.id %>"></i>
+</p>
 <% end %>
-</div>
 
-<div class="box tabular settings">
+<hr>
+
 <h3><%= l(:select_default_status_color) %></h3>
 
 <% IssueStatus.sorted.each do |t| %>
-  <p>
-    <%= content_tag :label, t.name %>
-    <%= color_field_tag "settings[status_#{t.id}]", @settings["status_#{t.id}"] %>
-  </p>
+<p>
+  <%= content_tag :label, t.name %>
+  <%= color_field_tag "settings[status_#{t.id}]", @settings["status_#{t.id}"] %>
+</p>
 <% end %>
-</div>
 
-<div class="box tabular settings">
+<hr>
+
+<h3><%= l(:select_other_style_settings) %></h3>
+
 <p>
   <%= content_tag(:label, l(:gtt_settings_vector_minzoom_level)) %>
   <%= text_field_tag('settings[vector_minzoom_level]',
       @settings['vector_minzoom_level'],
       :size => 10 ) %>
 </p>
-</div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index be1b50d..d2ed67f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -69,6 +69,8 @@ en:
   select_edit_geometry_settings: "Set edit geometry settings:"
   select_default_geocoder_settings: "Set Geocoder settings:"
 
+  select_other_style_settings: "Other style settings"
+
   project_module_gtt: "GTT"
   permission_manage_gtt_settings: "Manage GTT settings"
   permission_view_gtt_settings: "View GTT settings"

From 2578ab2262532620e66b672590eaf45ba4c86940 Mon Sep 17 00:00:00 2001
From: Daniel Kastl <daniel@georepublic.de>
Date: Thu, 14 Nov 2024 14:20:30 +0900
Subject: [PATCH 03/17] Refactor GttMapLayer to use ApplicationRecord if
 available

---
 app/models/gtt_map_layer.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/gtt_map_layer.rb b/app/models/gtt_map_layer.rb
index fad7056..9db2093 100644
--- a/app/models/gtt_map_layer.rb
+++ b/app/models/gtt_map_layer.rb
@@ -1,7 +1,7 @@
 # Map layer model
 #
 # Configuration is stored as json
-class GttMapLayer < ActiveRecord::Base
+class GttMapLayer < (defined?(ApplicationRecord) == 'constant' ? ApplicationRecord : ActiveRecord::Base)
   self.inheritance_column = 'none'
 
   validates :name, presence: true

From 857375fa94f2a17a6dee02e624548d1dc8b3112d Mon Sep 17 00:00:00 2001
From: Daniel Kastl <daniel@georepublic.de>
Date: Thu, 14 Nov 2024 15:13:40 +0900
Subject: [PATCH 04/17] Update gem versions for rgeo, rgeo_activerecord, and
 activerecord_postgis_adapter

---
 Gemfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 71548ff..b6da8c6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,9 +3,9 @@ source 'https://rubygems.org'
 # Define gem versions with environment variables or default versions
 gem_versions = {
   pg: ENV['GEM_PG_VERSION'] || '1.5.3',
-  rgeo: ENV['GEM_RGEO_VERSION'] || '3.0.0',
-  rgeo_activerecord: ENV['GEM_RGEO_ACTIVERECORD_VERSION'] || '7.0.1',
-  activerecord_postgis_adapter: ENV['GEM_ACTIVERECORD_POSTGIS_ADAPTER_VERSION'] || '7.1.1'
+  rgeo: ENV['GEM_RGEO_VERSION'] || '3.0.1',
+  rgeo_activerecord: ENV['GEM_RGEO_ACTIVERECORD_VERSION'] || '8.0.0',
+  activerecord_postgis_adapter: ENV['GEM_ACTIVERECORD_POSTGIS_ADAPTER_VERSION'] || '10.0.0'
 }
 
 gem 'deface'

From 2a6be3aa2ec58db486ff0ce73f6ed64ee0b84ca8 Mon Sep 17 00:00:00 2001
From: Daniel Kastl <daniel@georepublic.de>
Date: Thu, 14 Nov 2024 16:23:32 +0900
Subject: [PATCH 05/17] Refactor asset handling to support Redmine 6

---
 init.rb                                       |  6 +--
 .../hooks/view_layouts_base_html_head_hook.rb | 45 -----------------
 lib/redmine_gtt/view_hooks.rb                 | 48 +++++++++++++++++--
 src/styles/icons/custom/custom-icons-def.ts   | 21 +++++++-
 src/styles/icons/custom/custom-icons.css      |  4 +-
 .../material-design/material-design-def.ts    | 13 +++--
 webpack.config.js                             |  6 +--
 7 files changed, 81 insertions(+), 62 deletions(-)
 delete mode 100644 lib/redmine_gtt/hooks/view_layouts_base_html_head_hook.rb

diff --git a/init.rb b/init.rb
index 86ec1fe..2f33f2a 100644
--- a/init.rb
+++ b/init.rb
@@ -1,6 +1,4 @@
-# Global Hooks
-require File.expand_path('../lib/redmine_gtt/hooks/view_layouts_base_html_head_hook', __FILE__)
-require File.expand_path('../lib/redmine_gtt/view_hooks', __FILE__)
+require_relative 'lib/redmine_gtt/view_hooks'
 
 Redmine::Plugin.register :redmine_gtt do
   name 'Redmine GTT plugin'
@@ -8,7 +6,7 @@
   author_url 'https://github.com/georepublic'
   url 'https://github.com/gtt-project/redmine_gtt'
   description 'Adds location-based task management and maps'
-  version '5.1.2'
+  version '6.0.0'
 
   requires_redmine :version_or_higher => '5.0.0'
 
diff --git a/lib/redmine_gtt/hooks/view_layouts_base_html_head_hook.rb b/lib/redmine_gtt/hooks/view_layouts_base_html_head_hook.rb
deleted file mode 100644
index dd3eb13..0000000
--- a/lib/redmine_gtt/hooks/view_layouts_base_html_head_hook.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-module RedmineGtt
-  module Hooks
-    class ViewLayoutsBaseHtmlHeadHook < Redmine::Hook::ViewListener
-
-      include ActionView::Context
-
-      def view_layouts_base_html_head(context={})
-        tags = [];
-
-        tags << javascript_include_tag('../main.js', :plugin => 'redmine_gtt')
-        return tags.join("\n")
-      end
-
-      def view_layouts_base_body_bottom(context={})
-        tags = [];
-
-        geocoder = {
-          enabled: false
-        }
-
-        if Setting.plugin_redmine_gtt['enable_geocoding_on_map'] == 'true'
-          geocoder = {
-            enabled: true,
-            provider: Setting.plugin_redmine_gtt['default_geocoder_provider'],
-            options: (JSON.parse(Setting.plugin_redmine_gtt['default_geocoder_options']) rescue {})
-          }
-        end
-
-        tags.push(tag.div :data => {
-          :lon => Setting.plugin_redmine_gtt['default_map_center_longitude'],
-          :lat => Setting.plugin_redmine_gtt['default_map_center_latitude'],
-          :zoom => Setting.plugin_redmine_gtt['default_map_zoom_level'],
-          :maxzoom => Setting.plugin_redmine_gtt['default_map_maxzoom_level'],
-          :vector_minzoom => Setting.plugin_redmine_gtt['vector_minzoom_level'],
-          :fit_maxzoom => Setting.plugin_redmine_gtt['default_map_fit_maxzoom_level'],
-          :geocoder => geocoder,
-          :plugin_settings => Setting.plugin_redmine_gtt.select{ |key, value| key.to_s.match(/^(?!default).+/) },
-          :i18n => l(:gtt_js).to_json.html_safe
-        }, :id => 'gtt-defaults', :style => 'display:none')
-        return tags.join("\n")
-      end
-
-    end
-  end
-end
diff --git a/lib/redmine_gtt/view_hooks.rb b/lib/redmine_gtt/view_hooks.rb
index e4aa487..2de16b9 100644
--- a/lib/redmine_gtt/view_hooks.rb
+++ b/lib/redmine_gtt/view_hooks.rb
@@ -1,9 +1,11 @@
-# frozen_string_literal: true
-
 module RedmineGtt
   class ViewHooks < Redmine::Hook::ViewListener
+
+    include ActionView::Context
+
+    # Render partials in various views
     render_on :view_account_left_bottom,
-      partial: 'redmine_gtt/hooks/view_account_left_bottom'
+    partial: 'redmine_gtt/hooks/view_account_left_bottom'
 
     render_on :view_my_account,
       partial: 'redmine_gtt/hooks/view_my_account'
@@ -17,5 +19,45 @@ class ViewHooks < Redmine::Hook::ViewListener
     render_on :view_layouts_base_body_bottom,
       partial: 'redmine_gtt/hooks/view_layouts_base_body_bottom'
 
+    # Add meta tags to the HTML head to inform about available fonts with their URL including the digest
+    def view_layouts_base_html_head(context={})
+      tags = []
+      tags << tag.meta(:name => 'gtt-font-custom-icons', :content => asset_path('plugin_assets/redmine_gtt/custom-icons.woff2'))
+      tags << tag.meta(:name => 'gtt-font-mdi-webfont', :content => asset_path('plugin_assets/redmine_gtt/materialdesignicons-webfont.woff2'))
+      return tags.join("\n")
+    end
+
+    # Add JavaScript and data tags to the body bottom
+    def view_layouts_base_body_bottom(context={})
+      tags = [];
+
+      tags << javascript_include_tag('main', :plugin => 'redmine_gtt')
+
+      geocoder = {
+        enabled: false
+      }
+
+      if Setting.plugin_redmine_gtt['enable_geocoding_on_map'] == 'true'
+        geocoder = {
+          enabled: true,
+          provider: Setting.plugin_redmine_gtt['default_geocoder_provider'],
+          options: (JSON.parse(Setting.plugin_redmine_gtt['default_geocoder_options']) rescue {})
+        }
+      end
+
+      tags.push(tag.div :data => {
+        :lon => Setting.plugin_redmine_gtt['default_map_center_longitude'],
+        :lat => Setting.plugin_redmine_gtt['default_map_center_latitude'],
+        :zoom => Setting.plugin_redmine_gtt['default_map_zoom_level'],
+        :maxzoom => Setting.plugin_redmine_gtt['default_map_maxzoom_level'],
+        :vector_minzoom => Setting.plugin_redmine_gtt['vector_minzoom_level'],
+        :fit_maxzoom => Setting.plugin_redmine_gtt['default_map_fit_maxzoom_level'],
+        :geocoder => geocoder,
+        :plugin_settings => Setting.plugin_redmine_gtt.select{ |key, value| key.to_s.match(/^(?!default).+/) },
+        :i18n => l(:gtt_js).to_json.html_safe
+      }, :id => 'gtt-defaults', :style => 'display:none')
+
+      return tags.join("\n")
+    end
   end
 end
diff --git a/src/styles/icons/custom/custom-icons-def.ts b/src/styles/icons/custom/custom-icons-def.ts
index c16e269..31f7c18 100644
--- a/src/styles/icons/custom/custom-icons-def.ts
+++ b/src/styles/icons/custom/custom-icons-def.ts
@@ -8,8 +8,27 @@ const iconMappings: { [key: string]: any } = {
   'waste': '\uf104'
 };
 
+// Read the meta tag for custom-icons
+const customIconsMeta = document.querySelector('meta[name="gtt-font-custom-icons"]');
+const customIconsUrl = customIconsMeta ? customIconsMeta.getAttribute('content') : 'data:application/font-woff2;base64,'; // Provide a data URL for an empty font
+
+// Dynamically create the @font-face rule
+const style = document.createElement('style');
+style.type = 'text/css';
+style.innerHTML = `
+  @font-face {
+    font-family: 'custom-icons';
+    font-style: normal;
+    font-weight: 400;
+    font-display: block;
+    src: url(${customIconsUrl}) format('woff2');
+  }
+`;
+document.head.appendChild(style);
+
 // Define the font face
-let customFont = new FontFace('custom-icons', 'url(/plugin_assets/redmine_gtt/custom-icons.woff2)');
+let customFont: FontFace;
+customFont = new FontFace('custom-icons', `url(${customIconsUrl})`);
 
 // Load the font
 const fontPromise = customFont.load().then((font) => {
diff --git a/src/styles/icons/custom/custom-icons.css b/src/styles/icons/custom/custom-icons.css
index fb9e08f..611b1ef 100644
--- a/src/styles/icons/custom/custom-icons.css
+++ b/src/styles/icons/custom/custom-icons.css
@@ -1,10 +1,10 @@
-@font-face {
+/* @font-face {
   font-family: "custom-icons";
   font-style: normal;
   font-weight: 400;
   font-display: block;
   src: url("./custom-icons.woff2") format("woff2");
-}
+} */
 
 .custom-icons {
   font-weight: normal;
diff --git a/src/styles/icons/material-design/material-design-def.ts b/src/styles/icons/material-design/material-design-def.ts
index cc571ce..f35ddc1 100644
--- a/src/styles/icons/material-design/material-design-def.ts
+++ b/src/styles/icons/material-design/material-design-def.ts
@@ -7300,11 +7300,16 @@ const iconMappings: { [key: string]: any } = {
   "zodiac-virgo": "\u{F0A88}",
 };
 
+// Read the meta tag for MDI webfont
+const mdiWebfontMeta = document.querySelector('meta[name="gtt-font-mdi-webfont"]');
+const mdiWebfontUrl = mdiWebfontMeta ? mdiWebfontMeta.getAttribute('content') : 'data:application/font-woff2;base64,'; // Provide a data URL for an empty font
+
 // Define the font face
-let customFont = new FontFace('materialdesignicons', 'url(/plugin_assets/redmine_gtt/materialdesignicons-webfont.woff2)');
+let mdiFont: FontFace;
+mdiFont = new FontFace('materialdesignicons', `url(${mdiWebfontUrl})`);
 
 // Load the font
-const fontPromise = customFont.load().then((font) => {
+const fontPromise = mdiFont.load().then((font) => {
   // Add the loaded font to the document
   document.fonts.add(font);
 
@@ -7314,13 +7319,13 @@ const fontPromise = customFont.load().then((font) => {
       font: 'Material Design Icons',
       name: 'Material Design Icons',
       copyright: 'Apache-2.0',
-      prefix:  'mdi'
+      prefix: 'mdi',
     },
     iconMappings
   );
 
   // Create a FontFaceObserver instance
-  const observer = new FontFaceObserver('custom-icons');
+  const observer = new FontFaceObserver('materialdesignicons');
 
   // Use the observer to wait for the font to be loaded
   return observer.load();
diff --git a/webpack.config.js b/webpack.config.js
index cbfa6ba..8b427af 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -16,7 +16,7 @@ const imageLoaders = {
   test: /\.(png|svg|jpg|jpeg|gif)$/i,
   type: 'asset/resource',
   generator: {
-    filename: '[name][ext]', // Keep the original file name and extension
+    filename: '../images/[name][ext]', // Keep the original file name and extension
   },
 };
 
@@ -25,7 +25,7 @@ const fontLoaders = {
   test: /\.(woff|woff2|eot|ttf|otf)$/i,
   type: 'asset/resource',
   generator: {
-    filename: '[name][ext]', // Keep the original file name and extension
+    filename: '../fonts/[name][ext]', // Keep the original file name and extension
   },
 };
 
@@ -55,7 +55,7 @@ module.exports = {
   },
   output: {
     filename: 'main.js',
-    path: path.resolve(__dirname, 'assets'),
+    path: path.resolve(__dirname, 'assets/javascripts'),
     assetModuleFilename: '[name].[ext]',
   },
 };

From a9e52087e3b9750b084547844a5f7551eeed91b6 Mon Sep 17 00:00:00 2001
From: Daniel Kastl <daniel@georepublic.de>
Date: Thu, 14 Nov 2024 16:46:06 +0900
Subject: [PATCH 06/17] Fix GTT settings view and dynamically create font-face
 rule for Material Design Icons

---
 app/views/settings/gtt/_settings.html.erb           | 11 +++++++----
 .../icons/material-design/material-design-def.ts    | 13 +++++++++++++
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/app/views/settings/gtt/_settings.html.erb b/app/views/settings/gtt/_settings.html.erb
index 103d0db..f4574fb 100644
--- a/app/views/settings/gtt/_settings.html.erb
+++ b/app/views/settings/gtt/_settings.html.erb
@@ -23,14 +23,17 @@
     });
   }
 
-  // Activate tab if it is specified in the URL
   document.addEventListener('DOMContentLoaded', function() {
+
+    // Activate tab if it is specified in the URL
     var tab = getQueryParam('tab');
     if (tab) {
       activateTab(tab);
     }
-  });
 
-  // Apply settings
-  window.gtt_setting();
+    // Apply GTT settings
+    if (typeof window.gtt_setting === 'function') {
+      window.gtt_setting();
+    }
+  });
 <% end %>
diff --git a/src/styles/icons/material-design/material-design-def.ts b/src/styles/icons/material-design/material-design-def.ts
index f35ddc1..7f228b5 100644
--- a/src/styles/icons/material-design/material-design-def.ts
+++ b/src/styles/icons/material-design/material-design-def.ts
@@ -7304,6 +7304,19 @@ const iconMappings: { [key: string]: any } = {
 const mdiWebfontMeta = document.querySelector('meta[name="gtt-font-mdi-webfont"]');
 const mdiWebfontUrl = mdiWebfontMeta ? mdiWebfontMeta.getAttribute('content') : 'data:application/font-woff2;base64,'; // Provide a data URL for an empty font
 
+// Dynamically create the @font-face rule
+const style = document.createElement('style');
+style.type = 'text/css';
+style.innerHTML = `
+  @font-face {
+    font-family: 'Material Design Icons';
+    src: url(${mdiWebfontUrl}) format('woff2');
+    font-weight: normal;
+    font-style: normal;
+  }
+`;
+document.head.appendChild(style);
+
 // Define the font face
 let mdiFont: FontFace;
 mdiFont = new FontFace('materialdesignicons', `url(${mdiWebfontUrl})`);

From e1484707839e97da3b2882b0a867099ceeebe574 Mon Sep 17 00:00:00 2001
From: Daniel Kastl <daniel@georepublic.de>
Date: Thu, 14 Nov 2024 17:17:00 +0900
Subject: [PATCH 07/17] Replace text link with sprite icon for 'add' in GTT map
 layers index view

---
 app/views/gtt_map_layers/index.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/gtt_map_layers/index.html.erb b/app/views/gtt_map_layers/index.html.erb
index b839220..62cb8bc 100644
--- a/app/views/gtt_map_layers/index.html.erb
+++ b/app/views/gtt_map_layers/index.html.erb
@@ -1,5 +1,5 @@
 <div class="contextual">
-<%= link_to t('map_layer.new'), new_gtt_map_layer_path, :class => 'icon icon-add' %>
+<%= link_to sprite_icon('add', t('map_layer.new')), new_gtt_map_layer_path, :class => 'icon icon-add' %>
 </div>
 
 <%= title t('map_layer.plural') %>

From 67a1f2b28f9adb17ffa0214ac599450e672bb7c0 Mon Sep 17 00:00:00 2001
From: Daniel Kastl <daniel@georepublic.de>
Date: Sat, 16 Nov 2024 23:14:50 +0900
Subject: [PATCH 08/17] Fixes missing font and wrong path issue

---
 src/styles/icons/custom/custom-icons-def.ts | 36 ++++++++++++++-------
 src/styles/icons/custom/custom-icons.css    |  4 +--
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/src/styles/icons/custom/custom-icons-def.ts b/src/styles/icons/custom/custom-icons-def.ts
index 31f7c18..55e8bc3 100644
--- a/src/styles/icons/custom/custom-icons-def.ts
+++ b/src/styles/icons/custom/custom-icons-def.ts
@@ -13,18 +13,32 @@ const customIconsMeta = document.querySelector('meta[name="gtt-font-custom-icons
 const customIconsUrl = customIconsMeta ? customIconsMeta.getAttribute('content') : 'data:application/font-woff2;base64,'; // Provide a data URL for an empty font
 
 // Dynamically create the @font-face rule
-const style = document.createElement('style');
-style.type = 'text/css';
-style.innerHTML = `
-  @font-face {
-    font-family: 'custom-icons';
-    font-style: normal;
-    font-weight: 400;
-    font-display: block;
-    src: url(${customIconsUrl}) format('woff2');
+if (customIconsUrl) {
+  // Remove the existing @font-face rule
+  const styleSheets = document.styleSheets;
+  for (let i = 0; i < styleSheets.length; i++) {
+    const cssRules = styleSheets[i].cssRules || styleSheets[i].rules;
+    for (let j = 0; j < cssRules.length; j++) {
+      const rule = cssRules[j];
+      if (rule instanceof CSSFontFaceRule && rule.style.fontFamily === 'custom-icons') {
+        styleSheets[i].deleteRule(j);
+        break;
+      }
+    }
   }
-`;
-document.head.appendChild(style);
+
+  const style = document.createElement('style');
+  style.innerHTML = `
+    @font-face {
+      font-family: 'custom-icons';
+      font-style: normal;
+      font-weight: 400;
+      font-display: block;
+      src: url(${customIconsUrl}) format('woff2');
+    }
+  `;
+  document.head.appendChild(style);
+}
 
 // Define the font face
 let customFont: FontFace;
diff --git a/src/styles/icons/custom/custom-icons.css b/src/styles/icons/custom/custom-icons.css
index 611b1ef..fb9e08f 100644
--- a/src/styles/icons/custom/custom-icons.css
+++ b/src/styles/icons/custom/custom-icons.css
@@ -1,10 +1,10 @@
-/* @font-face {
+@font-face {
   font-family: "custom-icons";
   font-style: normal;
   font-weight: 400;
   font-display: block;
   src: url("./custom-icons.woff2") format("woff2");
-} */
+}
 
 .custom-icons {
   font-weight: normal;

From c221b8b1f6529df68e353060670afd92d0a5c1d1 Mon Sep 17 00:00:00 2001
From: Daniel Kastl <daniel@georepublic.de>
Date: Sat, 16 Nov 2024 23:15:34 +0900
Subject: [PATCH 09/17] Add SVG icon for GTT map and update admin menu icon
 reference

---
 config/icon_source.yml      |  2 ++
 init.rb                     |  3 ++-
 src/styles/images/icons.svg | 10 ++++++++++
 src/styles/scss/app.scss    | 10 ++++++----
 4 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 config/icon_source.yml
 create mode 100644 src/styles/images/icons.svg

diff --git a/config/icon_source.yml b/config/icon_source.yml
new file mode 100644
index 0000000..0b4a728
--- /dev/null
+++ b/config/icon_source.yml
@@ -0,0 +1,2 @@
+- name: gtt-map
+  svg: map
diff --git a/init.rb b/init.rb
index 2f33f2a..81c4e8a 100644
--- a/init.rb
+++ b/init.rb
@@ -42,7 +42,8 @@
   menu :admin_menu,
     :gtt_map_layers,
     { controller: 'gtt_map_layers', action: 'index' },
-    caption: :'map_layer.plural', html: { class: 'icon icon-gtt-map' }
+    caption: :'map_layer.plural', html: { class: 'icon icon-gtt-map' },
+    :icon => 'gtt-map', :plugin => :redmine_gtt
 end
 
 # Register MIME Types
diff --git a/src/styles/images/icons.svg b/src/styles/images/icons.svg
new file mode 100644
index 0000000..870a251
--- /dev/null
+++ b/src/styles/images/icons.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" class="icon--sprite">
+  <defs>
+    <symbol viewBox="0 0 24 24" stroke-linecap="round" stroke-linejoin="round" id="icon--gtt-map">
+      <path d="M3 7l6 -3l6 3l6 -3v13l-6 3l-6 -3l-6 3v-13"/>
+      <path d="M9 4v13"/>
+      <path d="M15 7v13"/>
+    </symbol>
+  </defs>
+</svg>
diff --git a/src/styles/scss/app.scss b/src/styles/scss/app.scss
index 03e1ef4..0b6c220 100644
--- a/src/styles/scss/app.scss
+++ b/src/styles/scss/app.scss
@@ -139,10 +139,12 @@ div.ol-rotate {
 // map.png icon as data URI
 $data-uri: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAK2SURBVBgZBcHLjxN1AADg79eZttvddttll+WxIGrAV4QYTbxoYsSLgjc5arx68qCGf8G7J+NBEg8e9GqURDEmEiOJAWNUwIi8sryWDbSdmc60Mx2/Lxw78caZ1fXVo1EUAYAAACAIgICymrt/7/6P8er66tHPPzklNIJyPgNAENRqAWSzBEFdN9TzWq3y0ckPj8ZRFKmUwuxL6fcXrJzJbJ18xFKv6/LlX1xMP3Nra6jXW3Z3eyiKm0Zp7t1jtWYcaQAMh9uGT7eMkkR2+m9JcluSJEJxQTEZm2Rj00liMkmUeSqEOYI4APr9ndQzi+/v4OPz2m+tWd+zV2d2xaQ8pDfoaUUNcbMlyXIhFAgaQDAcDiXJ2MP1ymilNPn6X6q5OvvZrEhk49SsyBR5alpkQqhBDNDvr1PPDPrLhu89Y+XTbeUre7TXCo9MtzW7+y22I81W0zibYkSgQQB5XkiTzHA0NF6qPHiC/Iv/1FWuMf1WPklMi1SeJubTVABBHACdzkB3OdVfXgbNtx/V+eCsuDpg7+pf8s7ERvcP7daW6eSaqPGOgDgAxsNUkhRI/bZ5x41Zw66DlSdPXbZ5PLUr+kYx+slg8Yj2uW1hNRPQEIKA5cFuFgZ+z0rXpk2DwU53XjtgX7xisrXXoDuycX1B54dLbrQqdbMFYqjr2rmbV13YvKTb7cnzXJKkkqLw61MNh7+6Ijl/3eZK0+3nHzdqBvtbbRAHZGVqq5ppt7qWOn15MdVd6Or/ed2+W5lWkwfPHnbzsZZ2e8HStKCuQUwQQkPPsknItKuOxdC16+I9rc2Jqy8dURxMvHz2oX/27xa1m5irZqWAuCwrVVXZ2PGcjVUCCMIhvMpaCCC8OPdCNBMttESNSDWvlFUlvHni+Hc719dej5oxggAIAAAIAIGyrGzd3Tr9P5JrNp8Zt4rCAAAAAElFTkSuQmCC');
 
-#admin-menu a.gtt,
-#admin-menu a.gtt-tile-sources,
-.icon-gtt-map {
-  background-image: $data-uri;
+/** SVG icons */
+.icon-gtt-map:not(:has(svg)) { background-image: $data-uri; }
+
+// to make webpack copy the SVG file to the output directory
+.dummy-svg-sprite {
+  background-image: url('../images/icons.svg');
 }
 
 div.usermap h3 {

From 6a85b82979df5def4c16074e7b37f6b08e35206b Mon Sep 17 00:00:00 2001
From: Daniel Kastl <daniel@georepublic.de>
Date: Sat, 16 Nov 2024 23:35:26 +0900
Subject: [PATCH 10/17] Moves Javascript and HTML to partial views Cleans up
 hooks Fixes issue with file uploader

---
 .../_view_layouts_base_body_bottom.html.erb   | 24 ++++++++++
 .../_view_layouts_base_html_head.html.erb     |  7 +++
 config/routes.rb                              |  1 +
 lib/redmine_gtt/view_hooks.rb                 | 47 ++-----------------
 4 files changed, 36 insertions(+), 43 deletions(-)
 create mode 100644 app/views/redmine_gtt/hooks/_view_layouts_base_html_head.html.erb

diff --git a/app/views/redmine_gtt/hooks/_view_layouts_base_body_bottom.html.erb b/app/views/redmine_gtt/hooks/_view_layouts_base_body_bottom.html.erb
index 8fd6153..7f41413 100644
--- a/app/views/redmine_gtt/hooks/_view_layouts_base_body_bottom.html.erb
+++ b/app/views/redmine_gtt/hooks/_view_layouts_base_body_bottom.html.erb
@@ -2,3 +2,27 @@
   <textarea name="<%= l(:title_geojson_upload) %>" placeholder="<%= l(:placeholder_geojson_upload) %>" class="ui-widget ui-state-default ui-corner-all"></textarea>
   <input type="file" id="file-selector" accept=".json,.geojson">
 </div>
+
+<%= javascript_include_tag 'main', plugin: 'redmine_gtt' %>
+
+<% geocoder = { enabled: false } %>
+
+<% if Setting.plugin_redmine_gtt['enable_geocoding_on_map'] == 'true' %>
+  <% geocoder = {
+    enabled: true,
+    provider: Setting.plugin_redmine_gtt['default_geocoder_provider'],
+    options: (JSON.parse(Setting.plugin_redmine_gtt['default_geocoder_options']) rescue {})
+  } %>
+<% end %>
+
+<%= tag.div data: {
+  lon: Setting.plugin_redmine_gtt['default_map_center_longitude'],
+  lat: Setting.plugin_redmine_gtt['default_map_center_latitude'],
+  zoom: Setting.plugin_redmine_gtt['default_map_zoom_level'],
+  maxzoom: Setting.plugin_redmine_gtt['default_map_maxzoom_level'],
+  vector_minzoom: Setting.plugin_redmine_gtt['vector_minzoom_level'],
+  fit_maxzoom: Setting.plugin_redmine_gtt['default_map_fit_maxzoom_level'],
+  geocoder: geocoder,
+  plugin_settings: Setting.plugin_redmine_gtt.select { |key, value| key.to_s.match(/^(?!default).+/) },
+  i18n: l(:gtt_js).to_json.html_safe
+}, id: 'gtt-defaults', style: 'display:none' %>
diff --git a/app/views/redmine_gtt/hooks/_view_layouts_base_html_head.html.erb b/app/views/redmine_gtt/hooks/_view_layouts_base_html_head.html.erb
new file mode 100644
index 0000000..089c27c
--- /dev/null
+++ b/app/views/redmine_gtt/hooks/_view_layouts_base_html_head.html.erb
@@ -0,0 +1,7 @@
+<%= tag.meta(
+  name: 'gtt-font-custom-icons',
+  content: asset_path('plugin_assets/redmine_gtt/custom-icons.woff2')) %>
+
+<%= tag.meta(
+  name: 'gtt-font-mdi-webfont',
+  content: asset_path('plugin_assets/redmine_gtt/materialdesignicons-webfont.woff2')) %>
diff --git a/config/routes.rb b/config/routes.rb
index 712bf47..856e85c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -6,6 +6,7 @@
   to: 'projects#update_gtt_configuration',
   as: :update_gtt_configuration
 
+# Todo: check if this route should start with "/assets" for consistency
 get '/plugin_assets/redmine_gtt/javascripts/index.js.map', to: 'gtt#map'
 
 scope 'gtt' do
diff --git a/lib/redmine_gtt/view_hooks.rb b/lib/redmine_gtt/view_hooks.rb
index 2de16b9..bf9679a 100644
--- a/lib/redmine_gtt/view_hooks.rb
+++ b/lib/redmine_gtt/view_hooks.rb
@@ -1,11 +1,10 @@
 module RedmineGtt
   class ViewHooks < Redmine::Hook::ViewListener
-
     include ActionView::Context
 
     # Render partials in various views
     render_on :view_account_left_bottom,
-    partial: 'redmine_gtt/hooks/view_account_left_bottom'
+      partial: 'redmine_gtt/hooks/view_account_left_bottom'
 
     render_on :view_my_account,
       partial: 'redmine_gtt/hooks/view_my_account'
@@ -16,48 +15,10 @@ class ViewHooks < Redmine::Hook::ViewListener
     render_on :view_issues_form_details_top,
       partial: 'redmine_gtt/hooks/view_issues_form_details_top'
 
+    render_on :view_layouts_base_html_head,
+      partial: 'redmine_gtt/hooks/view_layouts_base_html_head'
+
     render_on :view_layouts_base_body_bottom,
       partial: 'redmine_gtt/hooks/view_layouts_base_body_bottom'
-
-    # Add meta tags to the HTML head to inform about available fonts with their URL including the digest
-    def view_layouts_base_html_head(context={})
-      tags = []
-      tags << tag.meta(:name => 'gtt-font-custom-icons', :content => asset_path('plugin_assets/redmine_gtt/custom-icons.woff2'))
-      tags << tag.meta(:name => 'gtt-font-mdi-webfont', :content => asset_path('plugin_assets/redmine_gtt/materialdesignicons-webfont.woff2'))
-      return tags.join("\n")
-    end
-
-    # Add JavaScript and data tags to the body bottom
-    def view_layouts_base_body_bottom(context={})
-      tags = [];
-
-      tags << javascript_include_tag('main', :plugin => 'redmine_gtt')
-
-      geocoder = {
-        enabled: false
-      }
-
-      if Setting.plugin_redmine_gtt['enable_geocoding_on_map'] == 'true'
-        geocoder = {
-          enabled: true,
-          provider: Setting.plugin_redmine_gtt['default_geocoder_provider'],
-          options: (JSON.parse(Setting.plugin_redmine_gtt['default_geocoder_options']) rescue {})
-        }
-      end
-
-      tags.push(tag.div :data => {
-        :lon => Setting.plugin_redmine_gtt['default_map_center_longitude'],
-        :lat => Setting.plugin_redmine_gtt['default_map_center_latitude'],
-        :zoom => Setting.plugin_redmine_gtt['default_map_zoom_level'],
-        :maxzoom => Setting.plugin_redmine_gtt['default_map_maxzoom_level'],
-        :vector_minzoom => Setting.plugin_redmine_gtt['vector_minzoom_level'],
-        :fit_maxzoom => Setting.plugin_redmine_gtt['default_map_fit_maxzoom_level'],
-        :geocoder => geocoder,
-        :plugin_settings => Setting.plugin_redmine_gtt.select{ |key, value| key.to_s.match(/^(?!default).+/) },
-        :i18n => l(:gtt_js).to_json.html_safe
-      }, :id => 'gtt-defaults', :style => 'display:none')
-
-      return tags.join("\n")
-    end
   end
 end

From e4ea28ece54c89345dc3234cc5c3f2d740678c8e Mon Sep 17 00:00:00 2001
From: Ko Nagase <nagase@georepublic.co.jp>
Date: Sun, 17 Nov 2024 15:55:49 +0900
Subject: [PATCH 11/17] Try to support Redmine 5

---
 app/views/gtt_map_layers/index.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/gtt_map_layers/index.html.erb b/app/views/gtt_map_layers/index.html.erb
index 62cb8bc..bddee86 100644
--- a/app/views/gtt_map_layers/index.html.erb
+++ b/app/views/gtt_map_layers/index.html.erb
@@ -1,5 +1,5 @@
 <div class="contextual">
-<%= link_to sprite_icon('add', t('map_layer.new')), new_gtt_map_layer_path, :class => 'icon icon-add' %>
+<%= link_to (Redmine::VERSION.to_s >= '6.0.0') ? sprite_icon('add', t('map_layer.new')) : t('map_layer.new'), new_gtt_map_layer_path, :class => 'icon icon-add' %>
 </div>
 
 <%= title t('map_layer.plural') %>

From 2184bb4a2b8203e783c75e6dbeaf701b53c8c3d2 Mon Sep 17 00:00:00 2001
From: Ko Nagase <nagase@georepublic.co.jp>
Date: Sun, 17 Nov 2024 16:07:36 +0900
Subject: [PATCH 12/17] Update CI to support Redmine 6

---
 .github/workflows/test-postgis.yml | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/test-postgis.yml b/.github/workflows/test-postgis.yml
index aa73522..706ced2 100644
--- a/.github/workflows/test-postgis.yml
+++ b/.github/workflows/test-postgis.yml
@@ -25,16 +25,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        redmine_version: [5.0-stable, 5.1-stable, master]
-        ruby_version: ['3.0', '3.1', '3.2']
-        db_version: [12-3.4, 16-3.4]
+        redmine_version: [5.1-stable, 6.0-stable, master]
+        ruby_version: ['3.1', '3.2', '3.3']
+        db_version: [13-3.4, 17-3.5]
         include:
           - system_test: true
-            redmine_version: 5.1-stable
-            ruby_version: '3.2'
+            redmine_version: 6.0-stable
+            ruby_version: '3.3'
         exclude:
-          - redmine_version: 5.0-stable
-            ruby_version: '3.2'
+          - redmine_version: 5.1-stable
+            ruby_version: '3.3'
           - redmine_version: master
 
     services:
@@ -106,8 +106,9 @@ jobs:
       - name: Adjust Gem environment
         run: |
           case "${{ matrix.redmine_version }}" in
-            master)
-              echo "GEM_ACTIVERECORD_POSTGIS_ADAPTER_VERSION=9.0.1" >> ${GITHUB_ENV}
+            5.1-stable)
+              echo "GEM_RGEO_ACTIVERECORD_VERSION=7.0.1" >> ${GITHUB_ENV}
+              echo "GEM_ACTIVERECORD_POSTGIS_ADAPTER_VERSION=7.1.1" >> ${GITHUB_ENV}
               ;;
           esac
 
@@ -142,11 +143,11 @@ jobs:
           GOOGLE_CHROME_OPTS_ARGS: "headless,disable-gpu,no-sandbox,disable-dev-shm-usage"
         working-directory: redmine
         run: |
-          bundle exec rake redmine:plugins:test:units NAME=${{ env.PLUGIN_NAME }} RUBYOPT="-W0"
-          bundle exec rake redmine:plugins:test:functionals NAME=${{ env.PLUGIN_NAME }} RUBYOPT="-W0"
-          bundle exec rake redmine:plugins:test:integration NAME=${{ env.PLUGIN_NAME }} RUBYOPT="-W0"
+          bundle exec rails test plugins/redmine_gtt/test/unit
+          bundle exec rails test plugins/redmine_gtt/test/functional
+          bundle exec rails test plugins/redmine_gtt/test/integration
           if [ ${{ matrix.system_test }} = "true" ]; then
-            bundle exec rake redmine:plugins:test:system NAME=${{ env.PLUGIN_NAME }} RUBYOPT="-W0"
+            bundle exec rails test plugins/redmine_gtt/test/system
           fi
 
       - name: Run uninstall test

From 15edab6cd3c21fcd08b0f03e5e28a8673e31b9eb Mon Sep 17 00:00:00 2001
From: Daniel Kastl <daniel@georepublic.de>
Date: Sun, 17 Nov 2024 21:07:09 +0900
Subject: [PATCH 13/17] Require at least Redmine 5.1

---
 init.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.rb b/init.rb
index 81c4e8a..5a2ad55 100644
--- a/init.rb
+++ b/init.rb
@@ -8,7 +8,7 @@
   description 'Adds location-based task management and maps'
   version '6.0.0'
 
-  requires_redmine :version_or_higher => '5.0.0'
+  requires_redmine :version_or_higher => '5.1.0'
 
   project_module :gtt do
     permission :manage_gtt_settings, {

From ac73be26e07a3ad32be3a6c7223d63c78e84d585 Mon Sep 17 00:00:00 2001
From: Daniel Kastl <daniel@georepublic.de>
Date: Mon, 18 Nov 2024 17:03:55 +0900
Subject: [PATCH 14/17] Updates API templates for issue, project and user

---
 app/views/issues/show.api.rsb    | 2 ++
 app/views/projects/index.api.rsb | 1 +
 app/views/users/index.api.rsb    | 6 ++++++
 app/views/users/show.api.rsb     | 5 +++++
 4 files changed, 14 insertions(+)

diff --git a/app/views/issues/show.api.rsb b/app/views/issues/show.api.rsb
index 7df837f..40d9389 100644
--- a/app/views/issues/show.api.rsb
+++ b/app/views/issues/show.api.rsb
@@ -65,6 +65,8 @@ api.issue do
         api.user(:id => journal.user_id, :name => journal.user.name) unless journal.user.nil?
         api.notes journal.notes
         api.created_on journal.created_on
+        api.updated_on journal.updated_on
+        api.updated_by(:id => journal.updated_by.id, :name => journal.updated_by.name) unless journal.updated_by.nil?
         api.private_notes journal.private_notes
         api.array :details do
           journal.visible_details.each do |detail|
diff --git a/app/views/projects/index.api.rsb b/app/views/projects/index.api.rsb
index 9d517f5..3818f7b 100644
--- a/app/views/projects/index.api.rsb
+++ b/app/views/projects/index.api.rsb
@@ -5,6 +5,7 @@ api.array :projects, api_meta(:total_count => @project_count, :offset => @offset
       api.name        project.name
       api.identifier  project.identifier
       api.description project.description
+      api.homepage    project.homepage
       api.parent(:id => project.parent.id, :name => project.parent.name) if project.parent && project.parent.visible?
       api.status      project.status
       api.is_public   project.is_public?
diff --git a/app/views/users/index.api.rsb b/app/views/users/index.api.rsb
index 2145332..590499a 100644
--- a/app/views/users/index.api.rsb
+++ b/app/views/users/index.api.rsb
@@ -13,6 +13,7 @@ api.array :users, api_meta(:total_count => @user_count, :offset => @offset, :lim
       api.passwd_changed_on user.passwd_changed_on
       api.avatar_url gravatar_url(user.mail, {rating: nil, size: nil, default: Setting.gravatar_default}) if Setting.gravatar_enabled?
       api.twofa_scheme user.twofa_scheme
+      api.status user.status
 
       if user.geom
         api.geojson (params[:format] == "json") ? user.geojson : user.geojson.to_json
@@ -20,6 +21,11 @@ api.array :users, api_meta(:total_count => @user_count, :offset => @offset, :lim
         api.geojson nil
       end
 
+      api.auth_source do
+        api.id user.auth_source.id
+        api.name user.auth_source.name
+      end if include_in_api_response?('auth_source') && user.auth_source.present?
+
       render_api_custom_values user.visible_custom_field_values, api
     end
   end
diff --git a/app/views/users/show.api.rsb b/app/views/users/show.api.rsb
index f4f0d56..1d838f7 100644
--- a/app/views/users/show.api.rsb
+++ b/app/views/users/show.api.rsb
@@ -22,6 +22,11 @@ api.user do
 
   render_api_custom_values @user.visible_custom_field_values, api
 
+  api.auth_source do
+    api.id @user.auth_source.id
+    api.name @user.auth_source.name
+  end if User.current.admin? && include_in_api_response?('auth_source') && @user.auth_source.present?
+
   api.array :groups do |groups|
     @user.groups.each do |group|
       api.group :id => group.id, :name => group.name

From fb0a3cf3adc3824e745737f03e9e34647b92496b Mon Sep 17 00:00:00 2001
From: Daniel Kastl <daniel@georepublic.de>
Date: Mon, 18 Nov 2024 17:38:48 +0900
Subject: [PATCH 15/17] Update README to reflect minimum requirements for
 Redmine and PostgreSQL

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 3c71c62..c11fb3b 100644
--- a/README.md
+++ b/README.md
@@ -17,8 +17,8 @@ The Geo-Task-Tracker (GTT) plugin adds spatial capabilities to Redmine:
 Redmine GTT plugins **require PostgreSQL/PostGIS** and will not work with SQLite
 or MariaDB/MySQL!!!
 
-- Redmine >= 5.0.0
-- PostgreSQL >= 12
+- Redmine >= 5.1.0
+- PostgreSQL >= 13
 - PostGIS >= 3.0
 - NodeJS v18
 - yarn

From 9cbee400647fdcc383782ad36fa7178d85ccd41c Mon Sep 17 00:00:00 2001
From: Daniel Kastl <daniel@georepublic.de>
Date: Tue, 19 Nov 2024 11:46:49 +0900
Subject: [PATCH 16/17] Refactor initialization logic after dropping support
 for Redmine 4

---
 init.rb | 39 +++++++--------------------------------
 1 file changed, 7 insertions(+), 32 deletions(-)

diff --git a/init.rb b/init.rb
index 5a2ad55..955d765 100644
--- a/init.rb
+++ b/init.rb
@@ -56,37 +56,12 @@
   config.register RGeo::Cartesian.preferred_factory(has_z_coordinate: true, srid: 4326), geo_type: 'geometry', sql_type: "geometry", srid: 4326
 end
 
-if Rails.version > '6.0' && Rails.autoloaders.zeitwerk_enabled?
-  Dir.glob("#{Rails.root}/plugins/redmine_gtt/app/overrides/**/*.rb").each do |path|
-    Rails.autoloaders.main.ignore(path)
-    require path
-  end
-  RedmineGtt.setup_normal_patches
-  Rails.application.config.after_initialize do
-    RedmineGtt.setup_controller_patches
-  end
-else
-  require 'redmine_gtt'
-  # Configure View Overrides
-  Rails.application.paths["app/overrides"] ||= []
-  Rails.application.paths["app/overrides"] << File.expand_path("../app/overrides", __FILE__)
-
-  ActiveSupport::Reloader.to_prepare do
-    RedmineGtt.setup_normal_patches
-
-    # ActiveRecord::Base.include_root_in_json = true
-    # module RGeo
-    #   module Feature
-    #     module Point
-    #       def as_json(params)
-    #         ::RGeo::GeoJSON.encode(self)
-    #       end
-    #     end
-    #   end
-    # end
-  end
+Dir.glob("#{Rails.root}/plugins/redmine_gtt/app/overrides/**/*.rb").each do |path|
+  Rails.autoloaders.main.ignore(path)
+  require path
+end
 
-  Rails.configuration.to_prepare do
-    RedmineGtt.setup_controller_patches
-  end
+RedmineGtt.setup_normal_patches
+Rails.application.config.after_initialize do
+  RedmineGtt.setup_controller_patches
 end

From f6890eb11a8b4539f135fe690933fb9942f3f233 Mon Sep 17 00:00:00 2001
From: Daniel Kastl <daniel@georepublic.de>
Date: Tue, 19 Nov 2024 17:08:40 +0900
Subject: [PATCH 17/17] Update package dependencies to latest versions

---
 package.json |  12 +--
 yarn.lock    | 296 +++++++++++++++++++++++++++++++++++++--------------
 2 files changed, 225 insertions(+), 83 deletions(-)

diff --git a/package.json b/package.json
index cafec5d..7f6867e 100644
--- a/package.json
+++ b/package.json
@@ -22,11 +22,11 @@
   "dependencies": {
     "@juggle/resize-observer": "^3.4.0",
     "@mdi/font": "^7.4.47",
-    "dompurify": "^3.1.7",
+    "dompurify": "^3.2.0",
     "fontfaceobserver": "^2.3.0",
     "geojson": "^0.5.0",
     "ol": "^10.2.1",
-    "ol-ext": "^4.0.23",
+    "ol-ext": "^4.0.24",
     "ol-mapbox-style": "^12.3.5"
   },
   "devDependencies": {
@@ -34,16 +34,16 @@
     "@types/fontfaceobserver": "^2.1.3",
     "@types/geojson": "^7946.0.14",
     "@types/google.maps": "^3.58.1",
-    "@types/jquery": "^3.5.31",
+    "@types/jquery": "^3.5.3",
     "@types/jqueryui": "^1.12.23",
     "@types/ol-ext": "npm:@siedlerchr/types-ol-ext",
     "css-loader": "^7.1.2",
-    "sass": "^1.79.4",
-    "sass-loader": "^16.0.2",
+    "sass": "^1.81.0",
+    "sass-loader": "^16.0.3",
     "style-loader": "^4.0.0",
     "ts-loader": "^9.5.1",
     "typescript": "^5.6.3",
-    "webpack": "^5.95.0",
+    "webpack": "^5.96.1",
     "webpack-cli": "^5.1.4"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index e891409..1866dfd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -104,6 +104,95 @@
   resolved "https://registry.yarnpkg.com/@mdi/font/-/font-7.4.47.tgz#2ae522867da3a5c88b738d54b403eb91471903af"
   integrity sha512-43MtGpd585SNzHZPcYowu/84Vz2a2g31TvPMTm9uTiCSWzaheQySUcSyUH/46fPnuPQWof2yd0pGBtzee/IQWw==
 
+"@parcel/watcher-android-arm64@2.5.0":
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.0.tgz#e32d3dda6647791ee930556aee206fcd5ea0fb7a"
+  integrity sha512-qlX4eS28bUcQCdribHkg/herLe+0A9RyYC+mm2PXpncit8z5b3nSqGVzMNR3CmtAOgRutiZ02eIJJgP/b1iEFQ==
+
+"@parcel/watcher-darwin-arm64@2.5.0":
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.0.tgz#0d9e680b7e9ec1c8f54944f1b945aa8755afb12f"
+  integrity sha512-hyZ3TANnzGfLpRA2s/4U1kbw2ZI4qGxaRJbBH2DCSREFfubMswheh8TeiC1sGZ3z2jUf3s37P0BBlrD3sjVTUw==
+
+"@parcel/watcher-darwin-x64@2.5.0":
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.0.tgz#f9f1d5ce9d5878d344f14ef1856b7a830c59d1bb"
+  integrity sha512-9rhlwd78saKf18fT869/poydQK8YqlU26TMiNg7AIu7eBp9adqbJZqmdFOsbZ5cnLp5XvRo9wcFmNHgHdWaGYA==
+
+"@parcel/watcher-freebsd-x64@2.5.0":
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.0.tgz#2b77f0c82d19e84ff4c21de6da7f7d096b1a7e82"
+  integrity sha512-syvfhZzyM8kErg3VF0xpV8dixJ+RzbUaaGaeb7uDuz0D3FK97/mZ5AJQ3XNnDsXX7KkFNtyQyFrXZzQIcN49Tw==
+
+"@parcel/watcher-linux-arm-glibc@2.5.0":
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.0.tgz#92ed322c56dbafa3d2545dcf2803334aee131e42"
+  integrity sha512-0VQY1K35DQET3dVYWpOaPFecqOT9dbuCfzjxoQyif1Wc574t3kOSkKevULddcR9znz1TcklCE7Ht6NIxjvTqLA==
+
+"@parcel/watcher-linux-arm-musl@2.5.0":
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.0.tgz#cd48e9bfde0cdbbd2ecd9accfc52967e22f849a4"
+  integrity sha512-6uHywSIzz8+vi2lAzFeltnYbdHsDm3iIB57d4g5oaB9vKwjb6N6dRIgZMujw4nm5r6v9/BQH0noq6DzHrqr2pA==
+
+"@parcel/watcher-linux-arm64-glibc@2.5.0":
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.0.tgz#7b81f6d5a442bb89fbabaf6c13573e94a46feb03"
+  integrity sha512-BfNjXwZKxBy4WibDb/LDCriWSKLz+jJRL3cM/DllnHH5QUyoiUNEp3GmL80ZqxeumoADfCCP19+qiYiC8gUBjA==
+
+"@parcel/watcher-linux-arm64-musl@2.5.0":
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.0.tgz#dcb8ff01077cdf59a18d9e0a4dff7a0cfe5fd732"
+  integrity sha512-S1qARKOphxfiBEkwLUbHjCY9BWPdWnW9j7f7Hb2jPplu8UZ3nes7zpPOW9bkLbHRvWM0WDTsjdOTUgW0xLBN1Q==
+
+"@parcel/watcher-linux-x64-glibc@2.5.0":
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.0.tgz#2e254600fda4e32d83942384d1106e1eed84494d"
+  integrity sha512-d9AOkusyXARkFD66S6zlGXyzx5RvY+chTP9Jp0ypSTC9d4lzyRs9ovGf/80VCxjKddcUvnsGwCHWuF2EoPgWjw==
+
+"@parcel/watcher-linux-x64-musl@2.5.0":
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.0.tgz#01fcea60fedbb3225af808d3f0a7b11229792eef"
+  integrity sha512-iqOC+GoTDoFyk/VYSFHwjHhYrk8bljW6zOhPuhi5t9ulqiYq1togGJB5e3PwYVFFfeVgc6pbz3JdQyDoBszVaA==
+
+"@parcel/watcher-win32-arm64@2.5.0":
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.0.tgz#87cdb16e0783e770197e52fb1dc027bb0c847154"
+  integrity sha512-twtft1d+JRNkM5YbmexfcH/N4znDtjgysFaV9zvZmmJezQsKpkfLYJ+JFV3uygugK6AtIM2oADPkB2AdhBrNig==
+
+"@parcel/watcher-win32-ia32@2.5.0":
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.0.tgz#778c39b56da33e045ba21c678c31a9f9d7c6b220"
+  integrity sha512-+rgpsNRKwo8A53elqbbHXdOMtY/tAtTzManTWShB5Kk54N8Q9mzNWV7tV+IbGueCbcj826MfWGU3mprWtuf1TA==
+
+"@parcel/watcher-win32-x64@2.5.0":
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.0.tgz#33873876d0bbc588aacce38e90d1d7480ce81cb7"
+  integrity sha512-lPrxve92zEHdgeff3aiu4gDOIt4u7sJYha6wbdEZDCDUhtjTsOMiaJzG5lMY4GkWH8p0fMmO2Ppq5G5XXG+DQw==
+
+"@parcel/watcher@^2.4.1":
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher/-/watcher-2.5.0.tgz#5c88818b12b8de4307a9d3e6dc3e28eba0dfbd10"
+  integrity sha512-i0GV1yJnm2n3Yq1qw6QrUrd/LI9bE8WEBOTtOkpCXHHdyN3TAGgqAK/DAT05z4fq2x04cARXt2pDmjWjL92iTQ==
+  dependencies:
+    detect-libc "^1.0.3"
+    is-glob "^4.0.3"
+    micromatch "^4.0.5"
+    node-addon-api "^7.0.0"
+  optionalDependencies:
+    "@parcel/watcher-android-arm64" "2.5.0"
+    "@parcel/watcher-darwin-arm64" "2.5.0"
+    "@parcel/watcher-darwin-x64" "2.5.0"
+    "@parcel/watcher-freebsd-x64" "2.5.0"
+    "@parcel/watcher-linux-arm-glibc" "2.5.0"
+    "@parcel/watcher-linux-arm-musl" "2.5.0"
+    "@parcel/watcher-linux-arm64-glibc" "2.5.0"
+    "@parcel/watcher-linux-arm64-musl" "2.5.0"
+    "@parcel/watcher-linux-x64-glibc" "2.5.0"
+    "@parcel/watcher-linux-x64-musl" "2.5.0"
+    "@parcel/watcher-win32-arm64" "2.5.0"
+    "@parcel/watcher-win32-ia32" "2.5.0"
+    "@parcel/watcher-win32-x64" "2.5.0"
+
 "@petamoriken/float16@^3.4.7":
   version "3.8.0"
   resolved "https://registry.npmjs.org/@petamoriken/float16/-/float16-3.8.0.tgz"
@@ -116,10 +205,26 @@
   dependencies:
     "@types/trusted-types" "*"
 
-"@types/estree@^1.0.5":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
-  integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
+"@types/eslint-scope@^3.7.7":
+  version "3.7.7"
+  resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.7.tgz#3108bd5f18b0cdb277c867b3dd449c9ed7079ac5"
+  integrity sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==
+  dependencies:
+    "@types/eslint" "*"
+    "@types/estree" "*"
+
+"@types/eslint@*":
+  version "9.6.1"
+  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-9.6.1.tgz#d5795ad732ce81715f27f75da913004a56751584"
+  integrity sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==
+  dependencies:
+    "@types/estree" "*"
+    "@types/json-schema" "*"
+
+"@types/estree@*", "@types/estree@^1.0.6":
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.6.tgz#628effeeae2064a1b4e79f78e81d87b7e5fc7b50"
+  integrity sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==
 
 "@types/fontfaceobserver@^2.1.3":
   version "2.1.3"
@@ -143,10 +248,10 @@
   dependencies:
     "@types/sizzle" "*"
 
-"@types/jquery@^3.5.31":
-  version "3.5.31"
-  resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.5.31.tgz#3605df86427f6c4e6b5b5a470ba180f74107cffa"
-  integrity sha512-rf/iB+cPJ/YZfMwr+FVuQbm7IaWC4y3FVYfVDxRGqmUCFjjPII0HWaP0vTPJGp6m4o13AXySCcMbWfrWtBFAKw==
+"@types/jquery@^3.5.3":
+  version "3.5.32"
+  resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.5.32.tgz#3eb0da20611b92c7c49ebed6163b52a4fdc57def"
+  integrity sha512-b9Xbf4CkMqS02YH8zACqN1xzdxc3cO735Qe5AbSUFmyOiaWAbcpqh9Wna+Uk0vgACvoQHpWDg2rGdHkYPLmCiQ==
   dependencies:
     "@types/sizzle" "*"
 
@@ -157,6 +262,11 @@
   dependencies:
     "@types/jquery" "*"
 
+"@types/json-schema@*":
+  version "7.0.15"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
+  integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
+
 "@types/json-schema@^7.0.8":
   version "7.0.11"
   resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz"
@@ -333,15 +443,10 @@
   resolved "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz"
   integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
-acorn-import-attributes@^1.9.5:
-  version "1.9.5"
-  resolved "https://registry.yarnpkg.com/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz#7eb1557b1ba05ef18b5ed0ec67591bfab04688ef"
-  integrity sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==
-
-acorn@^8.7.1:
-  version "8.8.2"
-  resolved "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz"
-  integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
+acorn@^8.14.0:
+  version "8.14.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.14.0.tgz#063e2c70cac5fb4f6467f0b11152e04c682795b0"
+  integrity sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==
 
 acorn@^8.8.2:
   version "8.11.3"
@@ -370,32 +475,32 @@ ansi-styles@^4.1.0:
   dependencies:
     color-convert "^2.0.1"
 
-braces@^3.0.2:
+braces@^3.0.2, braces@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
   integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
   dependencies:
     fill-range "^7.1.1"
 
-browserslist@^4.21.10:
-  version "4.22.3"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.22.3.tgz#299d11b7e947a6b843981392721169e27d60c5a6"
-  integrity sha512-UAp55yfwNv0klWNapjs/ktHoguxuQNGnOzxYmfnXIS+8AsRDZkSDxg7R1AX3GKzn078SBI5dzwzj/Yx0Or0e3A==
+browserslist@^4.24.0:
+  version "4.24.2"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.24.2.tgz#f5845bc91069dbd55ee89faf9822e1d885d16580"
+  integrity sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==
   dependencies:
-    caniuse-lite "^1.0.30001580"
-    electron-to-chromium "^1.4.648"
-    node-releases "^2.0.14"
-    update-browserslist-db "^1.0.13"
+    caniuse-lite "^1.0.30001669"
+    electron-to-chromium "^1.5.41"
+    node-releases "^2.0.18"
+    update-browserslist-db "^1.1.1"
 
 buffer-from@^1.0.0:
   version "1.1.2"
   resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz"
   integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
-caniuse-lite@^1.0.30001580:
-  version "1.0.30001584"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001584.tgz#5e3ea0625d048d5467670051687655b1f7bf7dfd"
-  integrity sha512-LOz7CCQ9M1G7OjJOF9/mzmqmj3jE/7VOmrfw6Mgs0E8cjOsbRXQJHsPBfmBOXDskXKrHLyyW3n7kpDW/4BsfpQ==
+caniuse-lite@^1.0.30001669:
+  version "1.0.30001680"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001680.tgz#5380ede637a33b9f9f1fc6045ea99bd142f3da5e"
+  integrity sha512-rPQy70G6AGUMnbwS1z6Xg+RkHYPAi18ihs47GH0jcxIG7wArmPgY3XbS2sRdBbxJljp3thdT8BIqv9ccCypiPA==
 
 chalk@^4.1.0:
   version "4.1.2"
@@ -506,20 +611,25 @@ cssesc@^3.0.0:
   resolved "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz"
   integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
 
-dompurify@^3.1.7:
-  version "3.1.7"
-  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.1.7.tgz#711a8c96479fb6ced93453732c160c3c72418a6a"
-  integrity sha512-VaTstWtsneJY8xzy7DekmYWEOZcmzIe3Qb3zPd4STve1OBTa+e+WmS1ITQec1fZYXI3HCsOZZiSMpG6oxoWMWQ==
+detect-libc@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+  integrity sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==
+
+dompurify@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.2.0.tgz#53c414317c51503183696fcdef6dd3f916c607ed"
+  integrity sha512-AMdOzK44oFWqHEi0wpOqix/fUNY707OmoeFDnbi3Q5I8uOpy21ufUA5cDJPr0bosxrflOVD/H2DMSvuGKJGfmQ==
 
 earcut@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/earcut/-/earcut-3.0.0.tgz#a8d5bf891224eaea8287201b5e787c6c0318af89"
   integrity sha512-41Fs7Q/PLq1SDbqjsgcY7GA42T0jvaCNGXgGtsNdvg+Yv8eIu06bxv4/PoREkZ9nMDNwnUSG9OFB9+yv8eKhDg==
 
-electron-to-chromium@^1.4.648:
-  version "1.4.659"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.659.tgz#e93af8119b6610cb4d2614a47508a74543b96ce5"
-  integrity sha512-sRJ3nV3HowrYpBtPF9bASQV7OW49IgZC01Xiq43WfSE3RTCkK0/JidoCmR73Hyc1mN+l/H4Yqx0eNiomvExFZg==
+electron-to-chromium@^1.5.41:
+  version "1.5.63"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.63.tgz#69444d592fbbe628d129866c2355691ea93eda3e"
+  integrity sha512-ddeXKuY9BHo/mw145axlyWjlJ1UBt4WK3AlvkT7W2AbqfRQoacVoRUCF6wL3uIx/8wT9oLKXzI+rFqHHscByaA==
 
 enhanced-resolve@^5.0.0:
   version "5.14.0"
@@ -547,10 +657,10 @@ es-module-lexer@^1.2.1:
   resolved "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.2.1.tgz"
   integrity sha512-9978wrXM50Y4rTMmW5kXIC09ZdXQZqkE4mxhwkd8VbzsGkXGPgV4zWuqQJgCEzYngdo2dYDa0l8xhX4fkSwJSg==
 
-escalade@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz"
-  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
+escalade@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5"
+  integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==
 
 eslint-scope@5.1.1:
   version "5.1.1"
@@ -667,10 +777,10 @@ icss-utils@^5.0.0, icss-utils@^5.1.0:
   resolved "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz"
   integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==
 
-immutable@^4.0.0:
-  version "4.3.0"
-  resolved "https://registry.npmjs.org/immutable/-/immutable-4.3.0.tgz"
-  integrity sha512-0AOCmOip+xgJwEVTQj1EfiDDOkPmuyllDuTuEX+DDXUgapLAsBIfkg3sxCYyCEA8mQqZrrxPUGjcOQ2JS3WLkg==
+immutable@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-5.0.2.tgz#bb8a987349a73efbe6b3b292a9cbaf1b530d296b"
+  integrity sha512-1NU7hWZDkV7hJ4PJ9dur9gTNQ4ePNPN4k9/0YhwjzykTi/+3Q5pF93YU5QoVj8BuOnhLgaY8gs0U2pj4kSYVcw==
 
 import-local@^3.0.2:
   version "3.1.0"
@@ -692,6 +802,18 @@ is-core-module@^2.11.0:
   dependencies:
     has "^1.0.3"
 
+is-extglob@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
+
+is-glob@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
+  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
+  dependencies:
+    is-extglob "^2.1.1"
+
 is-number@^7.0.0:
   version "7.0.0"
   resolved "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"
@@ -785,6 +907,14 @@ micromatch@^4.0.0:
     braces "^3.0.2"
     picomatch "^2.3.1"
 
+micromatch@^4.0.5:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
+  integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
+  dependencies:
+    braces "^3.0.3"
+    picomatch "^2.3.1"
+
 mime-db@1.52.0:
   version "1.52.0"
   resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz"
@@ -812,15 +942,20 @@ neo-async@^2.6.2:
   resolved "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
-node-releases@^2.0.14:
-  version "2.0.14"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b"
-  integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==
+node-addon-api@^7.0.0:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-7.1.1.tgz#1aba6693b0f255258a049d621329329322aad558"
+  integrity sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==
+
+node-releases@^2.0.18:
+  version "2.0.18"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.18.tgz#f010e8d35e2fe8d6b2944f03f70213ecedc4ca3f"
+  integrity sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==
 
-ol-ext@^4.0.23:
-  version "4.0.23"
-  resolved "https://registry.yarnpkg.com/ol-ext/-/ol-ext-4.0.23.tgz#13b405451f7696ce4d0a6bd466ce5b6b69786c1b"
-  integrity sha512-g1TBIEC9je2SoPx0qz8w4emCIRcOhz87eYxeszoLSWm6HMAbCQcymjmEIqpOHxL+R9BVKs4ar5KJShobv6510g==
+ol-ext@^4.0.24:
+  version "4.0.24"
+  resolved "https://registry.yarnpkg.com/ol-ext/-/ol-ext-4.0.24.tgz#86f3bb662fc9932ee16481604b2cbce87d96d28f"
+  integrity sha512-VEf1+mjvbe35mMsszVsugqcvWfeGcU8TwS+GgXm3nGYqiHR7CckX2DWmM9B94QCDnrJWKKXBicfInbkoe2xT7w==
 
 ol-mapbox-style@^12.3.5:
   version "12.3.5"
@@ -899,6 +1034,11 @@ picocolors@^1.0.0:
   resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
+picocolors@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
+  integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
+
 picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"
@@ -1045,21 +1185,23 @@ safe-buffer@^5.1.0:
   resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
-sass-loader@^16.0.2:
-  version "16.0.2"
-  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-16.0.2.tgz#e581bc13d7cb5090e27f155c6aa2855c08cafe86"
-  integrity sha512-Ll6iXZ1EYwYT19SqW4mSBb76vSSi8JgzElmzIerhEGgzB5hRjDQIWsPmuk1UrAXkR16KJHqVY0eH+5/uw9Tmfw==
+sass-loader@^16.0.3:
+  version "16.0.3"
+  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-16.0.3.tgz#17b944fab6702dc7a52c5d2a88cbfa38c39cdc75"
+  integrity sha512-gosNorT1RCkuCMyihv6FBRR7BMV06oKRAs+l4UMp1mlcVg9rWN6KMmUj3igjQwmYys4mDP3etEYJgiHRbgHCHA==
   dependencies:
     neo-async "^2.6.2"
 
-sass@^1.79.4:
-  version "1.79.4"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.79.4.tgz#f9c45af35fbeb53d2c386850ec842098d9935267"
-  integrity sha512-K0QDSNPXgyqO4GZq2HO5Q70TLxTH6cIT59RdoCHMivrC8rqzaTw5ab9prjz9KUN1El4FLXrBXJhik61JR4HcGg==
+sass@^1.81.0:
+  version "1.81.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.81.0.tgz#a9010c0599867909dfdbad057e4a6fbdd5eec941"
+  integrity sha512-Q4fOxRfhmv3sqCLoGfvrC9pRV8btc0UtqL9mN6Yrv6Qi9ScL55CVH1vlPP863ISLEEMNLLuu9P+enCeGHlnzhA==
   dependencies:
     chokidar "^4.0.0"
-    immutable "^4.0.0"
+    immutable "^5.0.2"
     source-map-js ">=0.6.2 <2.0.0"
+  optionalDependencies:
+    "@parcel/watcher" "^2.4.1"
 
 schema-utils@^3.1.1:
   version "3.1.2"
@@ -1233,13 +1375,13 @@ typescript@^5.6.3:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.3.tgz#5f3449e31c9d94febb17de03cc081dd56d81db5b"
   integrity sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==
 
-update-browserslist-db@^1.0.13:
-  version "1.0.13"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4"
-  integrity sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==
+update-browserslist-db@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz#80846fba1d79e82547fb661f8d141e0945755fe5"
+  integrity sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==
   dependencies:
-    escalade "^3.1.1"
-    picocolors "^1.0.0"
+    escalade "^3.2.0"
+    picocolors "^1.1.0"
 
 uri-js@^4.2.2:
   version "4.4.1"
@@ -1298,18 +1440,18 @@ webpack-sources@^3.2.3:
   resolved "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz"
   integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
 
-webpack@^5.95.0:
-  version "5.95.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.95.0.tgz#8fd8c454fa60dad186fbe36c400a55848307b4c0"
-  integrity sha512-2t3XstrKULz41MNMBF+cJ97TyHdyQ8HCt//pqErqDvNjU9YQBnZxIHa11VXsi7F3mb5/aO2tuDxdeTPdU7xu9Q==
+webpack@^5.96.1:
+  version "5.96.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.96.1.tgz#3676d1626d8312b6b10d0c18cc049fba7ac01f0c"
+  integrity sha512-l2LlBSvVZGhL4ZrPwyr8+37AunkcYj5qh8o6u2/2rzoPc8gxFJkLj1WxNgooi9pnoc06jh0BjuXnamM4qlujZA==
   dependencies:
-    "@types/estree" "^1.0.5"
+    "@types/eslint-scope" "^3.7.7"
+    "@types/estree" "^1.0.6"
     "@webassemblyjs/ast" "^1.12.1"
     "@webassemblyjs/wasm-edit" "^1.12.1"
     "@webassemblyjs/wasm-parser" "^1.12.1"
-    acorn "^8.7.1"
-    acorn-import-attributes "^1.9.5"
-    browserslist "^4.21.10"
+    acorn "^8.14.0"
+    browserslist "^4.24.0"
     chrome-trace-event "^1.0.2"
     enhanced-resolve "^5.17.1"
     es-module-lexer "^1.2.1"