From 125b724c19c9b53a601154af9aaccd729b92e141 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alice=20R=C3=BChl?= <alice@developmentseed.org>
Date: Thu, 23 Jan 2025 11:01:53 +0100
Subject: [PATCH 1/6] Upgrade mapbox-gl to ^3.9.3 (from 2.15.0)

---
 package.json |   3 +-
 yarn.lock    | 130 ++++++++++++++++++++++++++++++++++-----------------
 2 files changed, 88 insertions(+), 45 deletions(-)

diff --git a/package.json b/package.json
index 8672f333d..384b5ec45 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,6 @@
     "@types/d3": "^7.4.0",
     "@types/geojson": "^7946.0.10",
     "@types/jest": "^29.5.14",
-    "@types/mapbox-gl": "^2.7.5",
     "@types/mdx": "^2.0.1",
     "@types/node": "^22.5.0",
     "@types/react": "18.0.32",
@@ -205,7 +204,7 @@
     "jotai-optics": "^0.3.1",
     "js-yaml": "^4.1.0",
     "lodash": "^4.17.21",
-    "mapbox-gl": "^2.15.0",
+    "mapbox-gl": "^3.9.3",
     "mapbox-gl-compare": "^0.4.0",
     "mapbox-gl-draw-rectangle-mode": "^1.0.4",
     "markdown-it": "^14.0.0",
diff --git a/yarn.lock b/yarn.lock
index 5799ee9b7..8138e904a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2271,14 +2271,6 @@
   resolved "http://verdaccio.ds.io:4873/@mapbox%2fgeojson-normalize/-/geojson-normalize-0.0.1.tgz#1da1e6b3a7add3ad29909b30f438f60581b7cd80"
   integrity sha1-HaHms6et060pkJsw9Dj2BYG3zYA=
 
-"@mapbox/geojson-rewind@^0.5.2":
-  version "0.5.2"
-  resolved "http://verdaccio.ds.io:4873/@mapbox%2fgeojson-rewind/-/geojson-rewind-0.5.2.tgz#591a5d71a9cd1da1a0bf3420b3bea31b0fc7946a"
-  integrity sha512-tJaT+RbYGJYStt7wI3cq4Nl4SXxG8W7JDG5DMJu97V25RnbNg3QtQtf+KD+VLjNpWKYsRvXDNmNrBgEETr1ifA==
-  dependencies:
-    get-stream "^6.0.1"
-    minimist "^1.2.6"
-
 "@mapbox/jsonlint-lines-primitives@^2.0.2", "@mapbox/jsonlint-lines-primitives@~2.0.2":
   version "2.0.2"
   resolved "http://verdaccio.ds.io:4873/@mapbox%2fjsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz#ce56e539f83552b58d10d672ea4d6fc9adc7b234"
@@ -2315,10 +2307,10 @@
     suggestions "^1.6.0"
     xtend "^4.0.1"
 
-"@mapbox/mapbox-gl-supported@^2.0.1":
-  version "2.0.1"
-  resolved "http://verdaccio.ds.io:4873/@mapbox%2fmapbox-gl-supported/-/mapbox-gl-supported-2.0.1.tgz#c15367178d8bfe4765e6b47b542fe821ce259c7b"
-  integrity sha512-HP6XvfNIzfoMVfyGjBckjiAOQK9WfX0ywdLubuPMPv+Vqf5fj0uCbgBQYpiqcWZT6cbyyRnTSXDheT1ugvF6UQ==
+"@mapbox/mapbox-gl-supported@^3.0.0":
+  version "3.0.0"
+  resolved "http://verdaccio.ds.io:4873/@mapbox%2fmapbox-gl-supported/-/mapbox-gl-supported-3.0.0.tgz#bebd3d5da3c1fd988011bb79718a39f63f5e16ac"
+  integrity sha512-2XghOwu16ZwPJLOFVuIOaLbN0iKMn867evzXFyf0P22dqugezfJwLmdanAgU25ITvz1TvOfVP4jsDImlDJzcWg==
 
 "@mapbox/mapbox-gl-sync-move@^0.3.0":
   version "0.3.0"
@@ -4645,6 +4637,13 @@
   resolved "http://verdaccio.ds.io:4873/@types%2fexpect/-/expect-1.20.4.tgz#8288e51737bf7e3ab5d7c77bfa695883745264e5"
   integrity sha512-Q5Vn3yjTDyCMV50TB6VRIbQNxSE4OmZR86VSbGaNpfUolm0iePBB4KdEEHmxoY5sT2+2DIvXW0rvMDP2nHZ4Mg==
 
+"@types/geojson-vt@^3.2.5":
+  version "3.2.5"
+  resolved "http://verdaccio.ds.io:4873/@types%2fgeojson-vt/-/geojson-vt-3.2.5.tgz#b6c356874991d9ab4207533476dfbcdb21e38408"
+  integrity sha512-qDO7wqtprzlpe8FfQ//ClPV9xiuoh2nkIgiouIptON9w5jvD/fA4szvP9GBlDVdJ5dldAl0kX/sy3URbWwLx0g==
+  dependencies:
+    "@types/geojson" "*"
+
 "@types/geojson@*", "@types/geojson@^7946.0.10":
   version "7946.0.10"
   resolved "http://verdaccio.ds.io:4873/@types%2fgeojson/-/geojson-7946.0.10.tgz#6dfbf5ea17142f7f9a043809f1cd4c448cb68249"
@@ -4655,6 +4654,11 @@
   resolved "http://verdaccio.ds.io:4873/@types%2fgeojson/-/geojson-7946.0.8.tgz#30744afdb385e2945e22f3b033f897f76b1f12ca"
   integrity sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA==
 
+"@types/geojson@^7946.0.15":
+  version "7946.0.15"
+  resolved "http://verdaccio.ds.io:4873/@types%2fgeojson/-/geojson-7946.0.15.tgz#f9d55fd5a0aa2de9dc80b1b04e437538b7298868"
+  integrity sha512-9oSxFzDCT2Rj6DfcHF8G++jxBKS7mBqXl5xrRW+Kbvjry6Uduya2iiwqHPhVXpasAVMBYKkEPGgKhd3+/HZ6xA==
+
 "@types/graceful-fs@^4.1.3":
   version "4.1.9"
   resolved "http://verdaccio.ds.io:4873/@types%2fgraceful-fs/-/graceful-fs-4.1.9.tgz#2a06bc0f68a20ab37b3e36aa238be6abdf49e8b4"
@@ -4752,12 +4756,19 @@
   dependencies:
     "@types/geojson" "*"
 
-"@types/mapbox-gl@^2.7.5":
-  version "2.7.5"
-  resolved "http://verdaccio.ds.io:4873/@types%2fmapbox-gl/-/mapbox-gl-2.7.5.tgz#9e31fc592adb2762e4e5c7727dca5ec367dfc780"
-  integrity sha512-T8gACm3oGKMlBo2l/9vnKEAxgCc0g2mr8g6dI1d3ZO6EzRe7JALBONlWRmc7SOHV79kiarkcdLdDVEnfd+jilA==
+"@types/mapbox__point-geometry@*", "@types/mapbox__point-geometry@^0.1.4":
+  version "0.1.4"
+  resolved "http://verdaccio.ds.io:4873/@types%2fmapbox__point-geometry/-/mapbox__point-geometry-0.1.4.tgz#0ef017b75eedce02ff6243b4189210e2e6d5e56d"
+  integrity sha512-mUWlSxAmYLfwnRBmgYV86tgYmMIICX4kza8YnE/eIlywGe2XoOxlpVnXWwir92xRLjwyarqwpu2EJKD2pk0IUA==
+
+"@types/mapbox__vector-tile@^1.3.4":
+  version "1.3.4"
+  resolved "http://verdaccio.ds.io:4873/@types%2fmapbox__vector-tile/-/mapbox__vector-tile-1.3.4.tgz#ad757441ef1d34628d9e098afd9c91423c1f8734"
+  integrity sha512-bpd8dRn9pr6xKvuEBQup8pwQfD4VUyqO/2deGjfpe6AwC8YRlyEipvefyRJUSiCJTZuCb8Pl1ciVV5ekqJ96Bg==
   dependencies:
     "@types/geojson" "*"
+    "@types/mapbox__point-geometry" "*"
+    "@types/pbf" "*"
 
 "@types/mdast@^3.0.0":
   version "3.0.10"
@@ -4818,6 +4829,11 @@
   resolved "http://verdaccio.ds.io:4873/@types%2fparse5/-/parse5-5.0.3.tgz#e7b5aebbac150f8b5fdd4a46e7f0bd8e65e19109"
   integrity sha512-kUNnecmtkunAoQ3CnjmMkzNU/gtxG8guhi+Fk2U/kOpIKjIMKnXGp4IJCgQJrXSgMsWYimYG4TGjz/UzbGEBTw==
 
+"@types/pbf@*", "@types/pbf@^3.0.5":
+  version "3.0.5"
+  resolved "http://verdaccio.ds.io:4873/@types%2fpbf/-/pbf-3.0.5.tgz#a9495a58d8c75be4ffe9a0bd749a307715c07404"
+  integrity sha512-j3pOPiEcWZ34R6a6mN07mUkM4o4Lwf6hPNt8eilOeZhTFbxFXmKhvXl9Y28jotFPaI1bpPDJsbCprUoNke6OrA==
+
 "@types/prop-types@*":
   version "15.7.5"
   resolved "http://verdaccio.ds.io:4873/@types%2fprop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf"
@@ -4870,6 +4886,13 @@
     "@types/react" "*"
     csstype "^3.0.2"
 
+"@types/supercluster@^7.1.3":
+  version "7.1.3"
+  resolved "http://verdaccio.ds.io:4873/@types%2fsupercluster/-/supercluster-7.1.3.tgz#1a1bc2401b09174d9c9e44124931ec7874a72b27"
+  integrity sha512-Z0pOY34GDFl3Q6hUFYf3HkTwKEE02e7QgtJppBt+beEAxnyOpJua+voGFvxINBHa06GwLFFym7gRPY2SiKIfIA==
+  dependencies:
+    "@types/geojson" "*"
+
 "@types/tough-cookie@*":
   version "4.0.5"
   resolved "http://verdaccio.ds.io:4873/@types%2ftough-cookie/-/tough-cookie-4.0.5.tgz#cb6e2a691b70cb177c6e3ae9c1d2e8b2ea8cd304"
@@ -6100,6 +6123,11 @@ chardet@^0.7.0:
   resolved "http://verdaccio.ds.io:4873/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
   integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
+cheap-ruler@^4.0.0:
+  version "4.0.0"
+  resolved "http://verdaccio.ds.io:4873/cheap-ruler/-/cheap-ruler-4.0.0.tgz#bdc984de7e0e3f748bdfd2dbe23ec6b9dc820a09"
+  integrity sha512-0BJa8f4t141BYKQyn9NSQt1PguFQXMXwZiA5shfoaBYHAb2fFk2RAX+tiWMoQU+Agtzt3mdt0JtuyshAXqZ+Vw==
+
 cheerio-select@^2.1.0:
   version "2.1.0"
   resolved "http://verdaccio.ds.io:4873/cheerio-select/-/cheerio-select-2.1.0.tgz#4d8673286b8126ca2a8e42740d5e3c4884ae21b4"
@@ -7721,10 +7749,10 @@ each-props@^1.3.2:
     is-plain-object "^2.0.1"
     object.defaults "^1.1.0"
 
-earcut@^2.2.4:
-  version "2.2.4"
-  resolved "http://verdaccio.ds.io:4873/earcut/-/earcut-2.2.4.tgz#6d02fd4d68160c114825d06890a92ecaae60343a"
-  integrity sha512-/pjZsA1b4RPHbeWZQn66SWS8nZZWLQQ23oE3Eam7aroEFGEvwKAsJfZ9ytiEMycfzXWpca4FA9QIOehf7PocBQ==
+earcut@^3.0.0:
+  version "3.0.1"
+  resolved "http://verdaccio.ds.io:4873/earcut/-/earcut-3.0.1.tgz#f60b3f671c5657cca9d3e131c5527c5dde00ef38"
+  integrity sha512-0l1/0gOjESMeQyYaK5IDiPNvFeu93Z/cO0TjZh9eZ1vyCtZnA7KMZ8rQggpsJHIbGSdrqYq9OhuveadOVHCshw==
 
 eastasianwidth@^0.2.0:
   version "0.2.0"
@@ -8826,10 +8854,10 @@ geojson-validation@^1.0.2:
   resolved "http://verdaccio.ds.io:4873/geojson-validation/-/geojson-validation-1.0.2.tgz#5c11a83afbec9a1cb9d76c73d47843dbd154d3ff"
   integrity sha512-K5jrJ4wFvORn2pRKeg181LL0QPYuEKn2KHPvfH1m2QtFlAXFLKdseqt0XwBM3ELOY7kNM1fglRQ6ZwUQZ5S00A==
 
-geojson-vt@^3.2.1:
-  version "3.2.1"
-  resolved "http://verdaccio.ds.io:4873/geojson-vt/-/geojson-vt-3.2.1.tgz#f8adb614d2c1d3f6ee7c4265cad4bbf3ad60c8b7"
-  integrity sha512-EvGQQi/zPrDA6zr6BnJD/YhwAkBP8nnJ9emh3EnHQKVMfg/MRVtPbMYdgVy/IaEmn4UfagD2a6fafPDL5hbtwg==
+geojson-vt@^4.0.2:
+  version "4.0.2"
+  resolved "http://verdaccio.ds.io:4873/geojson-vt/-/geojson-vt-4.0.2.tgz#1162f6c7d61a0ba305b1030621e6e111f847828a"
+  integrity sha512-AV9ROqlNqoZEIJGfm1ncNjEXfkz2hdFlZf0qkVfmkwdKa8vj7H16YUOT81rJw1rdFhyEDlN2Tds91p/glzbl5A==
 
 get-caller-file@^1.0.1:
   version "1.0.3"
@@ -11016,7 +11044,7 @@ just-debounce@^1.0.0:
   resolved "http://verdaccio.ds.io:4873/just-debounce/-/just-debounce-1.1.0.tgz#2f81a3ad4121a76bc7cb45dbf704c0d76a8e5ddf"
   integrity sha512-qpcRocdkUmf+UTNBYx5w6dexX5J31AKK1OmPwH630a83DdVVUIngk55RSAiIGpQyoH0dlr872VHfPjnQnK1qDQ==
 
-kdbush@^4.0.1, kdbush@^4.0.2:
+kdbush@^4.0.2:
   version "4.0.2"
   resolved "http://verdaccio.ds.io:4873/kdbush/-/kdbush-4.0.2.tgz#2f7b7246328b4657dd122b6c7f025fbc2c868e39"
   integrity sha512-WbCVYJ27Sz8zi9Q7Q0xHC+05iwkm3Znipc2XTlrnJbsHMYktW4hPhXUE8Ys1engBrvffoSCqbil1JQAa7clRpA==
@@ -11582,32 +11610,38 @@ mapbox-gl-draw-rectangle-mode@^1.0.4:
   resolved "http://verdaccio.ds.io:4873/mapbox-gl-draw-rectangle-mode/-/mapbox-gl-draw-rectangle-mode-1.0.4.tgz#42987d68872a5fb5cc5d76d3375ee20cd8bab8f7"
   integrity sha512-BdF6nwEK2p8n9LQoMPzBO8LhddW1fe+d5vK8HQIei+4VcRnUbKNsEj7Z15FsJxCHzsc2BQKXbESx5GaE8x0imQ==
 
-mapbox-gl@^2.15.0:
-  version "2.15.0"
-  resolved "http://verdaccio.ds.io:4873/mapbox-gl/-/mapbox-gl-2.15.0.tgz#9439828d0bae1e7b464ae08b30cb2e65a7e2256d"
-  integrity sha512-fjv+aYrd5TIHiL7wRa+W7KjtUqKWziJMZUkK5hm8TvJ3OLeNPx4NmW/DgfYhd/jHej8wWL+QJBDbdMMAKvNC0A==
+mapbox-gl@^3.9.3:
+  version "3.9.3"
+  resolved "http://verdaccio.ds.io:4873/mapbox-gl/-/mapbox-gl-3.9.3.tgz#07e67fd774af52b6e50e82172ee8f1f016d74618"
+  integrity sha512-31mh95f35srpBMxAP32F9dKQXz7pT5VxQA5r6bFY6Aa5G6Z6NC/SVOTyWR+G/wY8wXWTHAnOaAAf5UkD5++/Kg==
   dependencies:
-    "@mapbox/geojson-rewind" "^0.5.2"
     "@mapbox/jsonlint-lines-primitives" "^2.0.2"
-    "@mapbox/mapbox-gl-supported" "^2.0.1"
+    "@mapbox/mapbox-gl-supported" "^3.0.0"
     "@mapbox/point-geometry" "^0.1.0"
     "@mapbox/tiny-sdf" "^2.0.6"
     "@mapbox/unitbezier" "^0.0.1"
     "@mapbox/vector-tile" "^1.3.1"
     "@mapbox/whoots-js" "^3.1.0"
+    "@types/geojson" "^7946.0.15"
+    "@types/geojson-vt" "^3.2.5"
+    "@types/mapbox__point-geometry" "^0.1.4"
+    "@types/mapbox__vector-tile" "^1.3.4"
+    "@types/pbf" "^3.0.5"
+    "@types/supercluster" "^7.1.3"
+    cheap-ruler "^4.0.0"
     csscolorparser "~1.0.3"
-    earcut "^2.2.4"
-    geojson-vt "^3.2.1"
+    earcut "^3.0.0"
+    geojson-vt "^4.0.2"
     gl-matrix "^3.4.3"
     grid-index "^1.1.0"
-    kdbush "^4.0.1"
+    kdbush "^4.0.2"
     murmurhash-js "^1.0.0"
     pbf "^3.2.1"
     potpack "^2.0.0"
-    quickselect "^2.0.0"
-    rw "^1.3.3"
-    supercluster "^8.0.0"
-    tinyqueue "^2.0.3"
+    quickselect "^3.0.0"
+    serialize-to-js "^3.1.2"
+    supercluster "^8.0.1"
+    tinyqueue "^3.0.0"
     vt-pbf "^3.1.3"
 
 markdown-escapes@^1.0.0:
@@ -13906,6 +13940,11 @@ quickselect@^2.0.0:
   resolved "http://verdaccio.ds.io:4873/quickselect/-/quickselect-2.0.0.tgz#f19680a486a5eefb581303e023e98faaf25dd018"
   integrity sha512-RKJ22hX8mHe3Y6wH/N3wCM6BWtjaxIyyUIkpHOvfFnxdI4yD4tBXEBKSbriGujF6jnSVkJrffuo6vxACiSSxIw==
 
+quickselect@^3.0.0:
+  version "3.0.0"
+  resolved "http://verdaccio.ds.io:4873/quickselect/-/quickselect-3.0.0.tgz#a37fc953867d56f095a20ac71c6d27063d2de603"
+  integrity sha512-XdjUArbK4Bm5fLLvlm5KpTFOiOThgfWWI4axAZDWg4E/0mKdZyI9tNEfds27qCi1ze/vwTR16kvmmGhRra3c2g==
+
 rbush@^3.0.1:
   version "3.0.1"
   resolved "http://verdaccio.ds.io:4873/rbush/-/rbush-3.0.1.tgz#5fafa8a79b3b9afdfe5008403a720cc1de882ecf"
@@ -15075,6 +15114,11 @@ semver@^7.5.2:
   resolved "http://verdaccio.ds.io:4873/semver/-/semver-7.6.2.tgz#1e3b34759f896e8f14d6134732ce798aeb0c6e13"
   integrity sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==
 
+serialize-to-js@^3.1.2:
+  version "3.1.2"
+  resolved "http://verdaccio.ds.io:4873/serialize-to-js/-/serialize-to-js-3.1.2.tgz#844b8a1c2d72412f68ea30da55090b3fc8e95790"
+  integrity sha512-owllqNuDDEimQat7EPG0tH7JjO090xKNzUtYz6X+Sk2BXDnOCilDdNLwjWeFywG9xkJul1ULvtUQa9O4pUaY0w==
+
 set-blocking@^2.0.0:
   version "2.0.0"
   resolved "http://verdaccio.ds.io:4873/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
@@ -15760,7 +15804,7 @@ suggestions@^1.6.0:
     fuzzy "^0.1.1"
     xtend "^4.0.0"
 
-supercluster@^8.0.0:
+supercluster@^8.0.1:
   version "8.0.1"
   resolved "http://verdaccio.ds.io:4873/supercluster/-/supercluster-8.0.1.tgz#9946ba123538e9e9ab15de472531f604e7372df5"
   integrity sha512-IiOea5kJ9iqzD2t7QJq/cREyLHTtSmUT6gQsweojg9WH2sYJqZK9SswTu6jrscO6D1G5v5vYZ9ru/eq85lXeZQ==
@@ -15929,10 +15973,10 @@ tiny-emitter@^2.0.0:
   resolved "http://verdaccio.ds.io:4873/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423"
   integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==
 
-tinyqueue@^2.0.3:
-  version "2.0.3"
-  resolved "http://verdaccio.ds.io:4873/tinyqueue/-/tinyqueue-2.0.3.tgz#64d8492ebf39e7801d7bd34062e29b45b2035f08"
-  integrity sha512-ppJZNDuKGgxzkHihX8v9v9G5f+18gzaTfrukGrq6ueg0lmH4nqVnA2IPG0AEH3jKEk2GRJCUhDoqpoiw3PHLBA==
+tinyqueue@^3.0.0:
+  version "3.0.0"
+  resolved "http://verdaccio.ds.io:4873/tinyqueue/-/tinyqueue-3.0.0.tgz#101ea761ccc81f979e29200929e78f1556e3661e"
+  integrity sha512-gRa9gwYU3ECmQYv3lslts5hxuIa90veaEcxDYuu3QGOIAEM2mOZkVHp48ANJuu1CURtRdHKUBY5Lm1tHV+sD4g==
 
 tippy.js@^6.3.1, tippy.js@^6.3.7:
   version "6.3.7"

From e227a9d7b7b79fcc40d17b6e93b73e1f4276f071 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alice=20R=C3=BChl?= <alice@developmentseed.org>
Date: Thu, 23 Jan 2025 11:03:45 +0100
Subject: [PATCH 2/6] Update typings after upgrading mapbox-gl > 3.5

---
 .../components/common/blocks/block-map.tsx    |  2 +-
 .../map/controls/map-options/projections.ts   |  3 +-
 .../common/map/controls/map-options/types.ts  |  4 +--
 .../components/common/map/map-component.tsx   |  3 +-
 .../common/map/style-generators/basemap.tsx   | 24 ++++++++-----
 .../style-generators/raster-paint-layer.tsx   |  7 ++--
 .../style-generators/raster-timeseries.tsx    | 27 ++++++++-------
 .../style-generators/vector-timeseries.tsx    | 12 ++++---
 app/scripts/components/common/map/styles.tsx  | 34 +++++++++++++------
 app/scripts/components/common/map/types.d.ts  |  9 ++---
 app/scripts/components/common/map/utils.ts    |  8 +++--
 .../map/analysis-message-control.tsx          |  2 +-
 .../exploration/components/map/index.tsx      |  8 +++--
 app/scripts/types/veda.ts                     | 13 ++++---
 14 files changed, 94 insertions(+), 62 deletions(-)

diff --git a/app/scripts/components/common/blocks/block-map.tsx b/app/scripts/components/common/blocks/block-map.tsx
index 95b7eb97a..c19ed697e 100644
--- a/app/scripts/components/common/blocks/block-map.tsx
+++ b/app/scripts/components/common/blocks/block-map.tsx
@@ -206,7 +206,7 @@ function MapBlock(props: MapBlockProps) {
         parallels: projectionParallels
       });
       return {
-        ...projection,
+        ...(projection as object),
         id: projectionId
       };
     } else {
diff --git a/app/scripts/components/common/map/controls/map-options/projections.ts b/app/scripts/components/common/map/controls/map-options/projections.ts
index 34806aac0..d28dd20d7 100644
--- a/app/scripts/components/common/map/controls/map-options/projections.ts
+++ b/app/scripts/components/common/map/controls/map-options/projections.ts
@@ -78,7 +78,8 @@ export const convertProjectionToMapbox = (
 
   return {
     center: p.conicValues?.center || projection.center,
-    parallels: p.conicValues?.parallels || projection.parallels,
+    parallels:
+      p.conicValues?.parallels || (projection.parallels as [number, number]),
     name: p.mbId
   };
 };
diff --git a/app/scripts/components/common/map/controls/map-options/types.ts b/app/scripts/components/common/map/controls/map-options/types.ts
index 88fce0bc7..b8506f378 100644
--- a/app/scripts/components/common/map/controls/map-options/types.ts
+++ b/app/scripts/components/common/map/controls/map-options/types.ts
@@ -1,5 +1,5 @@
 import { BasemapId, Option } from './basemap';
-import { MbProjectionOptions, ProjectionOptions } from '$types/veda';
+import { ProjectionOptions } from '$types/veda';
 
 export interface MapOptionsProps {
   onProjectionChange: (projection: ProjectionOptions) => void;
@@ -19,7 +19,7 @@ export interface ProjectionConicOptions {
 
 export interface ProjectionListItem {
   id: ProjectionOptions['id'];
-  mbId: MbProjectionOptions['name'];
+  mbId: mapboxgl.ProjectionSpecification['name'];
   label: string;
   isCustom?: boolean;
   conicValues?: ProjectionConicOptions;
diff --git a/app/scripts/components/common/map/map-component.tsx b/app/scripts/components/common/map/map-component.tsx
index c7fad3e25..5182cc487 100644
--- a/app/scripts/components/common/map/map-component.tsx
+++ b/app/scripts/components/common/map/map-component.tsx
@@ -1,6 +1,7 @@
 import React, { useCallback, ReactElement, useMemo, Ref } from 'react';
 import ReactMapGlMap, { LngLatBoundsLike, MapRef } from 'react-map-gl';
 import { debounce } from 'lodash';
+import { ProjectionSpecification } from 'mapbox-gl';
 import useMapStyle from './hooks/use-map-style';
 import { useMapsContext } from './hooks/use-maps';
 import { convertProjectionToMapbox } from './controls/map-options/projections';
@@ -81,7 +82,7 @@ export default function MapComponent({
       mapStyle={style as any}
       onMove={onMove}
       onLoad={onMapLoad}
-      projection={mapboxProjection}
+      projection={mapboxProjection as ProjectionSpecification}
       maxBounds={maxMapBounds}
       interactive={interactive}
     >
diff --git a/app/scripts/components/common/map/style-generators/basemap.tsx b/app/scripts/components/common/map/style-generators/basemap.tsx
index 7eafc6398..891ddbf7e 100644
--- a/app/scripts/components/common/map/style-generators/basemap.tsx
+++ b/app/scripts/components/common/map/style-generators/basemap.tsx
@@ -1,5 +1,9 @@
 import { useQuery } from '@tanstack/react-query';
-import { AnySourceImpl, Layer, Style } from 'mapbox-gl';
+import {
+  SourceSpecification,
+  LayerSpecification,
+  StyleSpecification
+} from 'mapbox-gl';
 import { useEffect, useMemo, useState } from 'react';
 import {
   BasemapId,
@@ -35,7 +39,9 @@ export function Basemap({
 }: BasemapProps) {
   const { envMapboxToken } = useVedaUI();
   const { updateStyle } = useMapStyle();
-  const [baseStyle, setBaseStyle] = useState<Style | undefined>(undefined);
+  const [baseStyle, setBaseStyle] = useState<StyleSpecification | undefined>(
+    undefined
+  );
 
   const basemapStyles = useMemo(
     () => getBasemapStyles(envMapboxToken),
@@ -62,7 +68,7 @@ export function Basemap({
   );
 
   useEffect(() => {
-    setBaseStyle(styleJson as Style);
+    setBaseStyle(styleJson as StyleSpecification);
   }, [styleJson]);
 
   // Apply labels and boundaries options, by setting visibility on related
@@ -76,15 +82,17 @@ export function Basemap({
     // this id from the list of groups in the metadata section of the style.
     const labelsGroupIds = mapGroupNameToGroupId(
       GROUPS_BY_OPTION.labels,
-      baseStyle.metadata['mapbox:groups']
+      (baseStyle.metadata as Record<string, any>)['mapbox:groups']
     );
     const boundariesGroupIds = mapGroupNameToGroupId(
       GROUPS_BY_OPTION.boundaries,
-      baseStyle.metadata['mapbox:groups']
+      (baseStyle.metadata as Record<string, any>)['mapbox:groups']
     );
 
     const layers = baseStyle.layers.map((layer) => {
-      const layerGroup = (layer as Layer).metadata?.['mapbox:group'];
+      const layerGroup = (layer as LayerSpecification).metadata?.[
+        'mapbox:group'
+      ];
 
       if (layerGroup) {
         const isLabelsLayer = labelsGroupIds.includes(layerGroup);
@@ -100,7 +108,7 @@ export function Basemap({
           return {
             ...layer,
             layout: {
-              ...(layer as Layer).layout,
+              ...(layer as LayerSpecification).layout,
               visibility
             },
             metadata: {
@@ -115,7 +123,7 @@ export function Basemap({
 
     updateStyle({
       generatorId: 'basemap',
-      sources: baseStyle.sources as Record<string, AnySourceImpl>,
+      sources: baseStyle.sources as Record<string, SourceSpecification>,
       layers: layers as ExtendedLayer[]
     });
   }, [updateStyle, labelsOption, boundariesOption, baseStyle]);
diff --git a/app/scripts/components/common/map/style-generators/raster-paint-layer.tsx b/app/scripts/components/common/map/style-generators/raster-paint-layer.tsx
index d6d954e8d..866be0c3c 100644
--- a/app/scripts/components/common/map/style-generators/raster-paint-layer.tsx
+++ b/app/scripts/components/common/map/style-generators/raster-paint-layer.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useMemo } from 'react';
 import qs from 'qs';
-import { RasterSource, RasterLayer } from 'mapbox-gl';
+import { RasterSourceSpecification, RasterLayerSpecification } from 'mapbox-gl';
 
 import { BaseGeneratorParams } from '../types';
 import useMapStyle from '../hooks/use-map-style';
@@ -56,14 +56,14 @@ export function RasterPaintLayer(props: RasterPaintLayerProps) {
         arrayFormat: 'comma'
       });
 
-      const zarrSource: RasterSource = {
+      const zarrSource: RasterSourceSpecification = {
         type: 'raster',
         url: `${tileApiEndpoint}?${tileParamsAsString}`
       };
 
       const rasterOpacity = typeof opacity === 'number' ? opacity / 100 : 1;
 
-      const zarrLayer: RasterLayer = {
+      const zarrLayer: RasterLayerSpecification = {
         id: id,
         type: 'raster',
         source: id,
@@ -93,6 +93,7 @@ export function RasterPaintLayer(props: RasterPaintLayerProps) {
     },
     // sourceParams not included, but using a stringified version of it to
     // detect changes (haveSourceParamsChanged)
+    // eslint-disable-next-line react-hooks/exhaustive-deps
     [
       updateStyle,
       id,
diff --git a/app/scripts/components/common/map/style-generators/raster-timeseries.tsx b/app/scripts/components/common/map/style-generators/raster-timeseries.tsx
index 3030506ad..a93cc5c0c 100644
--- a/app/scripts/components/common/map/style-generators/raster-timeseries.tsx
+++ b/app/scripts/components/common/map/style-generators/raster-timeseries.tsx
@@ -1,13 +1,14 @@
+/* eslint-disable react-hooks/exhaustive-deps */
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import qs from 'qs';
 import {
-  AnyLayer,
-  AnySourceImpl,
-  GeoJSONSourceRaw,
+  LayerSpecification,
+  SourceSpecification,
+  GeoJSONSourceSpecification,
   LngLatBoundsLike,
-  RasterLayer,
-  RasterSource,
-  SymbolLayer
+  RasterLayerSpecification,
+  RasterSourceSpecification,
+  SymbolLayerSpecification
 } from 'mapbox-gl';
 import { useTheme } from 'styled-components';
 import { featureCollection, point } from '@turf/helpers';
@@ -360,8 +361,8 @@ export function RasterTimeseries(props: RasterTimeseriesProps) {
     const controller = new AbortController();
 
     async function run() {
-      let layers: AnyLayer[] = [];
-      let sources: Record<string, AnySourceImpl> = {};
+      let layers: LayerSpecification[] = [];
+      let sources: Record<string, SourceSpecification> = {};
 
       if (mosaicUrl) {
         const tileParams = qs.stringify(
@@ -392,14 +393,14 @@ export function RasterTimeseries(props: RasterTimeseriesProps) {
             'WMTSCapabilities.xml'
           );
 
-          const mosaicSource: RasterSource = {
+          const mosaicSource: RasterSourceSpecification = {
             type: 'raster',
             url: tilejsonUrl
           };
 
           const rasterOpacity = typeof opacity === 'number' ? opacity / 100 : 1;
 
-          const mosaicLayer: RasterLayer = {
+          const mosaicLayer: RasterLayerSpecification = {
             id: id,
             type: 'raster',
             source: id,
@@ -449,14 +450,14 @@ export function RasterTimeseries(props: RasterTimeseriesProps) {
 
       if (points && minZoom > 0) {
         const pointsSourceId = `${id}-points`;
-        const pointsSource: GeoJSONSourceRaw = {
+        const pointsSource: GeoJSONSourceSpecification = {
           type: 'geojson',
           data: featureCollection(
             points.map((p) => point(p.center, { bounds: p.bounds }))
           )
         };
 
-        const pointsLayer: SymbolLayer = {
+        const pointsLayer: SymbolLayerSpecification = {
           type: 'symbol',
           id: pointsSourceId,
           source: pointsSourceId,
@@ -476,7 +477,7 @@ export function RasterTimeseries(props: RasterTimeseriesProps) {
         };
         sources = {
           ...sources,
-          [pointsSourceId]: pointsSource as AnySourceImpl
+          [pointsSourceId]: pointsSource as SourceSpecification
         };
         layers = [...layers, pointsLayer];
       }
diff --git a/app/scripts/components/common/map/style-generators/vector-timeseries.tsx b/app/scripts/components/common/map/style-generators/vector-timeseries.tsx
index bdc06cfe8..fa618bbe3 100644
--- a/app/scripts/components/common/map/style-generators/vector-timeseries.tsx
+++ b/app/scripts/components/common/map/style-generators/vector-timeseries.tsx
@@ -1,6 +1,10 @@
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import qs from 'qs';
-import { AnyLayer, AnySourceImpl, VectorSourceImpl } from 'mapbox-gl';
+import {
+  LayerSpecification,
+  SourceSpecification,
+  VectorSourceSpecification
+} from 'mapbox-gl';
 import { useTheme } from 'styled-components';
 import endOfDay from 'date-fns/endOfDay';
 import startOfDay from 'date-fns/startOfDay';
@@ -131,11 +135,11 @@ export function VectorTimeseries(props: VectorTimeseriesProps) {
 
     const vectorOpacity = typeof opacity === 'number' ? opacity / 100 : 1;
 
-    const sources: Record<string, AnySourceImpl> = {
+    const sources: Record<string, SourceSpecification> = {
       [id]: {
         type: 'vector',
         tiles: [`${featuresApiEndpoint}/tiles/{z}/{x}/{y}?${tileParams}`]
-      } as VectorSourceImpl
+      } as VectorSourceSpecification
     };
 
     const layers = [
@@ -234,7 +238,7 @@ export function VectorTimeseries(props: VectorTimeseriesProps) {
             }
           }
         : undefined
-    ].filter(Boolean) as AnyLayer[];
+    ].filter(Boolean) as LayerSpecification[];
 
     updateStyle({
       generatorId,
diff --git a/app/scripts/components/common/map/styles.tsx b/app/scripts/components/common/map/styles.tsx
index 5b949f3b2..b8d3e3a0f 100644
--- a/app/scripts/components/common/map/styles.tsx
+++ b/app/scripts/components/common/map/styles.tsx
@@ -1,4 +1,8 @@
-import { AnySourceImpl, Layer, Style } from 'mapbox-gl';
+import {
+  LayerSpecification,
+  SourceSpecification,
+  StyleSpecification
+} from 'mapbox-gl';
 import React, {
   ReactNode,
   createContext,
@@ -16,7 +20,7 @@ import {
 
 export interface StylesContextType {
   updateStyle: (params: GeneratorStyleParams) => void;
-  style?: Style;
+  style?: StyleSpecification;
   updateMetaData?: (params: unknown) => void;
   metaData?: unknown;
   isCompared?: boolean;
@@ -53,7 +57,7 @@ const generateStyle = (
   stylesData: Record<string, GeneratorStyleParams>,
   currentMapStyle
 ) => {
-  let sources: Record<string, AnySourceImpl> = {};
+  let sources: Record<string, SourceSpecification> = {};
   let layers: ExtendedLayer[] = [];
 
   Object.entries(stylesData).forEach(([generatorId, generatorParams]) => {
@@ -64,10 +68,12 @@ const generateStyle = (
     };
 
     const generatorLayers = generatorParams.layers.map((generatorLayer) => {
-      const metadata: ExtendedMetadata = generatorLayer.metadata ?? {};
-      metadata.generatorId = generatorId;
+      const metadata: ExtendedMetadata = {
+        ...(generatorLayer.metadata ?? {}),
+        generatorId
+      };
 
-      const mapLayer = { ...generatorLayer, metadata } as Layer;
+      const mapLayer = { ...generatorLayer, metadata } as LayerSpecification;
 
       if (generatorParams.params?.hidden) {
         mapLayer.layout = {
@@ -84,13 +90,19 @@ const generateStyle = (
   // Allow sort as it uses a copy of the array so mutating is ok
   /* eslint-disable-next-line fp/no-mutating-methods */
   layers = [...layers].sort((layerA, layerB) => {
-    const layerAOrder = layerA.metadata?.layerOrderPosition;
-    const layerBOrder = layerB.metadata?.layerOrderPosition;
+    const layerAOrder =
+      (layerA.metadata as ExtendedMetadata).layerOrderPosition ??
+      'basemap-background';
+    const layerBOrder =
+      (layerB.metadata as ExtendedMetadata).layerOrderPosition ??
+      'basemap-background';
     const layerAIndex = LAYER_ORDER.indexOf(layerAOrder);
     const layerBIndex = LAYER_ORDER.indexOf(layerBOrder);
     const layerOrder = layerAIndex - layerBIndex;
-    const generatorA = stylesData[layerA.metadata?.generatorId];
-    const generatorB = stylesData[layerB.metadata?.generatorId];
+    const generatorA =
+      stylesData[(layerA.metadata as ExtendedMetadata).generatorId];
+    const generatorB =
+      stylesData[(layerB.metadata as ExtendedMetadata).generatorId];
     const generatorOrder =
       generatorA.params?.generatorOrder !== undefined &&
       generatorB.params?.generatorOrder !== undefined
@@ -146,7 +158,7 @@ export function Styles({
     Record<string, GeneratorStyleParams>
   >({});
 
-  const [style, setStyle] = useState<Style>({
+  const [style, setStyle] = useState<StyleSpecification>({
     version: DEFAULT_MAPBOX_STYLE_VERSION,
     glyphs: DEFAULT_GLYPHS_SOURCE,
     sprite: DEFAULT_SPRITE_SOURCE,
diff --git a/app/scripts/components/common/map/types.d.ts b/app/scripts/components/common/map/types.d.ts
index 39af6eb5c..086c0f744 100644
--- a/app/scripts/components/common/map/types.d.ts
+++ b/app/scripts/components/common/map/types.d.ts
@@ -1,14 +1,15 @@
 import { Feature, Polygon } from 'geojson';
-import { AnyLayer, AnySourceImpl } from 'mapbox-gl';
+import { LayerSpecification, SourceSpecification } from 'mapbox-gl';
 import { ActionStatus } from '$utils/status';
 
 export interface ExtendedMetadata {
   layerOrderPosition?: LayerOrderPosition;
+  generatorId: string;
   [key: string]: any;
 }
 
-export type ExtendedLayer = AnyLayer & {
-  metadata?: ExtendedMetadata;
+export type ExtendedLayer = LayerSpecification & {
+  metadata?: ExtendedMetadata | unknown;
 };
 
 export interface BaseGeneratorParams {
@@ -19,7 +20,7 @@ export interface BaseGeneratorParams {
 export interface GeneratorStyleParams {
   generatorId: string;
   layers: ExtendedLayer[];
-  sources: Record<string, AnySourceImpl>;
+  sources: Record<string, SourceSpecification>;
   metadata?: Record<string, unknown>;
   params?: BaseGeneratorParams;
 }
diff --git a/app/scripts/components/common/map/utils.ts b/app/scripts/components/common/map/utils.ts
index 5aa066626..1e2edcab1 100644
--- a/app/scripts/components/common/map/utils.ts
+++ b/app/scripts/components/common/map/utils.ts
@@ -54,9 +54,11 @@ export function checkFitBoundsFromLayer(
   if (!layerBounds || !mapInstance) return false;
 
   const [minXLayer, minYLayer, maxXLayer, maxYLayer] = layerBounds;
-  const [[minXMap, minYMap], [maxXMap, maxYMap]] = mapInstance
-    .getBounds()
-    .toArray();
+  const bounds = mapInstance.getBounds();
+  if (!bounds) {
+    return false;
+  }
+  const [[minXMap, minYMap], [maxXMap, maxYMap]] = bounds.toArray();
   const isOutside =
     maxXLayer < minXMap ||
     minXLayer > maxXMap ||
diff --git a/app/scripts/components/exploration/components/map/analysis-message-control.tsx b/app/scripts/components/exploration/components/map/analysis-message-control.tsx
index 3a0c19dd5..3e7e96342 100644
--- a/app/scripts/components/exploration/components/map/analysis-message-control.tsx
+++ b/app/scripts/components/exploration/components/map/analysis-message-control.tsx
@@ -1,7 +1,7 @@
 import React, { useCallback, useEffect } from 'react';
 import { useAtomValue } from 'jotai';
 import styled, { css } from 'styled-components';
-import { MapRef } from 'react-map-gl';
+import { LngLatBoundsLike, MapRef } from 'react-map-gl';
 import { glsp, themeVal } from '@devseed-ui/theme-provider';
 import { Button, createButtonStyles } from '@devseed-ui/button';
 import bbox from '@turf/bbox';
diff --git a/app/scripts/components/exploration/components/map/index.tsx b/app/scripts/components/exploration/components/map/index.tsx
index a3aedc056..74e6bd8d0 100644
--- a/app/scripts/components/exploration/components/map/index.tsx
+++ b/app/scripts/components/exploration/components/map/index.tsx
@@ -102,7 +102,7 @@ export function ExplorationMap(props: ExplorationMapProps) {
 
         // Check if there's layer information for this dataset.
         const layerMetadata = style.layers.find(
-          (l) => l.metadata?.id === dataset.data.id
+          (l) => (l.metadata as { id: string }).id === dataset.data.id
         );
 
         // Skip if no metadata.
@@ -115,8 +115,10 @@ export function ExplorationMap(props: ExplorationMapProps) {
           meta: {
             ...currentMeta,
             tileUrls: {
-              wmtsTileUrl: layerMetadata.metadata.wmtsTileUrl,
-              xyzTileUrl: layerMetadata.metadata.xyzTileUrl
+              wmtsTileUrl: (layerMetadata.metadata as { wmtsTileUrl: string })
+                .wmtsTileUrl,
+              xyzTileUrl: (layerMetadata.metadata as { xyzTileUrl: string })
+                .xyzTileUrl
             }
           }
         };
diff --git a/app/scripts/types/veda.ts b/app/scripts/types/veda.ts
index 96d5222c7..1c150dd3f 100644
--- a/app/scripts/types/veda.ts
+++ b/app/scripts/types/veda.ts
@@ -11,15 +11,14 @@ export type DatasetLayerType = 'raster' | 'vector' | 'zarr' | 'cmr';
 // Dataset Layers
 //
 export type MbProjectionOptions = Exclude<
-  mapboxgl.MapboxOptions['projection'],
+  mapboxgl.MapOptions['projection'],
   undefined
 >;
 
-export type ProjectionOptions = Pick<
-  MbProjectionOptions,
-  'parallels' | 'center'
-> & {
-  id: MbProjectionOptions['name'] | 'polarNorth' | 'polarSouth';
+export type ProjectionOptions = {
+  parallels?: number[];
+  center?: [number, number];
+  id: mapboxgl.ProjectionSpecification['name'] | 'polarNorth' | 'polarSouth';
 };
 
 interface DatasetLayerCommonCompareProps {
@@ -287,4 +286,4 @@ export interface DatasetDataWithEnhancedLayers extends DatasetData {
 export interface LinkProperties {
   LinkElement: string | ComponentType<any> | undefined;
   pathAttributeKeyName: string;
-}
\ No newline at end of file
+}

From a4f7383b23af9d0fcab87f2c2e93bbd5e9d3a4bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alice=20R=C3=BChl?= <alice@developmentseed.org>
Date: Thu, 23 Jan 2025 16:18:46 +0100
Subject: [PATCH 3/6] Update projection options in parcel-resolver-veda

---
 parcel-resolver-veda/index.d.ts | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/parcel-resolver-veda/index.d.ts b/parcel-resolver-veda/index.d.ts
index 156df2c12..54c6371e9 100644
--- a/parcel-resolver-veda/index.d.ts
+++ b/parcel-resolver-veda/index.d.ts
@@ -1,6 +1,5 @@
 declare module 'veda' {
   import * as dateFns from 'date-fns';
-  import mapboxgl from 'mapbox-gl';
   import { MDXModule } from 'mdx/types';
   import { DefaultTheme } from 'styled-components';
 
@@ -13,15 +12,14 @@ declare module 'veda' {
   // Dataset Layers
   //
   export type MbProjectionOptions = Exclude<
-    mapboxgl.MapboxOptions['projection'],
+    mapboxgl.MapOptions['projection'],
     undefined
   >;
 
-  export type ProjectionOptions = Pick<
-    MbProjectionOptions,
-    'parallels' | 'center'
-  > & {
-    id: MbProjectionOptions['name'] | 'polarNorth' | 'polarSouth';
+  export type ProjectionOptions = {
+    id: mapboxgl.ProjectionSpecification['name'] | 'polarNorth' | 'polarSouth';
+    parallels?: number[];
+    center?: [number, number];
   };
 
   interface DatasetLayerCommonCompareProps {

From 641463e4b66988d47970a5b17a7bc499902a66d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alice=20R=C3=BChl?= <alice@developmentseed.org>
Date: Mon, 27 Jan 2025 08:36:54 +0100
Subject: [PATCH 4/6] Fix type for projection parallels

---
 .../components/common/map/controls/map-options/projections.ts  | 3 +--
 app/scripts/types/veda.ts                                      | 2 +-
 parcel-resolver-veda/index.d.ts                                | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/scripts/components/common/map/controls/map-options/projections.ts b/app/scripts/components/common/map/controls/map-options/projections.ts
index d28dd20d7..34806aac0 100644
--- a/app/scripts/components/common/map/controls/map-options/projections.ts
+++ b/app/scripts/components/common/map/controls/map-options/projections.ts
@@ -78,8 +78,7 @@ export const convertProjectionToMapbox = (
 
   return {
     center: p.conicValues?.center || projection.center,
-    parallels:
-      p.conicValues?.parallels || (projection.parallels as [number, number]),
+    parallels: p.conicValues?.parallels || projection.parallels,
     name: p.mbId
   };
 };
diff --git a/app/scripts/types/veda.ts b/app/scripts/types/veda.ts
index 1c150dd3f..de6f0792d 100644
--- a/app/scripts/types/veda.ts
+++ b/app/scripts/types/veda.ts
@@ -16,7 +16,7 @@ export type MbProjectionOptions = Exclude<
 >;
 
 export type ProjectionOptions = {
-  parallels?: number[];
+  parallels?: [number, number];
   center?: [number, number];
   id: mapboxgl.ProjectionSpecification['name'] | 'polarNorth' | 'polarSouth';
 };
diff --git a/parcel-resolver-veda/index.d.ts b/parcel-resolver-veda/index.d.ts
index 54c6371e9..35742c8d9 100644
--- a/parcel-resolver-veda/index.d.ts
+++ b/parcel-resolver-veda/index.d.ts
@@ -18,7 +18,7 @@ declare module 'veda' {
 
   export type ProjectionOptions = {
     id: mapboxgl.ProjectionSpecification['name'] | 'polarNorth' | 'polarSouth';
-    parallels?: number[];
+    parallels?: [number, number];
     center?: [number, number];
   };
 

From 045deb63f3bfcf09a53726e05da8b59b29c4d043 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alice=20R=C3=BChl?= <alice@developmentseed.org>
Date: Thu, 30 Jan 2025 10:03:53 +0100
Subject: [PATCH 5/6] Remove unnecessary type casting

---
 .../common/map/style-generators/basemap.tsx        | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/app/scripts/components/common/map/style-generators/basemap.tsx b/app/scripts/components/common/map/style-generators/basemap.tsx
index 891ddbf7e..a902efc94 100644
--- a/app/scripts/components/common/map/style-generators/basemap.tsx
+++ b/app/scripts/components/common/map/style-generators/basemap.tsx
@@ -1,9 +1,5 @@
 import { useQuery } from '@tanstack/react-query';
-import {
-  SourceSpecification,
-  LayerSpecification,
-  StyleSpecification
-} from 'mapbox-gl';
+import { StyleSpecification } from 'mapbox-gl';
 import { useEffect, useMemo, useState } from 'react';
 import {
   BasemapId,
@@ -90,9 +86,7 @@ export function Basemap({
     );
 
     const layers = baseStyle.layers.map((layer) => {
-      const layerGroup = (layer as LayerSpecification).metadata?.[
-        'mapbox:group'
-      ];
+      const layerGroup = layer.metadata?.['mapbox:group'];
 
       if (layerGroup) {
         const isLabelsLayer = labelsGroupIds.includes(layerGroup);
@@ -108,7 +102,7 @@ export function Basemap({
           return {
             ...layer,
             layout: {
-              ...(layer as LayerSpecification).layout,
+              ...layer.layout,
               visibility
             },
             metadata: {
@@ -123,7 +117,7 @@ export function Basemap({
 
     updateStyle({
       generatorId: 'basemap',
-      sources: baseStyle.sources as Record<string, SourceSpecification>,
+      sources: baseStyle.sources,
       layers: layers as ExtendedLayer[]
     });
   }, [updateStyle, labelsOption, boundariesOption, baseStyle]);

From e40b5751e3d81abd342f0b840fc950475ca02dc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alice=20R=C3=BChl?= <alice@developmentseed.org>
Date: Thu, 30 Jan 2025 11:53:04 +0100
Subject: [PATCH 6/6] Avoid type casting, mark metadata optional

Co-authored-by: Gjore Milevski <dzole0311@gmail.com>
---
 .../components/common/map/style-generators/basemap.tsx        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/scripts/components/common/map/style-generators/basemap.tsx b/app/scripts/components/common/map/style-generators/basemap.tsx
index a902efc94..74af00de0 100644
--- a/app/scripts/components/common/map/style-generators/basemap.tsx
+++ b/app/scripts/components/common/map/style-generators/basemap.tsx
@@ -78,11 +78,11 @@ export function Basemap({
     // this id from the list of groups in the metadata section of the style.
     const labelsGroupIds = mapGroupNameToGroupId(
       GROUPS_BY_OPTION.labels,
-      (baseStyle.metadata as Record<string, any>)['mapbox:groups']
+      baseStyle.metadata?.['mapbox:groups']
     );
     const boundariesGroupIds = mapGroupNameToGroupId(
       GROUPS_BY_OPTION.boundaries,
-      (baseStyle.metadata as Record<string, any>)['mapbox:groups']
+      baseStyle.metadata?.['mapbox:groups']
     );
 
     const layers = baseStyle.layers.map((layer) => {