From e8f472b0da29222a402c1351d200cf1bdb9c79c2 Mon Sep 17 00:00:00 2001
From: Jakub Kasprzyk <kasprzykjakub@proton.me>
Date: Fri, 26 Jun 2026 12:01:41 +0200
Subject: [PATCH 1/3] Add custom marker clustering and viewport-aware overlay
 sync.

---
 .gitignore                                    |   1 +
 bun.lock                                      |  40 +
 docs/architecture.md                          |   4 +-
 example/App.tsx                               | 853 ++++++++++++++----
 example/examples/advancedFeatures.ts          | 126 ++-
 example/examples/types.ts                     |  17 +-
 example/index.js                              |   1 +
 example/metro.config.js                       |   7 +
 example/package.json                          |   4 +-
 .../nitro/nitromaps/ClusterBadgeMetrics.kt    |  21 +
 .../nitro/nitromaps/ClusterIconFactory.kt     |  70 ++
 .../margelo/nitro/nitromaps/HybridMapView.kt  |  46 +-
 .../nitro/nitromaps/MapOverlayController.kt   | 309 +++++--
 .../nitro/nitromaps/MarkerClusterEngine.kt    | 248 +++++
 .../MarkerDescriptor+MarkerOptions.kt         |   2 +
 .../nitro/nitromaps/MarkerSpatialIndex.kt     |  99 ++
 .../nitro/nitromaps/MarkerViewportFilter.kt   | 104 +++
 .../nitro/nitromaps/NitroClusterItem.kt       |  28 -
 package/ios/ClusterBadgeMetrics.swift         |  34 +
 package/ios/HybridMapView.swift               |  72 +-
 package/ios/HybridMapViewDelegate.swift       |  75 +-
 package/ios/MKMapView+ScaleAppearance.swift   |  58 ++
 package/ios/MapClusterAnnotation.swift        |  29 +
 package/ios/MapOverlayController.swift        | 236 ++++-
 package/ios/MarkerClusterEngine.swift         | 266 ++++++
 package/ios/MarkerSpatialIndex.swift          | 101 +++
 package/ios/MarkerViewportFilter.swift        | 102 +++
 package/ios/NitroClusterAnnotationView.swift  |  74 ++
 package/ios/NitroMKMapView.swift              |   9 +
 package/ios/NitroPinAnnotationView.swift      | 113 +++
 package/src/components/Circle.tsx             |   4 +
 package/src/components/MapView.tsx            |  77 +-
 package/src/components/Marker.tsx             |   4 +
 package/src/components/Polygon.tsx            |   4 +
 package/src/components/Polyline.tsx           |   4 +
 package/src/hooks/useCollectedOverlays.ts     | 291 +++---
 package/src/overlays/overlayType.ts           |  18 +
 package/src/types/map.ts                      |  36 +
 38 files changed, 3009 insertions(+), 578 deletions(-)
 create mode 100644 package/android/src/main/java/com/margelo/nitro/nitromaps/ClusterBadgeMetrics.kt
 create mode 100644 package/android/src/main/java/com/margelo/nitro/nitromaps/ClusterIconFactory.kt
 create mode 100644 package/android/src/main/java/com/margelo/nitro/nitromaps/MarkerClusterEngine.kt
 create mode 100644 package/android/src/main/java/com/margelo/nitro/nitromaps/MarkerSpatialIndex.kt
 create mode 100644 package/android/src/main/java/com/margelo/nitro/nitromaps/MarkerViewportFilter.kt
 delete mode 100644 package/android/src/main/java/com/margelo/nitro/nitromaps/NitroClusterItem.kt
 create mode 100644 package/ios/ClusterBadgeMetrics.swift
 create mode 100644 package/ios/MKMapView+ScaleAppearance.swift
 create mode 100644 package/ios/MapClusterAnnotation.swift
 create mode 100644 package/ios/MarkerClusterEngine.swift
 create mode 100644 package/ios/MarkerSpatialIndex.swift
 create mode 100644 package/ios/MarkerViewportFilter.swift
 create mode 100644 package/ios/NitroClusterAnnotationView.swift
 create mode 100644 package/ios/NitroMKMapView.swift
 create mode 100644 package/ios/NitroPinAnnotationView.swift
 create mode 100644 package/src/overlays/overlayType.ts

diff --git a/.gitignore b/.gitignore
index 612864b..e43de33 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,6 +38,7 @@ local.properties
 **/ios/build/
 
 # IDE
+.cursor/
 .idea/
 .vscode/
 *.swp
diff --git a/bun.lock b/bun.lock
index e5582f9..9061dd8 100644
--- a/bun.lock
+++ b/bun.lock
@@ -26,6 +26,8 @@
         "react-native": "0.85.3",
         "react-native-nitro-maps": "workspace:*",
         "react-native-nitro-modules": "^0.35.10",
+        "react-native-reanimated": "4.3.1",
+        "react-native-worklets": "0.8.3",
       },
       "devDependencies": {
         "@babel/core": "^7.27.4",
@@ -235,6 +237,10 @@
 
     "@babel/plugin-transform-react-jsx-development": ["@babel/plugin-transform-react-jsx-development@7.29.7", "", { "dependencies": { "@babel/plugin-transform-react-jsx": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-Xfy3UVMF04+ypnFbkhvfqtmvwfe92qwQdbGZVonhE+6v35GzlofmOnA1szaZqzb9xYWr0nl1e5EMmzi0DNON1g=="],
 
+    "@babel/plugin-transform-react-jsx-self": ["@babel/plugin-transform-react-jsx-self@7.29.7", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-TL0hMc9xzy86VD31nUiwzd5otRAcyEPcsegCxolO0PvcXuH1v0kECe/UIznYFihpkvU5wg/jk4v0TTEFfm53fw=="],
+
+    "@babel/plugin-transform-react-jsx-source": ["@babel/plugin-transform-react-jsx-source@7.29.7", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-06IyK09H3wi4cGbhDBwp5gUGo0IKtnYa8tyTiephirPCK6fbobVGiXMMI5zLQ4aKEYP3wZ3ArU44o+8KMrSG/Q=="],
+
     "@babel/plugin-transform-react-pure-annotations": ["@babel/plugin-transform-react-pure-annotations@7.29.7", "", { "dependencies": { "@babel/helper-annotate-as-pure": "^7.29.7", "@babel/helper-plugin-utils": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-H5E+HBgDpr6Q5t+Aj11tL7XkIui1jhbIoArVQnqjgXo5/3YxkN7ZEBcWF4RQlB0T4rrxJQbXS6kiFV6B7XTqUA=="],
 
     "@babel/plugin-transform-regenerator": ["@babel/plugin-transform-regenerator@7.29.7", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-rNNFV0DBAJp988xW2DOntfDoYn1eR8GGF5AT5vYc+rjyfaQkM242c9tZUHHPe7KYaiJizXPWhQTzzdbXySyhBw=="],
@@ -401,6 +407,8 @@
 
     "@react-native/babel-plugin-codegen": ["@react-native/babel-plugin-codegen@0.85.3", "", { "dependencies": { "@babel/traverse": "^7.29.0", "@react-native/codegen": "0.85.3" } }, "sha512-Wc94zGfeFG8Njf9SHMPfYZP04kjigkOps6F1TYTvd7ZVXuGxqseCDgxc50LWcOhOCLypI9n3oVVqz81C3p44ZA=="],
 
+    "@react-native/babel-preset": ["@react-native/babel-preset@0.86.0", "", { "dependencies": { "@babel/core": "^7.25.2", "@babel/plugin-proposal-export-default-from": "^7.24.7", "@babel/plugin-syntax-dynamic-import": "^7.8.3", "@babel/plugin-syntax-export-default-from": "^7.24.7", "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", "@babel/plugin-syntax-optional-chaining": "^7.8.3", "@babel/plugin-transform-async-generator-functions": "^7.25.4", "@babel/plugin-transform-async-to-generator": "^7.24.7", "@babel/plugin-transform-block-scoping": "^7.25.0", "@babel/plugin-transform-class-properties": "^7.25.4", "@babel/plugin-transform-classes": "^7.25.4", "@babel/plugin-transform-destructuring": "^7.24.8", "@babel/plugin-transform-flow-strip-types": "^7.25.2", "@babel/plugin-transform-for-of": "^7.24.7", "@babel/plugin-transform-modules-commonjs": "^7.24.8", "@babel/plugin-transform-named-capturing-groups-regex": "^7.24.7", "@babel/plugin-transform-nullish-coalescing-operator": "^7.24.7", "@babel/plugin-transform-optional-catch-binding": "^7.24.7", "@babel/plugin-transform-optional-chaining": "^7.24.8", "@babel/plugin-transform-private-methods": "^7.24.7", "@babel/plugin-transform-private-property-in-object": "^7.24.7", "@babel/plugin-transform-react-display-name": "^7.24.7", "@babel/plugin-transform-react-jsx": "^7.25.2", "@babel/plugin-transform-react-jsx-self": "^7.24.7", "@babel/plugin-transform-react-jsx-source": "^7.24.7", "@babel/plugin-transform-regenerator": "^7.24.7", "@babel/plugin-transform-runtime": "^7.24.7", "@babel/plugin-transform-typescript": "^7.25.2", "@babel/plugin-transform-unicode-regex": "^7.24.7", "@react-native/babel-plugin-codegen": "0.86.0", "babel-plugin-syntax-hermes-parser": "0.36.0", "babel-plugin-transform-flow-enums": "^0.0.2", "react-refresh": "^0.14.0" } }, "sha512-bYQcWiPySNvF4dns9Ls9gMmwgq66ohvM9Fwc/Kn8r85t66UNHxch3p1QwPiSorDelFauZwJbgo9+ReibTgvpbA=="],
+
     "@react-native/codegen": ["@react-native/codegen@0.85.3", "", { "dependencies": { "@babel/core": "^7.25.2", "@babel/parser": "^7.29.0", "hermes-parser": "0.33.3", "invariant": "^2.2.4", "nullthrows": "^1.1.1", "tinyglobby": "^0.2.15", "yargs": "^17.6.2" } }, "sha512-/JkS1lGLyzBWP1FbgDwaqEf7qShIC6pUC1M0a/YMAd/v4iqR24MRkQWe7jkYvcBQ2LpEhs5NGE9InhxSv21zCA=="],
 
     "@react-native/community-cli-plugin": ["@react-native/community-cli-plugin@0.85.3", "", { "dependencies": { "@react-native/dev-middleware": "0.85.3", "debug": "^4.4.0", "invariant": "^2.2.4", "metro": "^0.84.3", "metro-config": "^0.84.3", "metro-core": "^0.84.3", "semver": "^7.1.3" }, "peerDependencies": { "@react-native-community/cli": "*", "@react-native/metro-config": "0.85.3" }, "optionalPeers": ["@react-native-community/cli", "@react-native/metro-config"] }, "sha512-fs85dmbIqNmtzEixDb0g+q6R3Vt4H9eAt8/inIZdDKfjN76+sUJA2r1nxODQ76bU23MrIbz8sI7KFBPaWk/zQw=="],
@@ -415,6 +423,10 @@
 
     "@react-native/js-polyfills": ["@react-native/js-polyfills@0.85.3", "", {}, "sha512-U2+aMshIXf1uFn77tpBb/xhHWB9vkVrMpt7kkucAugF8hJKYTDGB587X7WwelHduK2KBfhl4giSv0rzZGoef9A=="],
 
+    "@react-native/metro-babel-transformer": ["@react-native/metro-babel-transformer@0.86.0", "", { "dependencies": { "@babel/core": "^7.25.2", "@react-native/babel-preset": "0.86.0", "hermes-parser": "0.36.0", "nullthrows": "^1.1.1" } }, "sha512-SjKej3E5qIahqo/G+rSOrmJUQM44RyKtWtO+VfmKAAMoJWkBFomM22hTLKCIS5cdbIAJ9COAmU+KAi2wVSO0wQ=="],
+
+    "@react-native/metro-config": ["@react-native/metro-config@0.86.0", "", { "dependencies": { "@react-native/js-polyfills": "0.86.0", "@react-native/metro-babel-transformer": "0.86.0", "metro-config": "^0.84.3", "metro-runtime": "^0.84.3" } }, "sha512-7v+xbTeEci9ZcQ/Z1OqI4RXcqN69wSMDYL5BAMvOReZ7U04+aDQ0/SQhClYPn6x2/RxM4WzMKSAuNyLKqvYVtw=="],
+
     "@react-native/normalize-colors": ["@react-native/normalize-colors@0.85.3", "", {}, "sha512-hj0PScZEhIbcOvQV5yMKX3ha4XEIOy/SVE1Rrpp0beW0dpNLOgSC7KDxGewmDnIHK9YdQUXGY9eMEfShUMIaZw=="],
 
     "@react-native/virtualized-lists": ["@react-native/virtualized-lists@0.85.3", "", { "dependencies": { "invariant": "^2.2.4", "nullthrows": "^1.1.1" }, "peerDependencies": { "@types/react": "^19.2.0", "react": "*", "react-native": "0.85.3" }, "optionalPeers": ["@types/react"] }, "sha512-dsCjI//OIPEUJMyNHp4l7zNLVjCx7bcaRUceOCkU+IB17hkbtbGWvi7HjGFSzy7FJGmS/MOlcfpb72xXiy1Oig=="],
@@ -1175,6 +1187,10 @@
 
     "react-native-nitro-modules": ["react-native-nitro-modules@0.35.10", "", { "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-KsySOAIkbSTjNiX2GvXiNT9P5DMeZd99yvtE/+Lw7RXV7Ztxh9Z+YyAbYkBqadhN5J/KXXuPjhRYgyLOIZgsbQ=="],
 
+    "react-native-reanimated": ["react-native-reanimated@4.3.1", "", { "dependencies": { "react-native-is-edge-to-edge": "^1.3.1", "semver": "^7.7.3" }, "peerDependencies": { "react": "*", "react-native": "0.81 - 0.85", "react-native-worklets": "0.8.x" } }, "sha512-KhGsS0YkCA+gusgyzlf9hnqzVPIR398KTpqXyqq/+yYJJPAvyEEPKcxlB0xtOOXSMrR2A9uRKVARVQhZwrOh+Q=="],
+
+    "react-native-worklets": ["react-native-worklets@0.8.3", "", { "dependencies": { "@babel/plugin-transform-arrow-functions": "^7.27.1", "@babel/plugin-transform-class-properties": "^7.27.1", "@babel/plugin-transform-classes": "^7.28.4", "@babel/plugin-transform-nullish-coalescing-operator": "^7.27.1", "@babel/plugin-transform-optional-chaining": "^7.27.1", "@babel/plugin-transform-shorthand-properties": "^7.27.1", "@babel/plugin-transform-template-literals": "^7.27.1", "@babel/plugin-transform-unicode-regex": "^7.27.1", "@babel/preset-typescript": "^7.27.1", "convert-source-map": "^2.0.0", "semver": "^7.7.3" }, "peerDependencies": { "@babel/core": "*", "@react-native/metro-config": "*", "react": "*", "react-native": "0.81 - 0.85" } }, "sha512-oCBJROyLU7yG/1R8s0INMflygTH71bx+5XcYkH0CM938TlhSoVbiunE1WVW5FZa51vwYqfLie/IXMX2s1Kh3eg=="],
+
     "react-refresh": ["react-refresh@0.14.2", "", {}, "sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA=="],
 
     "reflect.getprototypeof": ["reflect.getprototypeof@1.0.10", "", { "dependencies": { "call-bind": "^1.0.8", "define-properties": "^1.2.1", "es-abstract": "^1.23.9", "es-errors": "^1.3.0", "es-object-atoms": "^1.0.0", "get-intrinsic": "^1.2.7", "get-proto": "^1.0.1", "which-builtin-type": "^1.2.1" } }, "sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw=="],
@@ -1441,8 +1457,16 @@
 
     "@expo/ws-tunnel/ws": ["ws@8.21.0", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": ">=5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-Vsp28b7DRcimFQvrqu2Wek3z1iYxDCWqHYB8Qsnk/S4RfaCQzPGPyBNuVjJV3cd6UiKtUtp6sNM77gWvzcCH+g=="],
 
+    "@react-native/babel-preset/@react-native/babel-plugin-codegen": ["@react-native/babel-plugin-codegen@0.86.0", "", { "dependencies": { "@babel/traverse": "^7.29.0", "@react-native/codegen": "0.86.0" } }, "sha512-qdsABWNW7uTll90l4Vh03gjeyu3WVDi2CyiiyvYGMRDcoYbjbQi6df3BMAm9lQI2yslZ1T14LlDDAsgTwNxplA=="],
+
+    "@react-native/babel-preset/babel-plugin-syntax-hermes-parser": ["babel-plugin-syntax-hermes-parser@0.36.0", "", { "dependencies": { "hermes-parser": "0.36.0" } }, "sha512-LhD0xdoedDw7ansQgXbB2DADLZIK/LRXuWNBPuVzMc5S2WK5GyT89tCM+cQzxFGO0mGyLK6D5TrVOJJzAoDy8Q=="],
+
     "@react-native/community-cli-plugin/semver": ["semver@7.8.5", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA=="],
 
+    "@react-native/metro-babel-transformer/hermes-parser": ["hermes-parser@0.36.0", "", { "dependencies": { "hermes-estree": "0.36.0" } }, "sha512-GdpwMmH5x6IpC1cijvcvYnlPB60Mh6kTSF/NFdYV/j56gYdi+0RIakYs+eqOV+bbO0SW7mgVVGSsTJxyPQfo3w=="],
+
+    "@react-native/metro-config/@react-native/js-polyfills": ["@react-native/js-polyfills@0.86.0", "", {}, "sha512-zYy/Cjd1VTnZ2iCNaG9bDF9C3l2ntESiPRscjIlI5FKugu6aeTwsDSv1aI8Bc4Kp3vEdoVg+UQhLAhE4svREaQ=="],
+
     "@ts-morph/common/minimatch": ["minimatch@10.2.5", "", { "dependencies": { "brace-expansion": "^5.0.5" } }, "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg=="],
 
     "@typescript-eslint/eslint-plugin/ignore": ["ignore@7.0.5", "", {}, "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg=="],
@@ -1529,6 +1553,10 @@
 
     "react-native-builder-bob/typescript": ["typescript@6.0.3", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw=="],
 
+    "react-native-reanimated/semver": ["semver@7.8.5", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA=="],
+
+    "react-native-worklets/semver": ["semver@7.8.5", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA=="],
+
     "send/debug": ["debug@2.6.9", "", { "dependencies": { "ms": "2.0.0" } }, "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="],
 
     "simple-plist/bplist-parser": ["bplist-parser@0.3.1", "", { "dependencies": { "big-integer": "1.6.x" } }, "sha512-PyJxiNtA5T2PlLIeBot4lbp7rj4OadzjnMZD/G5zuBNt8ei/yCU7+wW0h2bag9vr8c+/WuRWmSxbqAl9hL1rBA=="],
@@ -1541,6 +1569,12 @@
 
     "@expo/fingerprint/minimatch/brace-expansion": ["brace-expansion@5.0.6", "", { "dependencies": { "balanced-match": "^4.0.2" } }, "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g=="],
 
+    "@react-native/babel-preset/@react-native/babel-plugin-codegen/@react-native/codegen": ["@react-native/codegen@0.86.0", "", { "dependencies": { "@babel/core": "^7.25.2", "@babel/parser": "^7.29.0", "hermes-parser": "0.36.0", "invariant": "^2.2.4", "nullthrows": "^1.1.1", "tinyglobby": "^0.2.15", "yargs": "^17.6.2" } }, "sha512-uTs9DBo3+/lUqinsGZK0FKJRBVClrwMXoZToaDxE1Q2SL2e55vs2GwyZfIKzPl5uJnbu4PfFMIp0/mLXLWUMuA=="],
+
+    "@react-native/babel-preset/babel-plugin-syntax-hermes-parser/hermes-parser": ["hermes-parser@0.36.0", "", { "dependencies": { "hermes-estree": "0.36.0" } }, "sha512-GdpwMmH5x6IpC1cijvcvYnlPB60Mh6kTSF/NFdYV/j56gYdi+0RIakYs+eqOV+bbO0SW7mgVVGSsTJxyPQfo3w=="],
+
+    "@react-native/metro-babel-transformer/hermes-parser/hermes-estree": ["hermes-estree@0.36.0", "", {}, "sha512-A1+8zn5oss2CFP7pKsOaxorQG6FNIz1WU1VDqruLPPZl3LVgeE2C5xfFg8Ow6/Ow4mSslLLtYP1J3n38eKyW9w=="],
+
     "@ts-morph/common/minimatch/brace-expansion": ["brace-expansion@5.0.6", "", { "dependencies": { "balanced-match": "^4.0.2" } }, "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g=="],
 
     "@typescript-eslint/typescript-estree/minimatch/brace-expansion": ["brace-expansion@5.0.6", "", { "dependencies": { "balanced-match": "^4.0.2" } }, "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g=="],
@@ -1585,6 +1619,10 @@
 
     "@expo/fingerprint/minimatch/brace-expansion/balanced-match": ["balanced-match@4.0.4", "", {}, "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA=="],
 
+    "@react-native/babel-preset/@react-native/babel-plugin-codegen/@react-native/codegen/hermes-parser": ["hermes-parser@0.36.0", "", { "dependencies": { "hermes-estree": "0.36.0" } }, "sha512-GdpwMmH5x6IpC1cijvcvYnlPB60Mh6kTSF/NFdYV/j56gYdi+0RIakYs+eqOV+bbO0SW7mgVVGSsTJxyPQfo3w=="],
+
+    "@react-native/babel-preset/babel-plugin-syntax-hermes-parser/hermes-parser/hermes-estree": ["hermes-estree@0.36.0", "", {}, "sha512-A1+8zn5oss2CFP7pKsOaxorQG6FNIz1WU1VDqruLPPZl3LVgeE2C5xfFg8Ow6/Ow4mSslLLtYP1J3n38eKyW9w=="],
+
     "@ts-morph/common/minimatch/brace-expansion/balanced-match": ["balanced-match@4.0.4", "", {}, "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA=="],
 
     "@typescript-eslint/typescript-estree/minimatch/brace-expansion/balanced-match": ["balanced-match@4.0.4", "", {}, "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA=="],
@@ -1601,6 +1639,8 @@
 
     "react-native-builder-bob/babel-plugin-syntax-hermes-parser/hermes-parser/hermes-estree": ["hermes-estree@0.34.0", "", {}, "sha512-6qLylexjmuKa/YYhMiNn/3VejBsdzwmYUGmNpc693/pJzymmbufhkRW/2K6GqFgu0ApRWoqF0NbM6u82jFcOXA=="],
 
+    "@react-native/babel-preset/@react-native/babel-plugin-codegen/@react-native/codegen/hermes-parser/hermes-estree": ["hermes-estree@0.36.0", "", {}, "sha512-A1+8zn5oss2CFP7pKsOaxorQG6FNIz1WU1VDqruLPPZl3LVgeE2C5xfFg8Ow6/Ow4mSslLLtYP1J3n38eKyW9w=="],
+
     "log-symbols/chalk/ansi-styles/color-convert/color-name": ["color-name@1.1.3", "", {}, "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="],
 
     "ora/chalk/ansi-styles/color-convert/color-name": ["color-name@1.1.3", "", {}, "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="],
diff --git a/docs/architecture.md b/docs/architecture.md
index c9d07fc..439d434 100644
--- a/docs/architecture.md
+++ b/docs/architecture.md
@@ -62,8 +62,8 @@ Map and overlay callbacks are wired through Nitro listeners on the HybridView. C
 
 | Prop / method | Notes |
 | --- | --- |
-| `clusteringEnabled` | Platform-native clustering (MapKit `clusteringIdentifier` on iOS; `ClusterManager` from maps-utils on Android). |
-| `Marker.clusterable` | Opt-out per marker (defaults to `true`). |
+| `clusteringEnabled` | Custom grid-based clustering via `MarkerClusterEngine` on both platforms (viewport-aware, background compute). |
+| `Marker.clusterable` | Opt-out per marker (defaults to `true`). Non-clusterable markers always render individually. |
 | `customMapStyle` | JSON string. Full support on Android via `MapStyleOptions`. iOS 16+ applies a curated subset (POI/transit visibility, elevation) via `MKMapConfiguration`. |
 | `showsUserLocation` / `followsUserLocation` | Toggles the native user-location layer. Host app must request location permission (`NSLocationWhenInUseUsageDescription` on iOS; `ACCESS_FINE_LOCATION` on Android). |
 | `showsCompass` / `showsScale` | Compass on both platforms. Scale is iOS-only (`showsScale` is a no-op on Android). |
diff --git a/example/App.tsx b/example/App.tsx
index 9b95065..ee78b19 100644
--- a/example/App.tsx
+++ b/example/App.tsx
@@ -1,20 +1,43 @@
-import { memo, useCallback, useRef, useState } from 'react';
+import {
+  forwardRef,
+  memo,
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+  type ReactNode,
+} from 'react';
 import { StatusBar } from 'expo-status-bar';
 import {
-  Button,
+  Platform,
   Pressable,
   ScrollView,
   StyleSheet,
   Text,
   View,
+  type StyleProp,
+  type ViewStyle,
 } from 'react-native';
+import Animated, {
+  Easing,
+  FadeIn,
+  FadeInDown,
+  FadeInUp,
+  FadeOut,
+  LinearTransition,
+  cancelAnimation,
+  useAnimatedStyle,
+  useSharedValue,
+  withRepeat,
+  withSequence,
+  withSpring,
+  withTiming,
+} from 'react-native-reanimated';
 import {
-  Circle,
   MapView,
-  Marker,
-  Polygon,
-  Polyline,
   type Coordinate,
+  type EdgePadding,
   type MapType,
   type MapViewRef,
 } from 'react-native-nitro-maps';
@@ -22,72 +45,403 @@ import { MAP_SCENARIOS, type MapScenario } from './examples';
 
 const MAP_TYPES: MapType[] = ['standard', 'satellite', 'hybrid'];
 
-type ScenarioInfoProps = {
-  scenario: MapScenario;
-  scenarioIndex: number;
-  onSelect: (index: number) => void;
+const MAP_TYPE_LABELS: Record<MapType, string> = {
+  standard: 'Standard',
+  satellite: 'Satellite',
+  hybrid: 'Hybrid',
+  terrain: 'Terrain',
 };
 
-// Memoized so frequent `status` updates on the parent don't re-render the
-// scenario title, description, and chip picker (none depend on `status`).
-const ScenarioInfo = memo(function ScenarioInfo({
-  scenario,
-  scenarioIndex,
-  onSelect,
-}: ScenarioInfoProps) {
+/** Left inset reserved for the native map scale control. */
+const SCALE_GUTTER_WIDTH = 156;
+
+const springSnappy = { damping: 22, stiffness: 420 };
+const springSoft = { damping: 20, stiffness: 240 };
+
+const AnimatedPressable = Animated.createAnimatedComponent(Pressable);
+
+function mergeMapPadding(
+  padding: EdgePadding | undefined,
+  showsScale: boolean,
+  showsCompass: boolean,
+): EdgePadding | undefined {
+  if (padding == null && !showsScale) {
+    return undefined;
+  }
+
+  const base = padding ?? { top: 0, right: 0, bottom: 0, left: 0 };
+
+  if (!showsScale) {
+    return base;
+  }
+
+  return {
+    top: Math.max(base.top, 56),
+    right: Math.max(base.right, showsCompass ? 52 : 16),
+    bottom: base.bottom,
+    left: Math.max(base.left, 12),
+  };
+}
+
+const palette = {
+  surface: 'rgba(18, 18, 20, 0.9)',
+  surfaceElevated: 'rgba(28, 28, 32, 0.96)',
+  border: 'rgba(255, 255, 255, 0.1)',
+  borderStrong: 'rgba(255, 255, 255, 0.18)',
+  accent: '#3B82F6',
+  accentSoft: 'rgba(59, 130, 246, 0.22)',
+  text: '#FFFFFF',
+  textSecondary: 'rgba(255, 255, 255, 0.72)',
+  textMuted: 'rgba(255, 255, 255, 0.48)',
+  success: '#34D399',
+  warning: '#FBBF24',
+};
+
+type ScalePressableProps = {
+  onPress: () => void;
+  style?: StyleProp<ViewStyle>;
+  children: ReactNode;
+  hitSlop?: number;
+};
+
+const ScalePressable = memo(function ScalePressable({
+  onPress,
+  style,
+  children,
+  hitSlop,
+}: ScalePressableProps) {
+  const scale = useSharedValue(1);
+
+  const animatedStyle = useAnimatedStyle(() => ({
+    transform: [{ scale: scale.value }],
+  }));
+
+  return (
+    <AnimatedPressable
+      hitSlop={hitSlop}
+      style={[style, animatedStyle]}
+      onPress={onPress}
+      onPressIn={() => {
+        scale.value = withSpring(0.96, springSnappy);
+      }}
+      onPressOut={() => {
+        scale.value = withSpring(1, springSnappy);
+      }}
+    >
+      {children}
+    </AnimatedPressable>
+  );
+});
+
+type StatusDotProps = {
+  mapReady: boolean;
+};
+
+const StatusDot = memo(function StatusDot({ mapReady }: StatusDotProps) {
+  const opacity = useSharedValue(1);
+
+  useEffect(() => {
+    if (mapReady) {
+      cancelAnimation(opacity);
+      opacity.value = withTiming(1, { duration: 200 });
+      return;
+    }
+
+    opacity.value = withRepeat(
+      withSequence(
+        withTiming(0.35, {
+          duration: 700,
+          easing: Easing.inOut(Easing.ease),
+        }),
+        withTiming(1, {
+          duration: 700,
+          easing: Easing.inOut(Easing.ease),
+        }),
+      ),
+      -1,
+      false,
+    );
+  }, [mapReady, opacity]);
+
+  const animatedStyle = useAnimatedStyle(() => ({
+    opacity: opacity.value,
+    backgroundColor: mapReady ? palette.success : palette.warning,
+  }));
+
+  return <Animated.View style={[styles.statusDot, animatedStyle]} />;
+});
+
+type ScenarioChipProps = {
+  index: number;
+  label: string;
+  active: boolean;
+  onPress: () => void;
+};
+
+const ScenarioChip = memo(function ScenarioChip({
+  index,
+  label,
+  active,
+  onPress,
+}: ScenarioChipProps) {
   return (
-    <>
-      <Text style={styles.scenarioTitle}>{scenario.name}</Text>
-      <Text style={styles.scenarioDescription}>{scenario.description}</Text>
-      <ScrollView
-        horizontal
-        showsHorizontalScrollIndicator={false}
-        contentContainerStyle={styles.scenarioPicker}
+    <Animated.View layout={LinearTransition.springify().damping(20).stiffness(260)}>
+      <ScalePressable
+        onPress={onPress}
+        style={[styles.scenarioChip, active && styles.scenarioChipActive]}
       >
-        {MAP_SCENARIOS.map((item, index) => (
-          <Pressable
-            key={item.id}
-            style={[
-              styles.scenarioChip,
-              index === scenarioIndex && styles.scenarioChipActive,
-            ]}
-            onPress={() => onSelect(index)}
-          >
-            <Text
-              style={[
-                styles.scenarioChipText,
-                index === scenarioIndex && styles.scenarioChipTextActive,
-              ]}
-            >
-              {item.name}
-            </Text>
-          </Pressable>
-        ))}
-      </ScrollView>
-    </>
+        <Text
+          style={[styles.scenarioChipIndex, active && styles.scenarioChipIndexActive]}
+        >
+          {index + 1}
+        </Text>
+        <Text
+          style={[styles.scenarioChipText, active && styles.scenarioChipTextActive]}
+        >
+          {label}
+        </Text>
+      </ScalePressable>
+    </Animated.View>
   );
 });
 
-type MapControlsProps = {
+type ScenarioDockProps = {
+  scenario: MapScenario;
+  scenarioIndex: number;
+  expanded: boolean;
   mapTypeLabel: MapType;
+  onToggleExpanded: () => void;
+  onSelect: (index: number) => void;
   onAnimateCamera: () => void;
   onGetCamera: () => void;
   onCycleMapType: () => void;
 };
 
-// Memoized so the button row bails out of `status`-driven re-renders.
-const MapControls = memo(function MapControls({
+const ScenarioDock = memo(function ScenarioDock({
+  scenario,
+  scenarioIndex,
+  expanded,
   mapTypeLabel,
+  onToggleExpanded,
+  onSelect,
   onAnimateCamera,
   onGetCamera,
   onCycleMapType,
-}: MapControlsProps) {
+}: ScenarioDockProps) {
+  const chevronRotation = useSharedValue(0);
+
+  useEffect(() => {
+    chevronRotation.value = withTiming(expanded ? 180 : 0, {
+      duration: 240,
+      easing: Easing.out(Easing.cubic),
+    });
+  }, [expanded, chevronRotation]);
+
+  const chevronStyle = useAnimatedStyle(() => ({
+    transform: [{ rotate: `${chevronRotation.value}deg` }],
+  }));
+
   return (
-    <View style={styles.buttons}>
-      <Button title="Animate camera" onPress={onAnimateCamera} />
-      <Button title="Get camera" onPress={onGetCamera} />
-      <Button title={`Map type: ${mapTypeLabel}`} onPress={onCycleMapType} />
-    </View>
+    <Animated.View
+      entering={FadeInUp.duration(420).delay(120).springify().damping(20).stiffness(220)}
+      layout={LinearTransition.springify().damping(20).stiffness(240)}
+      style={[styles.dock, expanded && styles.dockExpandedContainer]}
+    >
+      {expanded ? (
+        <Animated.View
+          entering={FadeInDown.duration(260).springify().damping(20).stiffness(260)}
+          exiting={FadeOut.duration(160)}
+          style={styles.dockExpanded}
+        >
+          <View style={styles.dockHeader}>
+            <View style={styles.dockHeaderText}>
+              <Text style={styles.dockEyebrow}>
+                Scenario {scenarioIndex + 1} of {MAP_SCENARIOS.length}
+              </Text>
+              <Text style={styles.dockTitle} numberOfLines={1}>
+                {scenario.name}
+              </Text>
+            </View>
+            <ScalePressable onPress={onToggleExpanded} hitSlop={8} style={styles.iconButton}>
+              <Animated.Text style={[styles.iconButtonText, chevronStyle]}>▴</Animated.Text>
+            </ScalePressable>
+          </View>
+
+          <Text style={styles.dockDescription}>{scenario.description}</Text>
+
+          <View style={styles.divider} />
+
+          <View style={styles.actionRow}>
+            <ScalePressable onPress={onAnimateCamera} style={styles.actionButton}>
+              <Text style={styles.actionButtonIcon}>↻</Text>
+              <Text style={styles.actionButtonText}>Animate</Text>
+            </ScalePressable>
+            <ScalePressable onPress={onGetCamera} style={styles.actionButton}>
+              <Text style={styles.actionButtonIcon}>◎</Text>
+              <Text style={styles.actionButtonText}>Camera</Text>
+            </ScalePressable>
+            <ScalePressable
+              onPress={onCycleMapType}
+              style={[styles.actionButton, styles.actionButtonAccent]}
+            >
+              <Text style={styles.actionButtonIcon}>◫</Text>
+              <Text style={styles.actionButtonText}>
+                {MAP_TYPE_LABELS[mapTypeLabel]}
+              </Text>
+            </ScalePressable>
+          </View>
+        </Animated.View>
+      ) : null}
+
+      <View style={styles.dockRow}>
+        <ScrollView
+          horizontal
+          showsHorizontalScrollIndicator={false}
+          style={styles.scenarioScroll}
+          contentContainerStyle={styles.scenarioPicker}
+        >
+          {MAP_SCENARIOS.map((item, index) => (
+            <ScenarioChip
+              key={item.id}
+              index={index}
+              label={item.name}
+              active={index === scenarioIndex}
+              onPress={() => onSelect(index)}
+            />
+          ))}
+        </ScrollView>
+        {!expanded ? (
+          <ScalePressable onPress={onToggleExpanded} hitSlop={8} style={styles.iconButton}>
+            <Animated.Text style={[styles.iconButtonText, chevronStyle]}>▴</Animated.Text>
+          </ScalePressable>
+        ) : null}
+      </View>
+    </Animated.View>
+  );
+});
+
+type MapSceneProps = {
+  scenario: MapScenario;
+  mapType: MapType;
+  mapPadding?: EdgePadding;
+  onMapReady: () => void;
+  onClusterPress: (markerIds: string[], coordinate: Coordinate) => void;
+  onMarkerPress: (id: string) => void;
+  onMarkerDragEnd: (id: string, coordinate: Coordinate) => void;
+  onOverlayPress: (label: string) => void;
+  onPress: (coordinate: Coordinate) => void;
+  onLongPress: (coordinate: Coordinate) => void;
+};
+
+const MapScene = memo(
+  forwardRef<MapViewRef, MapSceneProps>(function MapScene(
+    {
+      scenario,
+      mapType,
+      mapPadding,
+      onMapReady,
+      onClusterPress,
+      onMarkerPress,
+      onMarkerDragEnd,
+      onOverlayPress,
+      onPress,
+      onLongPress,
+    },
+    ref,
+  ) {
+    return (
+      <MapView
+        ref={ref}
+        key={scenario.id}
+        style={styles.map}
+        mapType={mapType}
+        region={scenario.region}
+        clusteringEnabled={scenario.advanced?.clusteringEnabled}
+        showsUserLocation={scenario.advanced?.showsUserLocation}
+        followsUserLocation={scenario.advanced?.followsUserLocation}
+        showsCompass={scenario.advanced?.showsCompass}
+        showsScale={scenario.advanced?.showsScale}
+        customMapStyle={scenario.advanced?.customMapStyle}
+        mapPadding={mapPadding}
+        markers={scenario.markers}
+        polylines={scenario.polylines}
+        polygons={scenario.polygons}
+        circles={scenario.circles}
+        onMapReady={onMapReady}
+        onClusterPress={onClusterPress}
+        onMarkerPress={onMarkerPress}
+        onMarkerDragEnd={onMarkerDragEnd}
+        onPress={onPress}
+        onLongPress={onLongPress}
+        onPolylinePress={onOverlayPress}
+        onPolygonPress={onOverlayPress}
+        onCirclePress={onOverlayPress}
+      />
+    );
+  }),
+);
+
+type StatusHeaderProps = {
+  status: string;
+  scenarioIndex: number;
+  mapReady: boolean;
+  showsScale: boolean;
+};
+
+const StatusHeader = memo(function StatusHeader({
+  status,
+  scenarioIndex,
+  mapReady,
+  showsScale,
+}: StatusHeaderProps) {
+  const badgeScale = useSharedValue(1);
+
+  useEffect(() => {
+    badgeScale.value = withSequence(
+      withSpring(1.08, springSnappy),
+      withSpring(1, springSoft),
+    );
+  }, [scenarioIndex, badgeScale]);
+
+  const scenarioBadgeStyle = useAnimatedStyle(() => ({
+    transform: [{ scale: badgeScale.value }],
+  }));
+
+  return (
+    <Animated.View
+      entering={FadeInDown.duration(360).delay(60).springify().damping(20).stiffness(240)}
+      style={[styles.header, showsScale && styles.headerWithScale]}
+      pointerEvents="none"
+    >
+      {showsScale ? <View style={styles.scaleGutter} /> : null}
+
+      <View style={styles.headerContent}>
+        <View style={styles.headerTopRow}>
+          <View style={styles.brandBadge}>
+            <Text style={styles.brandBadgeText}>NITRO MAPS</Text>
+          </View>
+          <Animated.View style={[styles.scenarioBadge, scenarioBadgeStyle]}>
+            <Text style={styles.scenarioBadgeText}>
+              {scenarioIndex + 1}/{MAP_SCENARIOS.length}
+            </Text>
+          </Animated.View>
+        </View>
+
+        <View style={styles.statusCard}>
+          <StatusDot mapReady={mapReady} />
+          <Animated.View
+            key={status}
+            entering={FadeIn.duration(180)}
+            exiting={FadeOut.duration(120)}
+            style={styles.statusTextWrap}
+          >
+            <Text style={styles.statusText} numberOfLines={2}>
+              {status}
+            </Text>
+          </Animated.View>
+        </View>
+      </View>
+    </Animated.View>
   );
 });
 
@@ -96,14 +450,17 @@ export default function App() {
   const [scenarioIndex, setScenarioIndex] = useState(0);
   const [mapTypeIndex, setMapTypeIndex] = useState(0);
   const [status, setStatus] = useState('Waiting for map...');
+  const [mapReady, setMapReady] = useState(false);
+  const [dockExpanded, setDockExpanded] = useState(false);
 
   const scenario = MAP_SCENARIOS[scenarioIndex];
-
-  const handleRegionChange = useCallback((region: MapScenario['region']) => {
-    setStatus(
-      `Region: ${region.latitude.toFixed(4)}, ${region.longitude.toFixed(4)}`,
-    );
-  }, []);
+  const showsScale = scenario.advanced?.showsScale === true;
+  const showsCompass = scenario.advanced?.showsCompass === true;
+  const mapPadding = useMemo(
+    () =>
+      mergeMapPadding(scenario.advanced?.mapPadding, showsScale, showsCompass),
+    [scenario, showsScale, showsCompass],
+  );
 
   const handleAnimateCamera = useCallback(() => {
     mapRef.current?.animateCamera(
@@ -127,7 +484,7 @@ export default function App() {
     }
 
     setStatus(
-      `Camera zoom ${camera.zoom?.toFixed(1) ?? '?'} @ ${camera.center.latitude.toFixed(4)}, ${camera.center.longitude.toFixed(4)}`,
+      `zoom ${camera.zoom?.toFixed(1) ?? '?'} · ${camera.center.latitude.toFixed(4)}, ${camera.center.longitude.toFixed(4)}`,
     );
   }, []);
 
@@ -137,37 +494,43 @@ export default function App() {
 
   const selectScenario = useCallback((index: number) => {
     setScenarioIndex(index);
-    setStatus(`Scenario: ${MAP_SCENARIOS[index].name}`);
+    setMapReady(false);
+    setStatus(MAP_SCENARIOS[index].name);
   }, []);
 
-  const handleMarkerPress = useCallback((label: string) => {
-    setStatus(`Marker pressed: ${label}`);
+  const toggleDockExpanded = useCallback(() => {
+    setDockExpanded((current) => !current);
+  }, []);
+
+  const handleMarkerPress = useCallback((id: string) => {
+    setStatus(`Marker · ${id}`);
   }, []);
 
   const handleMarkerDragEnd = useCallback(
-    (label: string, coordinate: Coordinate) => {
+    (id: string, coordinate: Coordinate) => {
       setStatus(
-        `${label} dragged to ${coordinate.latitude.toFixed(4)}, ${coordinate.longitude.toFixed(4)}`,
+        `${id} → ${coordinate.latitude.toFixed(4)}, ${coordinate.longitude.toFixed(4)}`,
       );
     },
     [],
   );
 
   const handleOverlayPress = useCallback((label: string) => {
-    setStatus(`${label} pressed`);
+    setStatus(label);
   }, []);
 
   const handleClusterPress = useCallback(
     (markerIds: string[], coordinate: Coordinate) => {
       setStatus(
-        `Cluster (${markerIds.length} markers) @ ${coordinate.latitude.toFixed(4)}, ${coordinate.longitude.toFixed(4)}`,
+        `Cluster (${markerIds.length}) · ${coordinate.latitude.toFixed(4)}, ${coordinate.longitude.toFixed(4)}`,
       );
     },
     [],
   );
 
   const handleMapReady = useCallback(() => {
-    setStatus(`Map ready — ${scenario.name}`);
+    setMapReady(true);
+    setStatus(scenario.name);
 
     if (scenario.advanced?.fitToCoordinatesOnReady && scenario.markers != null) {
       mapRef.current?.fitToCoordinates(
@@ -178,90 +541,53 @@ export default function App() {
     }
   }, [scenario]);
 
+  const handleMapPress = useCallback((coordinate: Coordinate) => {
+    setStatus(
+      `${coordinate.latitude.toFixed(4)}, ${coordinate.longitude.toFixed(4)}`,
+    );
+  }, []);
+
+  const handleMapLongPress = useCallback((coordinate: Coordinate) => {
+    setStatus(
+      `Long · ${coordinate.latitude.toFixed(4)}, ${coordinate.longitude.toFixed(4)}`,
+    );
+  }, []);
+
   return (
     <View style={styles.container}>
-      <MapView
-        key={scenario.id}
+      <MapScene
         ref={mapRef}
-        style={styles.map}
+        scenario={scenario}
         mapType={MAP_TYPES[mapTypeIndex]}
-        region={scenario.region}
-        clusteringEnabled={scenario.advanced?.clusteringEnabled}
-        showsUserLocation={scenario.advanced?.showsUserLocation}
-        followsUserLocation={scenario.advanced?.followsUserLocation}
-        showsCompass={scenario.advanced?.showsCompass}
-        showsScale={scenario.advanced?.showsScale}
-        customMapStyle={scenario.advanced?.customMapStyle}
-        mapPadding={scenario.advanced?.mapPadding}
+        mapPadding={mapPadding}
         onMapReady={handleMapReady}
-        onRegionChange={handleRegionChange}
-        onRegionChangeComplete={handleRegionChange}
         onClusterPress={handleClusterPress}
-        onPress={(coordinate) =>
-          setStatus(
-            `Map press: ${coordinate.latitude.toFixed(4)}, ${coordinate.longitude.toFixed(4)}`,
-          )
-        }
-        onLongPress={(coordinate) =>
-          setStatus(
-            `Long press: ${coordinate.latitude.toFixed(4)}, ${coordinate.longitude.toFixed(4)}`,
-          )
-        }
-      >
-        {scenario.markers?.map((marker) => (
-          <Marker
-            key={marker.id}
-            {...marker}
-            onPress={() => handleMarkerPress(marker.title ?? marker.id ?? 'Marker')}
-            onDragEnd={
-              marker.draggable
-                ? (coordinate) =>
-                    handleMarkerDragEnd(
-                      marker.title ?? marker.id ?? 'Marker',
-                      coordinate,
-                    )
-                : undefined
-            }
-          />
-        ))}
-        {scenario.polylines?.map((polyline) => (
-          <Polyline
-            key={polyline.id}
-            {...polyline}
-            onPress={() => handleOverlayPress(polyline.id ?? 'Polyline')}
-          />
-        ))}
-        {scenario.polygons?.map((polygon) => (
-          <Polygon
-            key={polygon.id}
-            {...polygon}
-            onPress={() => handleOverlayPress(polygon.id ?? 'Polygon')}
-          />
-        ))}
-        {scenario.circles?.map((circle) => (
-          <Circle
-            key={circle.id}
-            {...circle}
-            onPress={() => handleOverlayPress(circle.id ?? 'Circle')}
-          />
-        ))}
-      </MapView>
-
-      <View style={styles.controls}>
-        <ScenarioInfo
-          scenario={scenario}
-          scenarioIndex={scenarioIndex}
-          onSelect={selectScenario}
-        />
-        <Text style={styles.status}>{status}</Text>
-        <MapControls
-          mapTypeLabel={MAP_TYPES[mapTypeIndex]}
-          onAnimateCamera={handleAnimateCamera}
-          onGetCamera={handleGetCamera}
-          onCycleMapType={cycleMapType}
-        />
-      </View>
-      <StatusBar style="auto" />
+        onMarkerPress={handleMarkerPress}
+        onMarkerDragEnd={handleMarkerDragEnd}
+        onOverlayPress={handleOverlayPress}
+        onPress={handleMapPress}
+        onLongPress={handleMapLongPress}
+      />
+
+      <StatusHeader
+        status={status}
+        scenarioIndex={scenarioIndex}
+        mapReady={mapReady}
+        showsScale={showsScale}
+      />
+
+      <ScenarioDock
+        scenario={scenario}
+        scenarioIndex={scenarioIndex}
+        expanded={dockExpanded}
+        mapTypeLabel={MAP_TYPES[mapTypeIndex]}
+        onToggleExpanded={toggleDockExpanded}
+        onSelect={selectScenario}
+        onAnimateCamera={handleAnimateCamera}
+        onGetCamera={handleGetCamera}
+        onCycleMapType={cycleMapType}
+      />
+      <StatusBar style="light" />
     </View>
   );
 }
@@ -269,53 +595,238 @@ export default function App() {
 const styles = StyleSheet.create({
   container: {
     flex: 1,
+    backgroundColor: '#0A0A0B',
   },
   map: {
     flex: 1,
   },
-  controls: {
+  header: {
     position: 'absolute',
+    top: Platform.OS === 'ios' ? 52 : 16,
     left: 16,
     right: 16,
-    bottom: 32,
+    flexDirection: 'row',
+    alignItems: 'flex-start',
+    gap: 10,
+  },
+  headerWithScale: {
+    top: Platform.OS === 'ios' ? 56 : 20,
+  },
+  scaleGutter: {
+    width: SCALE_GUTTER_WIDTH,
+    height: 56,
+    flexShrink: 0,
+  },
+  headerContent: {
+    flex: 1,
     gap: 8,
-    backgroundColor: 'rgba(255, 255, 255, 0.94)',
-    borderRadius: 12,
-    padding: 12,
+    minWidth: 0,
+  },
+  headerTopRow: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    justifyContent: 'space-between',
+  },
+  brandBadge: {
+    backgroundColor: palette.surface,
+    borderWidth: 1,
+    borderColor: palette.border,
+    borderRadius: 8,
+    paddingHorizontal: 10,
+    paddingVertical: 5,
   },
-  scenarioTitle: {
-    fontSize: 16,
+  brandBadgeText: {
+    fontSize: 10,
+    fontWeight: '700',
+    letterSpacing: 1.4,
+    color: palette.textSecondary,
+  },
+  scenarioBadge: {
+    backgroundColor: palette.accentSoft,
+    borderWidth: 1,
+    borderColor: 'rgba(59, 130, 246, 0.35)',
+    borderRadius: 999,
+    paddingHorizontal: 10,
+    paddingVertical: 4,
+  },
+  scenarioBadgeText: {
+    fontSize: 11,
     fontWeight: '600',
+    color: palette.accent,
+    fontVariant: ['tabular-nums'],
+  },
+  statusCard: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    gap: 10,
+    backgroundColor: palette.surfaceElevated,
+    borderWidth: 1,
+    borderColor: palette.border,
+    borderRadius: 14,
+    paddingHorizontal: 14,
+    paddingVertical: 10,
+    shadowColor: '#000',
+    shadowOffset: { width: 0, height: 6 },
+    shadowOpacity: 0.24,
+    shadowRadius: 16,
+    elevation: 6,
+  },
+  statusDot: {
+    width: 8,
+    height: 8,
+    borderRadius: 4,
   },
-  scenarioDescription: {
+  statusTextWrap: {
+    flex: 1,
+  },
+  statusText: {
+    fontSize: 13,
+    lineHeight: 18,
+    color: palette.text,
+    fontVariant: ['tabular-nums'],
+  },
+  dock: {
+    position: 'absolute',
+    left: 16,
+    right: 16,
+    bottom: Platform.OS === 'ios' ? 28 : 16,
+    backgroundColor: palette.surfaceElevated,
+    borderWidth: 1,
+    borderColor: palette.border,
+    borderRadius: 20,
+    paddingHorizontal: 12,
+    paddingVertical: 10,
+    shadowColor: '#000',
+    shadowOffset: { width: 0, height: 8 },
+    shadowOpacity: 0.28,
+    shadowRadius: 20,
+    elevation: 10,
+  },
+  dockExpandedContainer: {
+    paddingTop: 12,
+    paddingBottom: 12,
+    gap: 12,
+  },
+  dockRow: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    gap: 8,
+  },
+  scenarioScroll: {
+    flex: 1,
+  },
+  dockHeader: {
+    flexDirection: 'row',
+    alignItems: 'flex-start',
+    justifyContent: 'space-between',
+    gap: 12,
+  },
+  dockHeaderText: {
+    flex: 1,
+    gap: 2,
+  },
+  dockEyebrow: {
+    fontSize: 11,
+    fontWeight: '500',
+    color: palette.textMuted,
+    letterSpacing: 0.2,
+  },
+  dockTitle: {
+    fontSize: 17,
+    fontWeight: '700',
+    color: palette.text,
+    letterSpacing: -0.2,
+  },
+  dockDescription: {
     fontSize: 13,
-    color: '#666',
+    lineHeight: 19,
+    color: palette.textSecondary,
+  },
+  divider: {
+    height: 1,
+    backgroundColor: palette.border,
+  },
+  dockExpanded: {
+    gap: 12,
+  },
+  iconButton: {
+    width: 32,
+    height: 32,
+    borderRadius: 16,
+    backgroundColor: 'rgba(255, 255, 255, 0.08)',
+    borderWidth: 1,
+    borderColor: palette.border,
+    alignItems: 'center',
+    justifyContent: 'center',
+  },
+  iconButtonText: {
+    fontSize: 12,
+    color: palette.textSecondary,
+    marginTop: -1,
+  },
+  actionRow: {
+    flexDirection: 'row',
+    gap: 8,
+  },
+  actionButton: {
+    flex: 1,
+    paddingVertical: 10,
+    borderRadius: 12,
+    backgroundColor: 'rgba(255, 255, 255, 0.06)',
+    borderWidth: 1,
+    borderColor: palette.border,
+    alignItems: 'center',
+    gap: 2,
+  },
+  actionButtonAccent: {
+    backgroundColor: palette.accentSoft,
+    borderColor: 'rgba(59, 130, 246, 0.35)',
+  },
+  actionButtonIcon: {
+    fontSize: 14,
+    color: palette.textSecondary,
+    lineHeight: 16,
+  },
+  actionButtonText: {
+    fontSize: 11,
+    fontWeight: '600',
+    color: palette.text,
   },
   scenarioPicker: {
     gap: 8,
-    paddingVertical: 4,
+    paddingVertical: 2,
   },
   scenarioChip: {
-    paddingHorizontal: 12,
-    paddingVertical: 6,
-    borderRadius: 16,
-    backgroundColor: '#E5E5EA',
+    flexDirection: 'row',
+    alignItems: 'center',
+    gap: 6,
+    paddingHorizontal: 10,
+    paddingVertical: 7,
+    borderRadius: 999,
+    backgroundColor: 'rgba(255, 255, 255, 0.06)',
+    borderWidth: 1,
+    borderColor: palette.border,
   },
   scenarioChipActive: {
-    backgroundColor: '#007AFF',
+    backgroundColor: palette.accentSoft,
+    borderColor: 'rgba(59, 130, 246, 0.45)',
+  },
+  scenarioChipIndex: {
+    fontSize: 10,
+    fontWeight: '700',
+    color: palette.textMuted,
+    fontVariant: ['tabular-nums'],
+  },
+  scenarioChipIndexActive: {
+    color: palette.accent,
   },
   scenarioChipText: {
-    fontSize: 13,
-    color: '#333',
+    fontSize: 12,
+    fontWeight: '500',
+    color: palette.textSecondary,
   },
   scenarioChipTextActive: {
-    color: '#FFF',
+    color: palette.text,
     fontWeight: '600',
   },
-  status: {
-    fontSize: 13,
-  },
-  buttons: {
-    gap: 8,
-  },
 });
diff --git a/example/examples/advancedFeatures.ts b/example/examples/advancedFeatures.ts
index 5b1fa52..579f271 100644
--- a/example/examples/advancedFeatures.ts
+++ b/example/examples/advancedFeatures.ts
@@ -1,31 +1,109 @@
 import type { MapScenario } from './types';
 
-const KRAKOW_CENTER = {
-  latitude: 50.0614,
-  longitude: 19.9366,
+/** Approximate mainland Poland bounding box. */
+const POLAND_BOUNDS = {
+  minLatitude: 49.002,
+  maxLatitude: 54.835,
+  minLongitude: 14.123,
+  maxLongitude: 24.145,
 };
 
-/** Generates a grid of markers around Kraków for clustering demos. */
-function generateClusterMarkers(
+const POLAND_CENTER = {
+  latitude: (POLAND_BOUNDS.minLatitude + POLAND_BOUNDS.maxLatitude) / 2,
+  longitude: (POLAND_BOUNDS.minLongitude + POLAND_BOUNDS.maxLongitude) / 2,
+};
+
+type CityHotspot = { latitude: number; longitude: number; weight: number };
+
+/** Major Polish cities weighted roughly by population (clustering hotspots). */
+const POLAND_CITIES: readonly CityHotspot[] = [
+  { latitude: 52.2297, longitude: 21.0122, weight: 1.8 }, // Warsaw
+  { latitude: 50.0647, longitude: 19.945, weight: 0.78 }, // Kraków
+  { latitude: 51.7592, longitude: 19.456, weight: 0.68 }, // Łódź
+  { latitude: 51.1079, longitude: 17.0385, weight: 0.64 }, // Wrocław
+  { latitude: 52.4064, longitude: 16.9252, weight: 0.54 }, // Poznań
+  { latitude: 54.352, longitude: 18.6466, weight: 0.47 }, // Gdańsk
+  { latitude: 53.4285, longitude: 14.5528, weight: 0.4 }, // Szczecin
+  { latitude: 53.1235, longitude: 18.0084, weight: 0.35 }, // Bydgoszcz
+  { latitude: 51.2465, longitude: 22.5684, weight: 0.34 }, // Lublin
+  { latitude: 50.2649, longitude: 19.0238, weight: 0.5 }, // Katowice (GZM)
+  { latitude: 53.1325, longitude: 23.1688, weight: 0.3 }, // Białystok
+  { latitude: 50.0413, longitude: 21.999, weight: 0.2 }, // Rzeszów
+];
+
+/** Deterministic PRNG so the demo distribution is stable across reloads. */
+function mulberry32(seed: number): () => number {
+  let a = seed >>> 0;
+  return () => {
+    a = (a + 0x6d2b79f5) | 0;
+    let t = Math.imul(a ^ (a >>> 15), 1 | a);
+    t = (t + Math.imul(t ^ (t >>> 7), 61 | t)) ^ t;
+    return ((t ^ (t >>> 14)) >>> 0) / 4294967296;
+  };
+}
+
+function clamp(value: number, min: number, max: number): number {
+  return Math.min(max, Math.max(min, value));
+}
+
+/**
+ * Distributes markers naturally: Gaussian blobs around major cities (weighted
+ * by population) plus a sparse rural scatter. This makes clustering look
+ * organic instead of a rigid lattice.
+ */
+function generatePolandMarkers(
   count: number,
-  spread: number,
-): MapScenario['markers'] {
+): NonNullable<MapScenario['markers']> {
+  const rng = mulberry32(0x5eed);
+  const gaussian = () => {
+    const u = Math.max(rng(), 1e-9);
+    const v = rng();
+    return Math.sqrt(-2 * Math.log(u)) * Math.cos(2 * Math.PI * v);
+  };
+
+  const totalWeight = POLAND_CITIES.reduce((sum, city) => sum + city.weight, 0);
   const markers: NonNullable<MapScenario['markers']> = [];
-  const side = Math.ceil(Math.sqrt(count));
 
   for (let index = 0; index < count; index += 1) {
-    const row = Math.floor(index / side);
-    const col = index % side;
-    const latOffset = (row - side / 2) * spread;
-    const lngOffset = (col - side / 2) * spread;
+    let latitude: number;
+    let longitude: number;
+
+    if (rng() < 0.12) {
+      latitude =
+        POLAND_BOUNDS.minLatitude +
+        rng() * (POLAND_BOUNDS.maxLatitude - POLAND_BOUNDS.minLatitude);
+      longitude =
+        POLAND_BOUNDS.minLongitude +
+        rng() * (POLAND_BOUNDS.maxLongitude - POLAND_BOUNDS.minLongitude);
+    } else {
+      let pick = rng() * totalWeight;
+      let city = POLAND_CITIES[0];
+      for (const candidate of POLAND_CITIES) {
+        pick -= candidate.weight;
+        if (pick <= 0) {
+          city = candidate;
+          break;
+        }
+      }
+      const spread = 0.1 + city.weight * 0.16;
+      latitude = city.latitude + gaussian() * spread;
+      longitude = city.longitude + gaussian() * spread * 1.4;
+    }
 
     markers.push({
-      id: `cluster-${index}`,
+      id: `pl-${index}`,
       coordinate: {
-        latitude: KRAKOW_CENTER.latitude + latOffset,
-        longitude: KRAKOW_CENTER.longitude + lngOffset,
+        latitude: clamp(
+          latitude,
+          POLAND_BOUNDS.minLatitude,
+          POLAND_BOUNDS.maxLatitude,
+        ),
+        longitude: clamp(
+          longitude,
+          POLAND_BOUNDS.minLongitude,
+          POLAND_BOUNDS.maxLongitude,
+        ),
       },
-      title: `Point ${index + 1}`,
       clusterable: true,
     });
   }
@@ -46,20 +124,20 @@ export const advancedFeaturesScenario: MapScenario = {
   id: 'advanced-features',
   name: 'Advanced features',
   description:
-    'Clustering, compass/scale, map padding, and fit-to-coordinates demo',
+    '10k clustered markers across Poland, compass/scale, map padding, and custom style',
   region: {
-    latitude: KRAKOW_CENTER.latitude,
-    longitude: KRAKOW_CENTER.longitude,
-    latitudeDelta: 0.08,
-    longitudeDelta: 0.08,
+    latitude: POLAND_CENTER.latitude,
+    longitude: POLAND_CENTER.longitude,
+    latitudeDelta: 6.2,
+    longitudeDelta: 10.5,
   },
-  markers: generateClusterMarkers(24, 0.008),
+  markers: generatePolandMarkers(10_000),
   advanced: {
     clusteringEnabled: true,
     showsCompass: true,
     showsScale: true,
-    mapPadding: { top: 48, right: 16, bottom: 160, left: 16 },
+    mapPadding: { top: 56, right: 52, bottom: 160, left: 12 },
     customMapStyle: POI_HIDDEN_MAP_STYLE,
-    fitToCoordinatesOnReady: true,
+    fitToCoordinatesOnReady: false,
   },
 };
diff --git a/example/examples/types.ts b/example/examples/types.ts
index 00c0043..08ffb08 100644
--- a/example/examples/types.ts
+++ b/example/examples/types.ts
@@ -1,11 +1,4 @@
-import type {
-  CircleProps,
-  EdgePadding,
-  MarkerProps,
-  PolygonProps,
-  PolylineProps,
-  Region,
-} from 'react-native-nitro-maps';
+import type { EdgePadding, MapViewProps, Region } from 'react-native-nitro-maps';
 
 export interface MapScenarioAdvancedOptions {
   clusteringEnabled?: boolean;
@@ -23,9 +16,9 @@ export interface MapScenario {
   name: string;
   description: string;
   region: Region;
-  markers?: Omit<MarkerProps, 'onPress' | 'onDragEnd'>[];
-  polylines?: Omit<PolylineProps, 'onPress'>[];
-  polygons?: Omit<PolygonProps, 'onPress'>[];
-  circles?: Omit<CircleProps, 'onPress'>[];
+  markers?: NonNullable<MapViewProps['markers']>;
+  polylines?: NonNullable<MapViewProps['polylines']>;
+  polygons?: NonNullable<MapViewProps['polygons']>;
+  circles?: NonNullable<MapViewProps['circles']>;
   advanced?: MapScenarioAdvancedOptions;
 }
diff --git a/example/index.js b/example/index.js
index 5fd059f..67c642c 100644
--- a/example/index.js
+++ b/example/index.js
@@ -1,3 +1,4 @@
+import 'react-native-reanimated';
 import { registerRootComponent } from 'expo';
 import App from './App';
 
diff --git a/example/metro.config.js b/example/metro.config.js
index e60dd16..94e29a8 100644
--- a/example/metro.config.js
+++ b/example/metro.config.js
@@ -22,4 +22,11 @@ config.resolver.unstable_conditionNames = [
   'default',
 ];
 
+// Always resolve the workspace package through one entry point so overlay
+// components share the same module instance (required for MapView child collection).
+config.resolver.extraNodeModules = {
+  ...config.resolver.extraNodeModules,
+  'react-native-nitro-maps': path.resolve(monorepoRoot, 'package'),
+};
+
 module.exports = config;
diff --git a/example/package.json b/example/package.json
index 0b5ed46..adfbd56 100644
--- a/example/package.json
+++ b/example/package.json
@@ -15,7 +15,9 @@
     "react": "19.2.3",
     "react-native": "0.85.3",
     "react-native-nitro-maps": "workspace:*",
-    "react-native-nitro-modules": "^0.35.10"
+    "react-native-nitro-modules": "^0.35.10",
+    "react-native-reanimated": "4.3.1",
+    "react-native-worklets": "0.8.3"
   },
   "devDependencies": {
     "@babel/core": "^7.27.4",
diff --git a/package/android/src/main/java/com/margelo/nitro/nitromaps/ClusterBadgeMetrics.kt b/package/android/src/main/java/com/margelo/nitro/nitromaps/ClusterBadgeMetrics.kt
new file mode 100644
index 0000000..a80d51e
--- /dev/null
+++ b/package/android/src/main/java/com/margelo/nitro/nitromaps/ClusterBadgeMetrics.kt
@@ -0,0 +1,21 @@
+package com.margelo.nitro.nitromaps
+
+/** Shared cluster badge sizing used by merge tests and drawn icons. */
+internal object ClusterBadgeMetrics {
+  const val MERGE_GAP_DP = 6.0
+
+  fun badgeRadiusDp(count: Int): Double = when {
+    count < 2 -> 14.0
+    count < 10 -> 17.0
+    count < 100 -> 20.0
+    count < 1000 -> 24.0
+    else -> 28.0
+  }
+
+  fun diameterDp(count: Int): Float = when {
+    count < 10 -> 34f
+    count < 100 -> 40f
+    count < 1000 -> 48f
+    else -> 56f
+  }
+}
diff --git a/package/android/src/main/java/com/margelo/nitro/nitromaps/ClusterIconFactory.kt b/package/android/src/main/java/com/margelo/nitro/nitromaps/ClusterIconFactory.kt
new file mode 100644
index 0000000..face3cb
--- /dev/null
+++ b/package/android/src/main/java/com/margelo/nitro/nitromaps/ClusterIconFactory.kt
@@ -0,0 +1,70 @@
+package com.margelo.nitro.nitromaps
+
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.Paint
+import android.graphics.RadialGradient
+import android.graphics.Shader
+import com.google.android.gms.maps.model.BitmapDescriptor
+import com.google.android.gms.maps.model.BitmapDescriptorFactory
+
+/** Builds and caches circular cluster badge icons (gradient + soft shadow). */
+internal class ClusterIconFactory(private val density: Float) {
+  private val cache = HashMap<String, BitmapDescriptor>()
+
+  fun icon(count: Int): BitmapDescriptor {
+    val label = formatCount(count)
+    cache[label]?.let { return it }
+
+    val diameter = (ClusterBadgeMetrics.diameterDp(count) * density).coerceAtLeast(1f)
+    val pad = 4f * density
+    val size = (diameter + pad * 2).toInt().coerceAtLeast(1)
+    val bitmap = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888)
+    val canvas = Canvas(bitmap)
+    val center = size / 2f
+    val radius = diameter / 2f
+
+    val shadow = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+      color = Color.argb(70, 0, 0, 0)
+      maskFilter = android.graphics.BlurMaskFilter(2.5f * density, android.graphics.BlurMaskFilter.Blur.NORMAL)
+    }
+    canvas.drawCircle(center, center + 1f * density, radius, shadow)
+
+    val fill = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+      shader = RadialGradient(
+        center,
+        center - radius * 0.3f,
+        radius,
+        intArrayOf(Color.parseColor("#4D9EFF"), Color.parseColor("#0A84FF")),
+        null,
+        Shader.TileMode.CLAMP,
+      )
+    }
+    canvas.drawCircle(center, center, radius, fill)
+
+    val border = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+      style = Paint.Style.STROKE
+      strokeWidth = 2f * density
+      color = Color.WHITE
+    }
+    canvas.drawCircle(center, center, radius - density, border)
+
+    val text = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+      color = Color.WHITE
+      textAlign = Paint.Align.CENTER
+      textSize = 13f * density
+      isFakeBoldText = true
+    }
+    val baseline = center - (text.descent() + text.ascent()) / 2
+    canvas.drawText(label, center, baseline, text)
+
+    val descriptor = BitmapDescriptorFactory.fromBitmap(bitmap)
+    cache[label] = descriptor
+    return descriptor
+  }
+
+  private fun formatCount(count: Int): String {
+    return if (count >= 1000) String.format("%.1fk", count / 1000.0) else count.toString()
+  }
+}
diff --git a/package/android/src/main/java/com/margelo/nitro/nitromaps/HybridMapView.kt b/package/android/src/main/java/com/margelo/nitro/nitromaps/HybridMapView.kt
index 29a0301..653ff2f 100644
--- a/package/android/src/main/java/com/margelo/nitro/nitromaps/HybridMapView.kt
+++ b/package/android/src/main/java/com/margelo/nitro/nitromaps/HybridMapView.kt
@@ -160,22 +160,7 @@ class HybridMapView(val context: ThemedReactContext) :
     set(value) {
       _clusteringEnabled = value
       overlayController.setClusteringEnabled(value == true)
-      googleMap?.let { map ->
-        if (value == true) {
-          map.setOnMarkerClickListener { marker ->
-            overlayController.onMarkerClick(marker)
-          }
-        } else {
-          map.setOnMarkerClickListener { marker ->
-            val id = marker.tag as? String
-            if (id != null) {
-              onMarkerPress?.invoke(id)
-            }
-            false
-          }
-        }
-      }
-      overlayController.updateMarkers(_markers)
+      overlayController.setMarkers(_markers)
     }
 
   private var _mapPadding: EdgePadding? = null
@@ -198,7 +183,7 @@ class HybridMapView(val context: ThemedReactContext) :
     set(value) {
       _markers = value
       if (googleMap != null) {
-        overlayController.updateMarkers(value)
+        overlayController.setMarkers(value)
       } else {
         pendingMarkers = value
       }
@@ -366,12 +351,13 @@ class HybridMapView(val context: ThemedReactContext) :
     syncMarkerPressHandlers()
 
     map.setOnCameraMoveListener {
+      overlayController.setViewportSize(view.width, view.height)
+      overlayController.onCameraMove()
       notifyRegionChange(complete = false)
     }
     map.setOnCameraIdleListener {
-      if (_clusteringEnabled == true) {
-        overlayController.onCameraIdle()
-      }
+      overlayController.setViewportSize(view.width, view.height)
+      overlayController.onCameraIdle()
       notifyRegionChange(complete = true)
     }
     map.setOnMapClickListener { latLng ->
@@ -383,18 +369,8 @@ class HybridMapView(val context: ThemedReactContext) :
     map.setOnMapLoadedCallback {
       notifyMapReadyIfNeeded()
     }
-    if (_clusteringEnabled != true) {
-      map.setOnMarkerClickListener { marker ->
-        val id = marker.tag as? String
-        if (id != null) {
-          onMarkerPress?.invoke(id)
-        }
-        false
-      }
-    } else {
-      map.setOnMarkerClickListener { marker ->
-        overlayController.onMarkerClick(marker)
-      }
+    map.setOnMarkerClickListener { marker ->
+      overlayController.onMarkerClick(marker)
     }
     map.setOnMarkerDragListener(
       object : GoogleMap.OnMarkerDragListener {
@@ -403,7 +379,8 @@ class HybridMapView(val context: ThemedReactContext) :
         override fun onMarkerDrag(marker: com.google.android.gms.maps.model.Marker) = Unit
 
         override fun onMarkerDragEnd(marker: com.google.android.gms.maps.model.Marker) {
-          val id = marker.tag as? String ?: return
+          val tag = marker.tag as? String ?: return
+          val id = if (tag.startsWith("s:")) tag.substring(2) else tag
           onMarkerDragEnd?.invoke(
             id,
             Coordinate(
@@ -433,7 +410,8 @@ class HybridMapView(val context: ThemedReactContext) :
       }
     }
 
-    overlayController.updateMarkers(pendingMarkers ?: _markers)
+    overlayController.setViewportSize(view.width, view.height)
+    overlayController.setMarkers(pendingMarkers ?: _markers)
     overlayController.updatePolylines(pendingPolylines ?: _polylines)
     overlayController.updatePolygons(pendingPolygons ?: _polygons)
     overlayController.updateCircles(pendingCircles ?: _circles)
diff --git a/package/android/src/main/java/com/margelo/nitro/nitromaps/MapOverlayController.kt b/package/android/src/main/java/com/margelo/nitro/nitromaps/MapOverlayController.kt
index c0dcb34..72c0060 100644
--- a/package/android/src/main/java/com/margelo/nitro/nitromaps/MapOverlayController.kt
+++ b/package/android/src/main/java/com/margelo/nitro/nitromaps/MapOverlayController.kt
@@ -1,30 +1,43 @@
 package com.margelo.nitro.nitromaps
 
-import android.Manifest
-import android.content.pm.PackageManager
-import androidx.core.content.ContextCompat
+import android.animation.ValueAnimator
+import android.os.Handler
+import android.os.Looper
 import com.facebook.react.uimanager.ThemedReactContext
+import com.google.android.gms.maps.CameraUpdateFactory
 import com.google.android.gms.maps.GoogleMap
 import com.google.android.gms.maps.model.Circle
+import com.google.android.gms.maps.model.LatLng
 import com.google.android.gms.maps.model.Marker
+import com.google.android.gms.maps.model.MarkerOptions
 import com.google.android.gms.maps.model.Polygon
 import com.google.android.gms.maps.model.Polyline
-import com.google.maps.android.clustering.ClusterManager
-import com.google.maps.android.clustering.view.DefaultClusterRenderer
+import java.util.concurrent.Executors
 
 /** Reconciles overlay descriptors with Google Maps overlay objects. */
 class MapOverlayController(
   private var googleMap: GoogleMap?,
   private val context: ThemedReactContext,
 ) {
-  private val markers = LinkedHashMap<String, Marker>()
+  private val markers = HashMap<String, Marker>()
+  private val clusterByKey = HashMap<String, ClusterElement.Cluster>()
   private val polylines = LinkedHashMap<String, Polyline>()
   private val polygons = LinkedHashMap<String, Polygon>()
   private val circles = LinkedHashMap<String, Circle>()
-  private var clusterManager: ClusterManager<NitroClusterItem>? = null
   private var clusteringEnabled = false
   private var onMarkerPress: ((String) -> Unit)? = null
   private var onClusterPress: ((List<String>, Coordinate) -> Unit)? = null
+  private var allMarkerDescriptors: Array<MarkerDescriptor> = emptyArray()
+  private var markersFingerprint: Int = 0
+  private var spatialIndex: MarkerSpatialIndex? = null
+  private var refreshGeneration: Int = 0
+  private var viewWidthPx: Int = 0
+  private var viewHeightPx: Int = 0
+  private var liveRefreshPending = false
+  private var computeExecutor = Executors.newSingleThreadExecutor()
+  private val mainHandler = Handler(Looper.getMainLooper())
+  private val density: Float = context.resources.displayMetrics.density
+  private val iconFactory = ClusterIconFactory(density)
 
   fun setGoogleMap(map: GoogleMap?) {
     googleMap = map
@@ -33,19 +46,19 @@ class MapOverlayController(
     }
   }
 
+  /** Updates the cached map viewport size used to size the clustering grid. */
+  fun setViewportSize(widthPx: Int, heightPx: Int) {
+    viewWidthPx = widthPx
+    viewHeightPx = heightPx
+  }
+
   fun setClusteringEnabled(enabled: Boolean) {
     if (clusteringEnabled == enabled) {
       return
     }
 
     clusteringEnabled = enabled
-    if (enabled) {
-      markers.values.forEach { it.remove() }
-      markers.clear()
-      ensureClusterManager()
-    } else {
-      tearDownClusterManager()
-    }
+    reapplyMarkers()
   }
 
   fun setMarkerPressHandlers(
@@ -54,54 +67,188 @@ class MapOverlayController(
   ) {
     this.onMarkerPress = onMarkerPress
     this.onClusterPress = onClusterPress
-    clusterManager?.setOnClusterItemClickListener { item ->
-      onMarkerPress?.invoke(item.descriptor.id)
-      true
-    }
-    clusterManager?.setOnClusterClickListener { cluster ->
-      val ids = cluster.items.map { it.descriptor.id }
-      val position = cluster.position
-      onClusterPress?.invoke(
-        ids,
-        Coordinate(
-          latitude = position.latitude,
-          longitude = position.longitude,
-        ),
-      )
-      true
-    }
   }
 
   fun clear() {
-    tearDownClusterManager()
     markers.values.forEach { it.remove() }
     polylines.values.forEach { it.remove() }
     polygons.values.forEach { it.remove() }
     circles.values.forEach { it.remove() }
     markers.clear()
+    clusterByKey.clear()
     polylines.clear()
     polygons.clear()
     circles.clear()
+    allMarkerDescriptors = emptyArray()
+    markersFingerprint = 0
+    spatialIndex = null
+    refreshGeneration += 1
+    computeExecutor.shutdown()
+    computeExecutor = Executors.newSingleThreadExecutor()
+  }
+
+  fun setMarkers(descriptors: Array<MarkerDescriptor>?) {
+    val next = descriptors ?: emptyArray()
+    val fingerprint = MarkerViewportFilter.markersFingerprint(next)
+    if (fingerprint == markersFingerprint) {
+      return
+    }
+
+    markersFingerprint = fingerprint
+    allMarkerDescriptors = next
+    spatialIndex = null
+    reapplyMarkers()
+  }
+
+  /**
+   * Whether markers are driven by the background viewport pipeline (clustering
+   * or large LOD) rather than the synchronous small-dataset path.
+   */
+  private fun usesViewportPipeline(): Boolean {
+    return clusteringEnabled || allMarkerDescriptors.size > ASYNC_THRESHOLD
+  }
+
+  private fun reapplyMarkers() {
+    googleMap ?: return
+    if (usesViewportPipeline()) {
+      rebuildIndexAndRefresh()
+    } else {
+      applyMarkersSync(allMarkerDescriptors)
+    }
+  }
+
+  fun refreshViewportMarkers() {
+    val map = googleMap ?: return
+    val index = spatialIndex ?: return
+    if (!usesViewportPipeline()) {
+      return
+    }
+
+    val bounds = map.projection.visibleRegion.latLngBounds
+    val latitudeSpan = bounds.northeast.latitude - bounds.southwest.latitude
+    val clustering = clusteringEnabled
+    val widthPx = viewWidthPx
+    val heightPx = viewHeightPx
+    val displayed = HashSet(markers.keys)
+    refreshGeneration += 1
+    val generation = refreshGeneration
+
+    computeExecutor.execute {
+      val candidates = index.candidates(bounds)
+      val elements: List<ClusterElement> = if (clustering) {
+        MarkerClusterEngine.clusters(candidates, bounds, widthPx, heightPx, density)
+      } else {
+        MarkerViewportFilter.displaySubset(candidates, bounds, latitudeSpan)
+          .map { ClusterElement.Single(it) }
+      }
+
+      val nextKeys = HashSet<String>(elements.size)
+      val added = ArrayList<ClusterElement>()
+      for (element in elements) {
+        val key = element.diffKey
+        if (!nextKeys.add(key)) {
+          continue
+        }
+        if (!displayed.contains(key)) {
+          added.add(element)
+        }
+      }
+      val removed = displayed - nextKeys
+
+      mainHandler.post {
+        if (generation != refreshGeneration) {
+          return@post
+        }
+        applyDiff(removed, added)
+      }
+    }
+  }
+
+  private fun rebuildIndexAndRefresh() {
+    val descriptors = allMarkerDescriptors
+    refreshGeneration += 1
+    val generation = refreshGeneration
+
+    computeExecutor.execute {
+      val index = MarkerSpatialIndex(descriptors)
+      mainHandler.post {
+        if (generation != refreshGeneration) {
+          return@post
+        }
+        spatialIndex = index
+        refreshViewportMarkers()
+      }
+    }
+  }
+
+  private fun applyDiff(removedKeys: Set<String>, added: List<ClusterElement>) {
+    val map = googleMap ?: return
+
+    for (key in removedKeys) {
+      markers.remove(key)?.remove()
+      clusterByKey.remove(key)
+    }
+
+    val addedMarkers = ArrayList<Marker>(added.size)
+    for (element in added) {
+      val key = element.diffKey
+      when (element) {
+        is ClusterElement.Single -> {
+          map.addMarker(element.descriptor.toMarkerOptions())?.also { marker ->
+            marker.tag = key
+            markers[key] = marker
+            addedMarkers.add(marker)
+          }
+        }
+        is ClusterElement.Cluster -> {
+          val options = MarkerOptions()
+            .position(element.position)
+            .icon(iconFactory.icon(element.count))
+            .anchor(0.5f, 0.5f)
+          map.addMarker(options)?.also { marker ->
+            marker.tag = key
+            markers[key] = marker
+            clusterByKey[key] = element
+            addedMarkers.add(marker)
+          }
+        }
+      }
+    }
+
+    animateFadeIn(addedMarkers)
   }
 
-  fun updateMarkers(descriptors: Array<MarkerDescriptor>?) {
-    if (clusteringEnabled) {
-      updateClusteredMarkers(descriptors)
+  /** Fades newly added markers in via a single shared animator. */
+  private fun animateFadeIn(added: List<Marker>) {
+    if (added.isEmpty()) {
       return
     }
 
+    added.forEach { runCatching { it.alpha = 0f } }
+    ValueAnimator.ofFloat(0f, 1f).apply {
+      duration = 220
+      addUpdateListener { animator ->
+        val value = animator.animatedValue as Float
+        // Markers may be removed by a later refresh mid-animation.
+        added.forEach { runCatching { it.alpha = value } }
+      }
+      start()
+    }
+  }
+
+  private fun applyMarkersSync(descriptors: Array<MarkerDescriptor>) {
     val map = googleMap ?: return
     reconcile(
       current = markers,
-      next = descriptors?.associateBy { it.id } ?: emptyMap(),
+      next = descriptors.associate { ("s:" + it.id) to it },
       remove = { it.remove() },
       add = { descriptor ->
         map.addMarker(descriptor.toMarkerOptions())?.also { marker ->
-          marker.tag = descriptor.id
+          marker.tag = "s:" + descriptor.id
         }
       },
       update = { marker, descriptor ->
-        marker.position = com.google.android.gms.maps.model.LatLng(
+        marker.position = LatLng(
           descriptor.coordinate.latitude,
           descriptor.coordinate.longitude,
         )
@@ -113,66 +260,50 @@ class MapOverlayController(
     )
   }
 
-  private fun updateClusteredMarkers(descriptors: Array<MarkerDescriptor>?) {
-    val manager = ensureClusterManager() ?: return
-    val nextItems = descriptors
-      ?.filter { it.clusterable != false }
-      ?.map { NitroClusterItem(it) }
-      ?: emptyList()
-
-    manager.clearItems()
-    manager.addItems(nextItems)
-    manager.cluster()
+  fun onCameraIdle() {
+    if (usesViewportPipeline()) {
+      refreshViewportMarkers()
+    }
   }
 
-  private fun ensureClusterManager(): ClusterManager<NitroClusterItem>? {
-    val map = googleMap ?: return null
-    if (clusterManager != null) {
-      return clusterManager
+  /** Throttled live recompute while the camera is moving. */
+  fun onCameraMove() {
+    if (!usesViewportPipeline() || liveRefreshPending) {
+      return
     }
-
-    val manager = ClusterManager<NitroClusterItem>(context, map)
-    manager.renderer = object : DefaultClusterRenderer<NitroClusterItem>(context, map, manager) {
-      override fun onBeforeClusterItemRendered(
-        item: NitroClusterItem,
-        markerOptions: com.google.android.gms.maps.model.MarkerOptions,
-      ) {
-        super.onBeforeClusterItemRendered(item, markerOptions)
+    liveRefreshPending = true
+    mainHandler.postDelayed({
+      liveRefreshPending = false
+      if (usesViewportPipeline()) {
+        refreshViewportMarkers()
       }
-    }
-    manager.setOnClusterItemClickListener { item ->
-      onMarkerPress?.invoke(item.descriptor.id)
-      true
-    }
-    manager.setOnClusterClickListener { cluster ->
-      val ids = cluster.items.map { it.descriptor.id }
-      val position = cluster.position
+    }, LIVE_REFRESH_THROTTLE_MS)
+  }
+
+  fun onMarkerClick(marker: Marker): Boolean {
+    val key = marker.tag as? String ?: return false
+    val cluster = clusterByKey[key]
+    if (cluster != null) {
       onClusterPress?.invoke(
-        ids,
+        cluster.memberIds,
         Coordinate(
-          latitude = position.latitude,
-          longitude = position.longitude,
+          latitude = cluster.position.latitude,
+          longitude = cluster.position.longitude,
         ),
       )
-      true
+      googleMap?.animateCamera(
+        CameraUpdateFactory.newLatLngBounds(cluster.bounds, (72 * density).toInt()),
+      )
+      return true
     }
 
-    clusterManager = manager
-    return manager
-  }
-
-  fun onCameraIdle() {
-    clusterManager?.onCameraIdle()
-  }
-
-  fun onMarkerClick(marker: Marker): Boolean {
-    return clusterManager?.onMarkerClick(marker) ?: false
+    val id = markerOverlayIdFromTag(key)
+    onMarkerPress?.invoke(id)
+    return false
   }
 
-  private fun tearDownClusterManager() {
-    clusterManager?.clearItems()
-    clusterManager?.cluster()
-    clusterManager = null
+  private fun markerOverlayIdFromTag(tag: String): String {
+    return if (tag.startsWith("s:")) tag.substring(2) else tag
   }
 
   fun updatePolylines(descriptors: Array<PolylineDescriptor>?) {
@@ -260,4 +391,12 @@ class MapOverlayController(
       }
     }
   }
+
+  private companion object {
+    /** Non-clustered datasets at or below this size reconcile synchronously. */
+    const val ASYNC_THRESHOLD = 500
+
+    /** Minimum gap between live recomputes while the camera moves. */
+    const val LIVE_REFRESH_THROTTLE_MS = 100L
+  }
 }
diff --git a/package/android/src/main/java/com/margelo/nitro/nitromaps/MarkerClusterEngine.kt b/package/android/src/main/java/com/margelo/nitro/nitromaps/MarkerClusterEngine.kt
new file mode 100644
index 0000000..f59fda9
--- /dev/null
+++ b/package/android/src/main/java/com/margelo/nitro/nitromaps/MarkerClusterEngine.kt
@@ -0,0 +1,248 @@
+package com.margelo.nitro.nitromaps
+
+import com.google.android.gms.maps.model.LatLng
+import com.google.android.gms.maps.model.LatLngBounds
+import kotlin.math.floor
+import kotlin.math.log2
+import kotlin.math.pow
+import kotlin.math.roundToInt
+
+/** A single display element: an individual marker or a cluster badge. */
+internal sealed interface ClusterElement {
+  val diffKey: String
+
+  data class Single(val descriptor: MarkerDescriptor) : ClusterElement {
+    override val diffKey: String get() = "s:" + descriptor.id
+  }
+
+  data class Cluster(
+    val key: String,
+    val position: LatLng,
+    val count: Int,
+    val memberIds: List<String>,
+    val bounds: LatLngBounds,
+  ) : ClusterElement {
+    override val diffKey: String get() = "c:$key:$count"
+  }
+}
+
+/**
+ * Grid-based marker clustering computed in geographic space.
+ *
+ * Pure function over descriptor data (no map projection), so it is safe to call
+ * from a background thread. Output is bounded by the number of grid cells that
+ * fit on screen, keeping per-frame Google Maps work small and constant.
+ */
+internal object MarkerClusterEngine {
+  private const val CELL_DP = 64.0
+
+  /**
+   * Snaps a cell size (degrees) to the nearest power of two so small zoom
+   * changes keep the same absolute grid.
+   */
+  private fun quantize(value: Double): Double {
+    if (value <= 0 || !value.isFinite()) {
+      return 1.0
+    }
+    return 2.0.pow(log2(value).roundToInt())
+  }
+
+  fun clusters(
+    candidates: List<MarkerDescriptor>,
+    bounds: LatLngBounds,
+    viewWidthPx: Int,
+    viewHeightPx: Int,
+    density: Float,
+  ): List<ClusterElement> {
+    if (candidates.isEmpty()) {
+      return emptyList()
+    }
+
+    val singles = ArrayList<ClusterElement>()
+    val clusterableCandidates = ArrayList<MarkerDescriptor>()
+    for (descriptor in candidates) {
+      if (descriptor.clusterable == false) {
+        singles.add(ClusterElement.Single(descriptor))
+      } else {
+        clusterableCandidates.add(descriptor)
+      }
+    }
+
+    if (clusterableCandidates.isEmpty()) {
+      return singles
+    }
+
+    val cellPx = CELL_DP * density
+    val cols = maxOf(1, (viewWidthPx / cellPx).toInt())
+    val rows = maxOf(1, (viewHeightPx / cellPx).toInt())
+    val sw = bounds.southwest
+    val ne = bounds.northeast
+    // Quantize cell size and anchor the grid to absolute (0,0) coordinates so
+    // cells stay fixed to geography while panning — clusters don't churn or
+    // "swim", only re-forming when the zoom level crosses an octave.
+    val cellLat = quantize((ne.latitude - sw.latitude) / rows)
+    val cellLon = quantize((ne.longitude - sw.longitude) / cols)
+
+    val buckets = HashMap<String, Bucket>()
+    for (descriptor in clusterableCandidates) {
+      val lat = descriptor.coordinate.latitude
+      val lon = descriptor.coordinate.longitude
+      val row = floor(lat / cellLat).toInt()
+      val col = floor(lon / cellLon).toInt()
+      val key = "$row:$col"
+      val bucket = buckets.getOrPut(key) { Bucket() }
+      bucket.key = key
+      bucket.count += 1
+      bucket.sumLat += lat
+      bucket.sumLon += lon
+      bucket.minLat = minOf(bucket.minLat, lat)
+      bucket.maxLat = maxOf(bucket.maxLat, lat)
+      bucket.minLon = minOf(bucket.minLon, lon)
+      bucket.maxLon = maxOf(bucket.maxLon, lon)
+      if (bucket.first == null) {
+        bucket.first = descriptor
+      }
+      bucket.memberIds.add(descriptor.id)
+    }
+
+    val merged = mergeOverlapping(
+      ArrayList(buckets.values),
+      bounds,
+      viewWidthPx,
+      viewHeightPx,
+      density,
+    )
+
+    val result = ArrayList<ClusterElement>(merged.size + singles.size)
+    result.addAll(singles)
+    for (bucket in merged) {
+      val first = bucket.first
+      if (bucket.count == 1 && first != null) {
+        result.add(ClusterElement.Single(first))
+      } else {
+        result.add(
+          ClusterElement.Cluster(
+            key = bucket.key,
+            position = LatLng(bucket.sumLat / bucket.count, bucket.sumLon / bucket.count),
+            count = bucket.count,
+            memberIds = bucket.memberIds,
+            bounds = LatLngBounds(
+              LatLng(bucket.minLat, bucket.minLon),
+              LatLng(bucket.maxLat, bucket.maxLon),
+            ),
+          ),
+        )
+      }
+    }
+    return result
+  }
+
+  /** Approximate badge radius (dp) per count — mirrors the drawn badge sizes. */
+  private fun badgeRadiusDp(count: Int): Double = ClusterBadgeMetrics.badgeRadiusDp(count)
+
+  /** Extra slack (dp) so near-touching badges still merge. */
+  private val mergeGapDp = ClusterBadgeMetrics.MERGE_GAP_DP
+
+  /**
+   * Merges buckets whose badges would overlap on screen, so a zoomed-out view
+   * collapses neighbouring cells into one badge instead of stacking them. Uses
+   * union-find on screen-space centroid distance; groups are seeded by the
+   * largest bucket so the resulting cluster key is stable.
+   */
+  private fun mergeOverlapping(
+    buckets: ArrayList<Bucket>,
+    bounds: LatLngBounds,
+    viewWidthPx: Int,
+    viewHeightPx: Int,
+    density: Float,
+  ): List<Bucket> {
+    val n = buckets.size
+    if (n <= 1) {
+      return buckets
+    }
+
+    val width = viewWidthPx.toDouble()
+    val height = viewHeightPx.toDouble()
+    val sw = bounds.southwest
+    val ne = bounds.northeast
+    val centerLat = (sw.latitude + ne.latitude) / 2
+    val centerLon = (sw.longitude + ne.longitude) / 2
+    val spanLat = maxOf(ne.latitude - sw.latitude, 1e-9)
+    val spanLon = maxOf(ne.longitude - sw.longitude, 1e-9)
+
+    val px = DoubleArray(n)
+    val py = DoubleArray(n)
+    for (i in 0 until n) {
+      val bucket = buckets[i]
+      val lat = bucket.sumLat / bucket.count
+      val lon = bucket.sumLon / bucket.count
+      px[i] = (lon - centerLon) / spanLon * width
+      py[i] = (centerLat - lat) / spanLat * height
+    }
+
+    val parent = IntArray(n) { it }
+    fun find(value: Int): Int {
+      var root = value
+      while (parent[root] != root) {
+        parent[root] = parent[parent[root]]
+        root = parent[root]
+      }
+      return root
+    }
+
+    for (i in 0 until n) {
+      val ri = badgeRadiusDp(buckets[i].count) * density
+      for (j in (i + 1) until n) {
+        val dx = px[i] - px[j]
+        val dy = py[i] - py[j]
+        val minDist = ri + badgeRadiusDp(buckets[j].count) * density + mergeGapDp * density
+        if (dx * dx + dy * dy < minDist * minDist) {
+          val a = find(i)
+          val b = find(j)
+          if (a != b) {
+            parent[b] = a
+          }
+        }
+      }
+    }
+
+    val groups = HashMap<Int, Bucket>()
+    val order = ArrayList<Int>()
+    for (index in (0 until n).sortedByDescending { buckets[it].count }) {
+      val root = find(index)
+      val existing = groups[root]
+      if (existing != null) {
+        existing.absorb(buckets[index])
+      } else {
+        groups[root] = buckets[index]
+        order.add(root)
+      }
+    }
+    return order.mapNotNull { groups[it] }
+  }
+
+  private class Bucket {
+    var key = ""
+    var count = 0
+    var sumLat = 0.0
+    var sumLon = 0.0
+    var minLat = Double.MAX_VALUE
+    var maxLat = -Double.MAX_VALUE
+    var minLon = Double.MAX_VALUE
+    var maxLon = -Double.MAX_VALUE
+    var first: MarkerDescriptor? = null
+    val memberIds = ArrayList<String>()
+
+    /** Folds another bucket's members in; keeps own key/first (seed = dominant). */
+    fun absorb(other: Bucket) {
+      count += other.count
+      sumLat += other.sumLat
+      sumLon += other.sumLon
+      minLat = minOf(minLat, other.minLat)
+      maxLat = maxOf(maxLat, other.maxLat)
+      minLon = minOf(minLon, other.minLon)
+      maxLon = maxOf(maxLon, other.maxLon)
+      memberIds.addAll(other.memberIds)
+    }
+  }
+}
diff --git a/package/android/src/main/java/com/margelo/nitro/nitromaps/MarkerDescriptor+MarkerOptions.kt b/package/android/src/main/java/com/margelo/nitro/nitromaps/MarkerDescriptor+MarkerOptions.kt
index 77dad04..b8e89aa 100644
--- a/package/android/src/main/java/com/margelo/nitro/nitromaps/MarkerDescriptor+MarkerOptions.kt
+++ b/package/android/src/main/java/com/margelo/nitro/nitromaps/MarkerDescriptor+MarkerOptions.kt
@@ -1,5 +1,6 @@
 package com.margelo.nitro.nitromaps
 
+import com.google.android.gms.maps.model.BitmapDescriptorFactory
 import com.google.android.gms.maps.model.LatLng
 import com.google.android.gms.maps.model.MarkerOptions
 
@@ -9,4 +10,5 @@ fun MarkerDescriptor.toMarkerOptions(): MarkerOptions {
     .title(title)
     .snippet(subtitle)
     .draggable(draggable == true)
+    .icon(BitmapDescriptorFactory.defaultMarker(BitmapDescriptorFactory.HUE_RED))
 }
diff --git a/package/android/src/main/java/com/margelo/nitro/nitromaps/MarkerSpatialIndex.kt b/package/android/src/main/java/com/margelo/nitro/nitromaps/MarkerSpatialIndex.kt
new file mode 100644
index 0000000..7659274
--- /dev/null
+++ b/package/android/src/main/java/com/margelo/nitro/nitromaps/MarkerSpatialIndex.kt
@@ -0,0 +1,99 @@
+package com.margelo.nitro.nitromaps
+
+import com.google.android.gms.maps.model.LatLngBounds
+
+/**
+ * Uniform grid spatial index over a marker dataset.
+ *
+ * Built once per dataset so viewport queries cost O(cells in view + markers in
+ * those cells) instead of O(all markers). Immutable after construction, so
+ * instances are safe to query from a background thread.
+ */
+internal class MarkerSpatialIndex(
+  markers: Array<MarkerDescriptor>,
+  cellsPerSide: Int = 96,
+) {
+  val count: Int = markers.size
+  private val side: Int = maxOf(1, cellsPerSide)
+  private val minLat: Double
+  private val minLon: Double
+  private val latStep: Double
+  private val lonStep: Double
+  private val cells: Array<MutableList<MarkerDescriptor>>
+
+  init {
+    var minLatV = Double.MAX_VALUE
+    var maxLatV = -Double.MAX_VALUE
+    var minLonV = Double.MAX_VALUE
+    var maxLonV = -Double.MAX_VALUE
+
+    for (marker in markers) {
+      val lat = marker.coordinate.latitude
+      val lon = marker.coordinate.longitude
+      if (lat < minLatV) minLatV = lat
+      if (lat > maxLatV) maxLatV = lat
+      if (lon < minLonV) minLonV = lon
+      if (lon > maxLonV) maxLonV = lon
+    }
+
+    if (markers.isEmpty()) {
+      minLatV = 0.0
+      maxLatV = 0.0
+      minLonV = 0.0
+      maxLonV = 0.0
+    }
+
+    minLat = minLatV
+    minLon = minLonV
+    latStep = maxOf(1e-9, (maxLatV - minLatV) / side)
+    lonStep = maxOf(1e-9, (maxLonV - minLonV) / side)
+    cells = Array(side * side) { mutableListOf() }
+
+    for (marker in markers) {
+      val index = cellIndex(marker.coordinate.latitude, marker.coordinate.longitude)
+      cells[index].add(marker)
+    }
+  }
+
+  /** Markers whose grid cells overlap the padded bounds. */
+  fun candidates(bounds: LatLngBounds, padding: Double = 0.2): List<MarkerDescriptor> {
+    if (count == 0) {
+      return emptyList()
+    }
+
+    val latSpan = bounds.northeast.latitude - bounds.southwest.latitude
+    val lonSpan = bounds.northeast.longitude - bounds.southwest.longitude
+    val latPad = latSpan * padding
+    val lonPad = lonSpan * padding
+
+    val rowStart = clampedRow(bounds.southwest.latitude - latPad)
+    val rowEnd = clampedRow(bounds.northeast.latitude + latPad)
+    val colStart = clampedColumn(bounds.southwest.longitude - lonPad)
+    val colEnd = clampedColumn(bounds.northeast.longitude + lonPad)
+
+    val result = ArrayList<MarkerDescriptor>()
+    var row = rowStart
+    while (row <= rowEnd) {
+      val base = row * side
+      var column = colStart
+      while (column <= colEnd) {
+        result.addAll(cells[base + column])
+        column += 1
+      }
+      row += 1
+    }
+    return result
+  }
+
+  private fun cellIndex(lat: Double, lon: Double): Int {
+    return clampedRow(lat) * side + clampedColumn(lon)
+  }
+
+  private fun clampedRow(lat: Double): Int {
+    return minOf(side - 1, maxOf(0, ((lat - minLat) / latStep).toInt()))
+  }
+
+  private fun clampedColumn(lon: Double): Int {
+    return minOf(side - 1, maxOf(0, ((lon - minLon) / lonStep).toInt()))
+  }
+}
diff --git a/package/android/src/main/java/com/margelo/nitro/nitromaps/MarkerViewportFilter.kt b/package/android/src/main/java/com/margelo/nitro/nitromaps/MarkerViewportFilter.kt
new file mode 100644
index 0000000..89d8122
--- /dev/null
+++ b/package/android/src/main/java/com/margelo/nitro/nitromaps/MarkerViewportFilter.kt
@@ -0,0 +1,104 @@
+package com.margelo.nitro.nitromaps
+
+import com.google.android.gms.maps.model.LatLng
+import com.google.android.gms.maps.model.LatLngBounds
+import kotlin.math.ceil
+import kotlin.math.max
+import kotlin.math.sqrt
+
+internal object MarkerViewportFilter {
+  /**
+   * Precise viewport filter + spatial subsample over pre-narrowed candidates.
+   *
+   * The caller (spatial index) has already restricted [candidates] to cells
+   * near the bounds, so this runs over a small set and is safe to call off the
+   * main thread.
+   */
+  fun displaySubset(
+    candidates: List<MarkerDescriptor>,
+    bounds: LatLngBounds,
+    latitudeSpan: Double,
+  ): List<MarkerDescriptor> {
+    val maxCount = maxMarkersForZoom(latitudeSpan)
+    val paddedBounds = bounds.expandBy(0.2)
+
+    val visible = candidates.filter { descriptor ->
+      paddedBounds.contains(
+        LatLng(descriptor.coordinate.latitude, descriptor.coordinate.longitude),
+      )
+    }
+
+    if (visible.size <= maxCount) {
+      return visible
+    }
+
+    return spatialSubsample(visible, maxCount, bounds).toList()
+  }
+
+  fun markersFingerprint(descriptors: Array<MarkerDescriptor>?): Int {
+    if (descriptors.isNullOrEmpty()) {
+      return 0
+    }
+
+    var hash = descriptors.size
+    for (descriptor in descriptors) {
+      hash = 31 * hash + descriptor.id.hashCode()
+      hash = 31 * hash + descriptor.coordinate.latitude.hashCode()
+      hash = 31 * hash + descriptor.coordinate.longitude.hashCode()
+      hash = 31 * hash + (descriptor.title?.hashCode() ?: 0)
+      hash = 31 * hash + (descriptor.subtitle?.hashCode() ?: 0)
+      hash = 31 * hash + (descriptor.draggable?.hashCode() ?: 0)
+      hash = 31 * hash + (descriptor.clusterable?.hashCode() ?: 0)
+    }
+    return hash
+  }
+
+  private fun spatialSubsample(
+    markers: List<MarkerDescriptor>,
+    maxCount: Int,
+    bounds: LatLngBounds,
+  ): Array<MarkerDescriptor> {
+    val columns = ceil(sqrt(maxCount.toDouble())).toInt()
+    val rows = ceil(maxCount.toDouble() / columns).toInt()
+
+    val latMin = bounds.southwest.latitude
+    val latMax = bounds.northeast.latitude
+    val lonMin = bounds.southwest.longitude
+    val lonMax = bounds.northeast.longitude
+
+    val latStep = max(1e-9, (latMax - latMin) / rows)
+    val lonStep = max(1e-9, (lonMax - lonMin) / columns)
+
+    val buckets = LinkedHashMap<String, MutableList<MarkerDescriptor>>()
+
+    for (marker in markers) {
+      val row = minOf(rows - 1, maxOf(0, ((marker.coordinate.latitude - latMin) / latStep).toInt()))
+      val column = minOf(columns - 1, maxOf(0, ((marker.coordinate.longitude - lonMin) / lonStep).toInt()))
+      val key = "$row-$column"
+      buckets.getOrPut(key) { mutableListOf() }.add(marker)
+    }
+
+    return buckets.values.map { cell -> cell[cell.size / 2] }.toTypedArray()
+  }
+
+  private fun maxMarkersForZoom(latitudeSpan: Double): Int {
+    return when {
+      latitudeSpan < 0.08 -> 2_000
+      latitudeSpan < 0.5 -> 800
+      latitudeSpan < 2.0 -> 350
+      else -> 200
+    }
+  }
+
+  private fun LatLngBounds.expandBy(fraction: Double): LatLngBounds {
+    val latSpan = northeast.latitude - southwest.latitude
+    val lngSpan = northeast.longitude - southwest.longitude
+    val latPad = latSpan * fraction
+    val lngPad = lngSpan * fraction
+
+    return LatLngBounds(
+      LatLng(southwest.latitude - latPad, southwest.longitude - lngPad),
+      LatLng(northeast.latitude + latPad, northeast.longitude + lngPad),
+    )
+  }
+}
diff --git a/package/android/src/main/java/com/margelo/nitro/nitromaps/NitroClusterItem.kt b/package/android/src/main/java/com/margelo/nitro/nitromaps/NitroClusterItem.kt
deleted file mode 100644
index 16cf09b..0000000
--- a/package/android/src/main/java/com/margelo/nitro/nitromaps/NitroClusterItem.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.margelo.nitro.nitromaps
-
-import com.google.android.gms.maps.model.LatLng
-import com.google.maps.android.clustering.ClusterItem
-
-/** Cluster item wrapping a marker descriptor for maps-utils clustering. */
-class NitroClusterItem(
-  val descriptor: MarkerDescriptor,
-) : ClusterItem {
-  override fun getPosition(): LatLng {
-    return LatLng(
-      descriptor.coordinate.latitude,
-      descriptor.coordinate.longitude,
-    )
-  }
-
-  override fun getTitle(): String? {
-    return descriptor.title
-  }
-
-  override fun getSnippet(): String? {
-    return descriptor.subtitle
-  }
-
-  override fun getZIndex(): Float? {
-    return null
-  }
-}
diff --git a/package/ios/ClusterBadgeMetrics.swift b/package/ios/ClusterBadgeMetrics.swift
new file mode 100644
index 0000000..cc26cca
--- /dev/null
+++ b/package/ios/ClusterBadgeMetrics.swift
@@ -0,0 +1,34 @@
+import CoreGraphics
+
+/// Shared cluster badge sizing used by merge tests and drawn annotation views.
+enum ClusterBadgeMetrics {
+  static let mergeGap: Double = 6
+
+  static func badgeRadius(for count: Int) -> Double {
+    switch count {
+    case ..<2:
+      return 14
+    case ..<10:
+      return 17
+    case ..<100:
+      return 20
+    case ..<1000:
+      return 24
+    default:
+      return 28
+    }
+  }
+
+  static func diameter(for count: Int) -> CGFloat {
+    switch count {
+    case ..<10:
+      return 34
+    case ..<100:
+      return 40
+    case ..<1000:
+      return 48
+    default:
+      return 56
+    }
+  }
+}
diff --git a/package/ios/HybridMapView.swift b/package/ios/HybridMapView.swift
index 16e6203..88e22aa 100644
--- a/package/ios/HybridMapView.swift
+++ b/package/ios/HybridMapView.swift
@@ -7,10 +7,11 @@ final class HybridMapView: HybridMapViewSpec {
   private let mapViewDelegate = HybridMapViewDelegate()
   private var isProgrammaticUpdate = false
   private var hasFiredMapReady = false
+  private var liveClusterTimer: Timer?
   fileprivate lazy var overlayController = MapOverlayController(mapView: view)
 
   lazy var view: MKMapView = {
-    let mapView = MKMapView()
+    let mapView = NitroMKMapView()
     mapViewDelegate.parent = self
     mapView.delegate = mapViewDelegate
     mapView.mapType = mapType.toMKMapType()
@@ -22,6 +23,14 @@ final class HybridMapView: HybridMapViewSpec {
     applyControlSettings(to: mapView)
     applyMapPadding(to: mapView)
     applyCustomMapStyle(to: mapView)
+    mapView.register(
+      NitroPinAnnotationView.self,
+      forAnnotationViewWithReuseIdentifier: NitroPinAnnotationView.reuseIdentifier
+    )
+    mapView.register(
+      NitroClusterAnnotationView.self,
+      forAnnotationViewWithReuseIdentifier: NitroClusterAnnotationView.reuseIdentifier
+    )
     mapViewDelegate.installGestureRecognizers(on: mapView)
     return mapView
   }()
@@ -107,7 +116,7 @@ final class HybridMapView: HybridMapViewSpec {
 
   var clusteringEnabled: Bool? {
     didSet {
-      refreshMarkerClustering()
+      overlayController.setClusteringEnabled(clusteringEnabled == true)
     }
   }
 
@@ -125,8 +134,7 @@ final class HybridMapView: HybridMapViewSpec {
 
   var markers: [MarkerDescriptor]? {
     didSet {
-      overlayController.updateMarkers(markers)
-      refreshMarkerClustering()
+      overlayController.setMarkers(markers)
     }
   }
 
@@ -224,16 +232,39 @@ final class HybridMapView: HybridMapViewSpec {
     isProgrammaticUpdate = false
   }
 
-  func markerId(for annotation: MKAnnotation) -> String? {
-    overlayController.markerId(for: annotation)
-  }
-
   // Derived from MKCoordinateRegion (center + span). May differ from Android
   // bounds-derived region when the map is rotated or pitched.
   func currentRegion() -> Region {
     view.region.toRegion()
   }
 
+  func scheduleMarkerViewportRefresh() {
+    overlayController.scheduleViewportRefresh()
+  }
+
+  func animateToClusterRegion(_ region: MKCoordinateRegion) {
+    view.setRegion(view.regionThatFits(region), animated: true)
+  }
+
+  /// Recomputes clusters live (throttled) while the user is interacting.
+  func startLiveClustering() {
+    guard liveClusterTimer == nil else {
+      return
+    }
+    liveClusterTimer = Timer.scheduledTimer(
+      withTimeInterval: 0.1,
+      repeats: true
+    ) { [weak self] _ in
+      self?.overlayController.refreshNow()
+    }
+  }
+
+  func stopLiveClustering() {
+    liveClusterTimer?.invalidate()
+    liveClusterTimer = nil
+    overlayController.scheduleViewportRefresh(immediate: true)
+  }
+
   func notifyRegionChange(complete: Bool) {
     guard !isProgrammaticUpdate else {
       return
@@ -253,6 +284,7 @@ final class HybridMapView: HybridMapViewSpec {
     }
 
     hasFiredMapReady = true
+    overlayController.setMarkers(markers)
     onMapReady?()
   }
 
@@ -349,6 +381,7 @@ final class HybridMapView: HybridMapViewSpec {
   private func applyControlSettings(to mapView: MKMapView) {
     mapView.showsCompass = showsCompass ?? true
     mapView.showsScale = showsScale ?? false
+    mapView.applyScaleAppearance()
   }
 
   private func applyMapPadding(to mapView: MKMapView) {
@@ -361,29 +394,6 @@ final class HybridMapView: HybridMapViewSpec {
       CustomMapStyleParser.apply(json: customMapStyle, mapType: mapType, to: mapView)
     }
   }
-
-  private func refreshMarkerClustering() {
-    guard clusteringEnabled == true else {
-      for annotation in overlayController.allMarkerAnnotations() {
-        if let view = view.view(for: annotation) {
-          view.clusteringIdentifier = nil
-        }
-      }
-      return
-    }
-
-    for annotation in overlayController.allMarkerAnnotations() {
-      guard let view = view.view(for: annotation) else {
-        continue
-      }
-
-      if annotation.isClusterable {
-        view.clusteringIdentifier = HybridMapViewDelegate.clusteringIdentifier
-      } else {
-        view.clusteringIdentifier = nil
-      }
-    }
-  }
 }
 
 extension HybridMapView: RecyclableView {}
diff --git a/package/ios/HybridMapViewDelegate.swift b/package/ios/HybridMapViewDelegate.swift
index 29ac60f..1b6c832 100644
--- a/package/ios/HybridMapViewDelegate.swift
+++ b/package/ios/HybridMapViewDelegate.swift
@@ -3,13 +3,8 @@ import UIKit
 
 /// Delegate and gesture handler for `HybridMapView`'s underlying `MKMapView`.
 final class HybridMapViewDelegate: NSObject, MKMapViewDelegate, UIGestureRecognizerDelegate {
-  static let clusteringIdentifier = "nitro-maps-cluster"
-
   weak var parent: HybridMapView?
 
-  private let markerReuseIdentifier = "NitroMapsMarker"
-  private let clusterReuseIdentifier = "NitroMapsCluster"
-
   func installGestureRecognizers(on mapView: MKMapView) {
     let tapRecognizer = UITapGestureRecognizer(
       target: self,
@@ -72,10 +67,12 @@ final class HybridMapViewDelegate: NSObject, MKMapViewDelegate, UIGestureRecogni
   }
 
   func mapView(_ mapView: MKMapView, regionWillChangeAnimated animated: Bool) {
+    parent?.startLiveClustering()
     parent?.notifyRegionChange(complete: false)
   }
 
   func mapView(_ mapView: MKMapView, regionDidChangeAnimated animated: Bool) {
+    parent?.stopLiveClustering()
     parent?.notifyRegionChange(complete: true)
   }
 
@@ -92,15 +89,17 @@ final class HybridMapViewDelegate: NSObject, MKMapViewDelegate, UIGestureRecogni
   }
 
   func mapView(_ mapView: MKMapView, viewFor annotation: MKAnnotation) -> MKAnnotationView? {
-    if let cluster = annotation as? MKClusterAnnotation {
+    if let cluster = annotation as? MapClusterAnnotation {
       let view = mapView.dequeueReusableAnnotationView(
-        withIdentifier: clusterReuseIdentifier
-      ) as? MKMarkerAnnotationView
-        ?? MKMarkerAnnotationView(annotation: cluster, reuseIdentifier: clusterReuseIdentifier)
+        withIdentifier: NitroClusterAnnotationView.reuseIdentifier
+      ) as? NitroClusterAnnotationView
+        ?? NitroClusterAnnotationView(
+          annotation: cluster,
+          reuseIdentifier: NitroClusterAnnotationView.reuseIdentifier
+        )
 
       view.annotation = cluster
-      view.markerTintColor = .systemBlue
-      view.glyphText = "\(cluster.memberAnnotations.count)"
+      view.configure(count: cluster.count)
       return view
     }
 
@@ -108,44 +107,44 @@ final class HybridMapViewDelegate: NSObject, MKMapViewDelegate, UIGestureRecogni
       return nil
     }
 
-    let view = mapView.dequeueReusableAnnotationView(
-      withIdentifier: markerReuseIdentifier,
-      for: marker
-    ) as? MKMarkerAnnotationView
+    let pinView = mapView.dequeueReusableAnnotationView(
+      withIdentifier: NitroPinAnnotationView.reuseIdentifier
+    ) as? NitroPinAnnotationView
+      ?? NitroPinAnnotationView(
+        annotation: marker,
+        reuseIdentifier: NitroPinAnnotationView.reuseIdentifier
+      )
 
-    let annotationView = view ?? MKMarkerAnnotationView(
-      annotation: marker,
-      reuseIdentifier: markerReuseIdentifier
-    )
-    annotationView.annotation = marker
-    if let markerView = annotationView as? MKMarkerAnnotationView {
-      markerView.canShowCallout = marker.title != nil || marker.subtitle != nil
-      markerView.isDraggable = marker.draggable
-    } else {
-      annotationView.canShowCallout = marker.title != nil || marker.subtitle != nil
-      annotationView.isDraggable = marker.draggable
-    }
-    applyClusteringIdentifier(to: annotationView, marker: marker)
-    return annotationView
+    pinView.configure(for: marker)
+    return pinView
   }
 
-  private func applyClusteringIdentifier(to view: MKAnnotationView, marker: MapMarkerAnnotation) {
-    if parent?.clusteringEnabled == true, marker.isClusterable {
-      view.clusteringIdentifier = Self.clusteringIdentifier
-    } else {
-      view.clusteringIdentifier = nil
+  func mapView(_ mapView: MKMapView, didAdd views: [MKAnnotationView]) {
+    for view in views {
+      // Markers use MapKit's native drop animation; only fade in cluster badges.
+      guard view.annotation is MapClusterAnnotation else {
+        continue
+      }
+      view.alpha = 0
+      UIView.animate(
+        withDuration: 0.16,
+        delay: 0,
+        options: [.allowUserInteraction, .beginFromCurrentState, .curveEaseOut]
+      ) {
+        view.alpha = 1
+      }
     }
   }
 
   func mapView(_ mapView: MKMapView, didSelect view: MKAnnotationView) {
-    if let cluster = view.annotation as? MKClusterAnnotation {
-      let markerIds = cluster.memberAnnotations.compactMap { parent?.markerId(for: $0) }
+    if let cluster = view.annotation as? MapClusterAnnotation {
       let coordinate = cluster.coordinate
       parent?.onClusterPress?(
-        markerIds,
+        cluster.memberIds,
         Coordinate(latitude: coordinate.latitude, longitude: coordinate.longitude)
       )
-      mapView.deselectAnnotation(cluster, animated: true)
+      parent?.animateToClusterRegion(cluster.region)
+      mapView.deselectAnnotation(cluster, animated: false)
       return
     }
 
diff --git a/package/ios/MKMapView+ScaleAppearance.swift b/package/ios/MKMapView+ScaleAppearance.swift
new file mode 100644
index 0000000..b28454e
--- /dev/null
+++ b/package/ios/MKMapView+ScaleAppearance.swift
@@ -0,0 +1,58 @@
+import MapKit
+import UIKit
+
+extension MKMapView {
+  func applyScaleAppearance() {
+    guard showsScale else {
+      return
+    }
+
+    for container in scaleContainers(in: self) {
+      styleScaleContainer(container)
+    }
+  }
+
+  private func scaleContainers(in view: UIView) -> [UIView] {
+    var results: [UIView] = []
+
+    for subview in view.subviews {
+      let className = String(describing: type(of: subview))
+      if className.localizedCaseInsensitiveContains("scale") {
+        results.append(subview)
+      }
+      results.append(contentsOf: scaleContainers(in: subview))
+    }
+
+    return results
+  }
+
+  private func styleScaleContainer(_ container: UIView) {
+    container.backgroundColor = UIColor.black.withAlphaComponent(0.58)
+    container.layer.cornerRadius = 8
+    container.layer.borderWidth = 1
+    container.layer.borderColor = UIColor.white.withAlphaComponent(0.14).cgColor
+    container.layer.shadowColor = UIColor.black.cgColor
+    container.layer.shadowOpacity = 0.28
+    container.layer.shadowRadius = 6
+    container.layer.shadowOffset = CGSize(width: 0, height: 2)
+
+    styleScaleDescendants(in: container)
+  }
+
+  private func styleScaleDescendants(in view: UIView) {
+    if let label = view as? UILabel {
+      label.textColor = .white
+      label.font = UIFont.systemFont(ofSize: 11, weight: .semibold)
+      label.layer.shadowColor = UIColor.black.cgColor
+      label.layer.shadowOpacity = 0.45
+      label.layer.shadowRadius = 1.5
+      label.layer.shadowOffset = CGSize(width: 0, height: 1)
+    } else if view.subviews.isEmpty, view.bounds.height <= 4, view.bounds.width >= 6 {
+      view.backgroundColor = UIColor.white.withAlphaComponent(0.9)
+    }
+
+    for subview in view.subviews {
+      styleScaleDescendants(in: subview)
+    }
+  }
+}
diff --git a/package/ios/MapClusterAnnotation.swift b/package/ios/MapClusterAnnotation.swift
new file mode 100644
index 0000000..82948de
--- /dev/null
+++ b/package/ios/MapClusterAnnotation.swift
@@ -0,0 +1,29 @@
+import MapKit
+
+/// Annotation representing a computed cluster of markers.
+///
+/// Clusters are produced by `MarkerClusterEngine` on a background queue, so the
+/// map view only ever receives a small, bounded number of annotations.
+final class MapClusterAnnotation: NSObject, MKAnnotation {
+  let id: String
+  let count: Int
+  let memberIds: [String]
+  /// Region that frames this cluster's members, used for tap-to-zoom.
+  let region: MKCoordinateRegion
+
+  @objc dynamic var coordinate: CLLocationCoordinate2D
+
+  init(
+    id: String,
+    coordinate: CLLocationCoordinate2D,
+    count: Int,
+    memberIds: [String],
+    region: MKCoordinateRegion
+  ) {
+    self.id = id
+    self.coordinate = coordinate
+    self.count = count
+    self.memberIds = memberIds
+    self.region = region
+  }
+}
diff --git a/package/ios/MapOverlayController.swift b/package/ios/MapOverlayController.swift
index 631552b..b027435 100644
--- a/package/ios/MapOverlayController.swift
+++ b/package/ios/MapOverlayController.swift
@@ -18,51 +18,247 @@ final class MapOverlayController {
     let tappable: Bool
   }
 
+  /// Datasets at or below this size (non-clustered) reconcile synchronously on
+  /// the main thread; everything else offloads compute to `computeQueue`.
+  private static let asyncThreshold = 500
+
   private weak var mapView: MKMapView?
-  private var markerAnnotations: [String: MapMarkerAnnotation] = [:]
+  /// All currently shown annotations (singles and clusters), keyed by diff key.
+  private var displayedAnnotations: [String: MKAnnotation] = [:]
+  private var allMarkerDescriptors: [MarkerDescriptor] = []
+  private var spatialIndex: MarkerSpatialIndex?
   private var shapeOverlays: [String: MKOverlay] = [:]
   private var overlayStyles: [ObjectIdentifier: OverlayStyle] = [:]
+  private var viewportRefreshWorkItem: DispatchWorkItem?
+  private var markersFingerprint: Int = 0
+  private var refreshGeneration: Int = 0
+  private var clusteringEnabled = false
+  private let computeQueue = DispatchQueue(
+    label: "com.nitromaps.markerCompute",
+    qos: .userInitiated
+  )
 
   init(mapView: MKMapView) {
     self.mapView = mapView
   }
 
+  /// Whether markers are driven by the background viewport pipeline (clustering
+  /// or large LOD) rather than the synchronous small-dataset path.
+  private var usesViewportPipeline: Bool {
+    clusteringEnabled || allMarkerDescriptors.count > Self.asyncThreshold
+  }
+
+  func setClusteringEnabled(_ enabled: Bool) {
+    guard clusteringEnabled != enabled else {
+      return
+    }
+
+    clusteringEnabled = enabled
+    reapplyMarkers()
+  }
+
   func reset() {
+    viewportRefreshWorkItem?.cancel()
+    viewportRefreshWorkItem = nil
+    refreshGeneration += 1
     guard let mapView else {
       return
     }
 
-    mapView.removeAnnotations(Array(markerAnnotations.values))
+    mapView.removeAnnotations(Array(displayedAnnotations.values))
     mapView.removeOverlays(Array(shapeOverlays.values))
-    markerAnnotations.removeAll()
+    displayedAnnotations.removeAll()
+    allMarkerDescriptors.removeAll()
+    spatialIndex = nil
     shapeOverlays.removeAll()
     overlayStyles.removeAll()
+    markersFingerprint = 0
+  }
+
+  func setMarkers(_ descriptors: [MarkerDescriptor]?) {
+    let next = descriptors ?? []
+    let fingerprint = MarkerViewportFilter.markersFingerprint(next)
+    guard fingerprint != markersFingerprint else {
+      return
+    }
+
+    markersFingerprint = fingerprint
+    allMarkerDescriptors = next
+    spatialIndex = nil
+    reapplyMarkers()
+  }
+
+  private func reapplyMarkers() {
+    if usesViewportPipeline {
+      rebuildIndexAndRefresh()
+    } else {
+      reconcileMarkersSync(allMarkerDescriptors)
+    }
+  }
+
+  /// Immediate (non-debounced) refresh used for live updates during gestures.
+  func refreshNow() {
+    guard usesViewportPipeline else {
+      return
+    }
+    refreshViewportMarkers()
+  }
+
+  /// Debounced viewport refresh for clustered / large datasets.
+  func scheduleViewportRefresh(immediate: Bool = false) {
+    guard usesViewportPipeline else {
+      return
+    }
+
+    viewportRefreshWorkItem?.cancel()
+    let work = DispatchWorkItem { [weak self] in
+      self?.refreshViewportMarkers()
+    }
+    viewportRefreshWorkItem = work
+
+    if immediate {
+      work.perform()
+    } else {
+      DispatchQueue.main.asyncAfter(deadline: .now() + 0.12, execute: work)
+    }
+  }
+
+  private func rebuildIndexAndRefresh() {
+    let descriptors = allMarkerDescriptors
+    refreshGeneration += 1
+    let generation = refreshGeneration
+
+    computeQueue.async { [weak self] in
+      let index = MarkerSpatialIndex(markers: descriptors)
+      DispatchQueue.main.async {
+        guard let self, generation == self.refreshGeneration else {
+          return
+        }
+        self.spatialIndex = index
+        self.refreshViewportMarkers()
+      }
+    }
+  }
+
+  private func refreshViewportMarkers() {
+    guard let mapView, let index = spatialIndex else {
+      return
+    }
+
+    let region = mapView.region
+    let viewSize = mapView.bounds.size
+    let displayed = Set(displayedAnnotations.keys)
+    let clustering = clusteringEnabled
+    refreshGeneration += 1
+    let generation = refreshGeneration
+
+    computeQueue.async { [weak self] in
+      let candidates = index.candidates(in: region)
+      let elements: [MarkerClusterEngine.Element]
+      if clustering {
+        elements = MarkerClusterEngine.clusters(
+          candidates: candidates,
+          region: region,
+          viewSize: viewSize
+        )
+      } else {
+        elements = MarkerViewportFilter
+          .displaySubset(candidates: candidates, region: region)
+          .map { .single($0) }
+      }
+
+      let diff = Self.computeDiff(target: elements, displayed: displayed)
+      DispatchQueue.main.async {
+        guard let self, generation == self.refreshGeneration else {
+          return
+        }
+        self.applyDiff(diff)
+      }
+    }
+  }
+
+  private struct MarkerDiff {
+    let removedKeys: Set<String>
+    let added: [(key: String, annotation: MKAnnotation)]
   }
 
-  func updateMarkers(_ descriptors: [MarkerDescriptor]?) {
+  private static func computeDiff(
+    target: [MarkerClusterEngine.Element],
+    displayed: Set<String>
+  ) -> MarkerDiff {
+    var nextKeys = Set<String>()
+    nextKeys.reserveCapacity(target.count)
+    var added: [(key: String, annotation: MKAnnotation)] = []
+
+    for element in target {
+      let key = element.diffKey
+      guard nextKeys.insert(key).inserted else {
+        continue
+      }
+      if !displayed.contains(key) {
+        added.append((key, element.makeAnnotation()))
+      }
+    }
+
+    return MarkerDiff(
+      removedKeys: displayed.subtracting(nextKeys),
+      added: added
+    )
+  }
+
+  private func applyDiff(_ diff: MarkerDiff) {
     guard let mapView else {
       return
     }
 
-    let nextDescriptors = descriptors ?? []
-    let nextIds = Set(nextDescriptors.map(\.id))
-    let existingIds = Set(markerAnnotations.keys)
+    if !diff.removedKeys.isEmpty {
+      let removed = diff.removedKeys.compactMap { displayedAnnotations.removeValue(forKey: $0) }
+      mapView.removeAnnotations(removed)
+    }
 
-    for removedId in existingIds.subtracting(nextIds) {
-      if let annotation = markerAnnotations.removeValue(forKey: removedId) {
-        mapView.removeAnnotation(annotation)
+    if !diff.added.isEmpty {
+      var annotations: [MKAnnotation] = []
+      annotations.reserveCapacity(diff.added.count)
+      for entry in diff.added {
+        displayedAnnotations[entry.key] = entry.annotation
+        annotations.append(entry.annotation)
       }
+      mapView.addAnnotations(annotations)
     }
+  }
 
-    for descriptor in nextDescriptors {
-      if let existing = markerAnnotations[descriptor.id] {
+  /// Synchronous reconcile for small, non-clustered datasets, including per-id
+  /// coordinate updates for dynamic markers.
+  private func reconcileMarkersSync(_ descriptors: [MarkerDescriptor]) {
+    guard let mapView else {
+      return
+    }
+
+    var nextKeys = Set<String>()
+    nextKeys.reserveCapacity(descriptors.count)
+    var addedAnnotations: [MKAnnotation] = []
+
+    for descriptor in descriptors {
+      let key = "s:" + descriptor.id
+      nextKeys.insert(key)
+      if let existing = displayedAnnotations[key] as? MapMarkerAnnotation {
         existing.update(from: descriptor)
       } else {
         let annotation = MapMarkerAnnotation(descriptor: descriptor)
-        markerAnnotations[descriptor.id] = annotation
-        mapView.addAnnotation(annotation)
+        displayedAnnotations[key] = annotation
+        addedAnnotations.append(annotation)
       }
     }
+
+    let removedKeys = Set(displayedAnnotations.keys).subtracting(nextKeys)
+    if !removedKeys.isEmpty {
+      let removed = removedKeys.compactMap { displayedAnnotations.removeValue(forKey: $0) }
+      mapView.removeAnnotations(removed)
+    }
+
+    if !addedAnnotations.isEmpty {
+      mapView.addAnnotations(addedAnnotations)
+    }
   }
 
   func updatePolylines(_ descriptors: [PolylineDescriptor]?) {
@@ -121,18 +317,6 @@ final class MapOverlayController {
     )
   }
 
-  func markerId(for annotation: MKAnnotation) -> String? {
-    (annotation as? MapMarkerAnnotation)?.id
-  }
-
-  func markerAnnotation(for id: String) -> MapMarkerAnnotation? {
-    markerAnnotations[id]
-  }
-
-  func allMarkerAnnotations() -> [MapMarkerAnnotation] {
-    Array(markerAnnotations.values)
-  }
-
   func renderer(for overlay: MKOverlay) -> MKOverlayRenderer? {
     guard let style = overlayStyles[ObjectIdentifier(overlay)] else {
       return nil
diff --git a/package/ios/MarkerClusterEngine.swift b/package/ios/MarkerClusterEngine.swift
new file mode 100644
index 0000000..61f4b91
--- /dev/null
+++ b/package/ios/MarkerClusterEngine.swift
@@ -0,0 +1,266 @@
+import MapKit
+
+/// Grid-based marker clustering computed in geographic space.
+///
+/// Runs entirely off descriptor data (no `MKMapView` projection), so it is safe
+/// to call from a background queue. Output is bounded by the number of grid
+/// cells that fit on screen, keeping per-frame MapKit work small and constant.
+enum MarkerClusterEngine {
+  /// A single display element: an individual marker or a cluster badge.
+  enum Element {
+    case single(MarkerDescriptor)
+    case cluster(
+      key: String,
+      coordinate: CLLocationCoordinate2D,
+      count: Int,
+      memberIds: [String],
+      region: MKCoordinateRegion
+    )
+
+    /// Stable identity for diffing. Cluster keys embed the count so a membership
+    /// change replaces the badge instead of showing a stale number.
+    var diffKey: String {
+      switch self {
+      case let .single(descriptor):
+        return "s:" + descriptor.id
+      case let .cluster(key, _, count, _, _):
+        return "c:" + key + ":" + String(count)
+      }
+    }
+
+    func makeAnnotation() -> MKAnnotation {
+      switch self {
+      case let .single(descriptor):
+        return MapMarkerAnnotation(descriptor: descriptor)
+      case let .cluster(key, coordinate, count, memberIds, region):
+        return MapClusterAnnotation(
+          id: key,
+          coordinate: coordinate,
+          count: count,
+          memberIds: memberIds,
+          region: region
+        )
+      }
+    }
+  }
+
+  /// Target cluster cell size in points.
+  private static let cellPoints: Double = 64
+
+  /// Snaps a cell size (degrees) to the nearest power of two so small zoom
+  /// changes keep the same absolute grid.
+  private static func quantize(_ value: Double) -> Double {
+    guard value > 0, value.isFinite else {
+      return 1
+    }
+    return pow(2, log2(value).rounded())
+  }
+
+  /// Approximate badge radius (points) per count — mirrors the annotation views
+  /// so the overlap test matches what is actually drawn.
+  private static func badgeRadius(for count: Int) -> Double {
+    ClusterBadgeMetrics.badgeRadius(for: count)
+  }
+
+  /// Extra slack (points) so near-touching badges still merge.
+  private static let mergeGap = ClusterBadgeMetrics.mergeGap
+
+  private struct Bucket {
+    var key = ""
+    var count = 0
+    var sumLat = 0.0
+    var sumLon = 0.0
+    var minLat = Double.greatestFiniteMagnitude
+    var maxLat = -Double.greatestFiniteMagnitude
+    var minLon = Double.greatestFiniteMagnitude
+    var maxLon = -Double.greatestFiniteMagnitude
+    var memberIds: [String] = []
+    var first: MarkerDescriptor?
+
+    /// Folds another bucket's members in. The receiver keeps its own key/first,
+    /// so callers should seed groups with the dominant (largest) bucket.
+    mutating func absorb(_ other: Bucket) {
+      count += other.count
+      sumLat += other.sumLat
+      sumLon += other.sumLon
+      minLat = min(minLat, other.minLat)
+      maxLat = max(maxLat, other.maxLat)
+      minLon = min(minLon, other.minLon)
+      maxLon = max(maxLon, other.maxLon)
+      memberIds.append(contentsOf: other.memberIds)
+    }
+  }
+
+  static func clusters(
+    candidates: [MarkerDescriptor],
+    region: MKCoordinateRegion,
+    viewSize: CGSize
+  ) -> [Element] {
+    guard !candidates.isEmpty else {
+      return []
+    }
+
+    var singles: [Element] = []
+    var clusterableCandidates: [MarkerDescriptor] = []
+    for descriptor in candidates {
+      if descriptor.clusterable == false {
+        singles.append(.single(descriptor))
+      } else {
+        clusterableCandidates.append(descriptor)
+      }
+    }
+
+    guard !clusterableCandidates.isEmpty else {
+      return singles
+    }
+
+    let cols = max(1, Int(Double(viewSize.width) / cellPoints))
+    let rows = max(1, Int(Double(viewSize.height) / cellPoints))
+    // Quantize cell size and anchor the grid to absolute (0,0) coordinates so
+    // cells stay fixed to geography while panning — clusters don't churn or
+    // "swim", only re-forming when the zoom level crosses an octave.
+    let cellLat = quantize(region.span.latitudeDelta / Double(rows))
+    let cellLon = quantize(region.span.longitudeDelta / Double(cols))
+
+    var buckets: [String: Bucket] = [:]
+    for descriptor in clusterableCandidates {
+      let lat = descriptor.coordinate.latitude
+      let lon = descriptor.coordinate.longitude
+      let row = Int((lat / cellLat).rounded(.down))
+      let col = Int((lon / cellLon).rounded(.down))
+      let key = "\(row):\(col)"
+
+      var bucket = buckets[key] ?? Bucket()
+      bucket.key = key
+      bucket.count += 1
+      bucket.sumLat += lat
+      bucket.sumLon += lon
+      bucket.minLat = min(bucket.minLat, lat)
+      bucket.maxLat = max(bucket.maxLat, lat)
+      bucket.minLon = min(bucket.minLon, lon)
+      bucket.maxLon = max(bucket.maxLon, lon)
+      if bucket.first == nil {
+        bucket.first = descriptor
+      }
+      bucket.memberIds.append(descriptor.id)
+      buckets[key] = bucket
+    }
+
+    let merged = mergeOverlapping(Array(buckets.values), region: region, viewSize: viewSize)
+
+    var elements = singles
+    elements.reserveCapacity(merged.count + singles.count)
+    for bucket in merged {
+      if bucket.count == 1, let descriptor = bucket.first {
+        elements.append(.single(descriptor))
+      } else {
+        elements.append(.cluster(
+          key: bucket.key,
+          coordinate: CLLocationCoordinate2D(
+            latitude: bucket.sumLat / Double(bucket.count),
+            longitude: bucket.sumLon / Double(bucket.count)
+          ),
+          count: bucket.count,
+          memberIds: bucket.memberIds,
+          region: expandedRegion(
+            minLat: bucket.minLat,
+            maxLat: bucket.maxLat,
+            minLon: bucket.minLon,
+            maxLon: bucket.maxLon
+          )
+        ))
+      }
+    }
+    return elements
+  }
+
+  /// Merges buckets whose badges would overlap on screen, so a zoomed-out view
+  /// collapses neighbouring cells into one badge instead of stacking them.
+  /// Uses union-find on screen-space centroid distance; groups are seeded by the
+  /// largest bucket so the resulting cluster key is stable.
+  private static func mergeOverlapping(
+    _ buckets: [Bucket],
+    region: MKCoordinateRegion,
+    viewSize: CGSize
+  ) -> [Bucket] {
+    let n = buckets.count
+    guard n > 1 else {
+      return buckets
+    }
+
+    let width = Double(viewSize.width)
+    let height = Double(viewSize.height)
+    let centerLat = region.center.latitude
+    let centerLon = region.center.longitude
+    let spanLat = max(region.span.latitudeDelta, 1e-9)
+    let spanLon = max(region.span.longitudeDelta, 1e-9)
+
+    var px = [Double](repeating: 0, count: n)
+    var py = [Double](repeating: 0, count: n)
+    for i in 0..<n {
+      let bucket = buckets[i]
+      let lat = bucket.sumLat / Double(bucket.count)
+      let lon = bucket.sumLon / Double(bucket.count)
+      px[i] = (lon - centerLon) / spanLon * width
+      py[i] = (centerLat - lat) / spanLat * height
+    }
+
+    var parent = Array(0..<n)
+    func find(_ value: Int) -> Int {
+      var root = value
+      while parent[root] != root {
+        parent[root] = parent[parent[root]]
+        root = parent[root]
+      }
+      return root
+    }
+
+    for i in 0..<n {
+      let ri = badgeRadius(for: buckets[i].count)
+      for j in (i + 1)..<n {
+        let dx = px[i] - px[j]
+        let dy = py[i] - py[j]
+        let minDist = ri + badgeRadius(for: buckets[j].count) + mergeGap
+        if dx * dx + dy * dy < minDist * minDist {
+          let a = find(i)
+          let b = find(j)
+          if a != b {
+            parent[b] = a
+          }
+        }
+      }
+    }
+
+    var groups: [Int: Bucket] = [:]
+    var order: [Int] = []
+    for index in (0..<n).sorted(by: { buckets[$0].count > buckets[$1].count }) {
+      let root = find(index)
+      if groups[root] != nil {
+        groups[root]?.absorb(buckets[index])
+      } else {
+        groups[root] = buckets[index]
+        order.append(root)
+      }
+    }
+    return order.compactMap { groups[$0] }
+  }
+
+  /// Region that snugly contains a cluster's members, padded so a tap-to-zoom
+  /// reveals them with breathing room (and never zooms in absurdly far).
+  private static func expandedRegion(
+    minLat: Double,
+    maxLat: Double,
+    minLon: Double,
+    maxLon: Double
+  ) -> MKCoordinateRegion {
+    let center = CLLocationCoordinate2D(
+      latitude: (minLat + maxLat) / 2,
+      longitude: (minLon + maxLon) / 2
+    )
+    let span = MKCoordinateSpan(
+      latitudeDelta: max((maxLat - minLat) * 1.6, 0.01),
+      longitudeDelta: max((maxLon - minLon) * 1.6, 0.01)
+    )
+    return MKCoordinateRegion(center: center, span: span)
+  }
+}
diff --git a/package/ios/MarkerSpatialIndex.swift b/package/ios/MarkerSpatialIndex.swift
new file mode 100644
index 0000000..7a2a3a6
--- /dev/null
+++ b/package/ios/MarkerSpatialIndex.swift
@@ -0,0 +1,101 @@
+import MapKit
+
+/// Uniform grid spatial index over a marker dataset.
+///
+/// Built once per dataset so viewport queries cost O(cells in view + markers in
+/// those cells) instead of O(all markers). Immutable after init, so instances
+/// are safe to query from a background queue.
+final class MarkerSpatialIndex {
+  let count: Int
+  private let cellsPerSide: Int
+  private let minLat: Double
+  private let minLon: Double
+  private let latStep: Double
+  private let lonStep: Double
+  private var cells: [[MarkerDescriptor]]
+
+  init(markers: [MarkerDescriptor], cellsPerSide: Int = 96) {
+    count = markers.count
+    let side = max(1, cellsPerSide)
+    self.cellsPerSide = side
+
+    var minLatV = Double.greatestFiniteMagnitude
+    var maxLatV = -Double.greatestFiniteMagnitude
+    var minLonV = Double.greatestFiniteMagnitude
+    var maxLonV = -Double.greatestFiniteMagnitude
+
+    for marker in markers {
+      let lat = marker.coordinate.latitude
+      let lon = marker.coordinate.longitude
+      minLatV = min(minLatV, lat)
+      maxLatV = max(maxLatV, lat)
+      minLonV = min(minLonV, lon)
+      maxLonV = max(maxLonV, lon)
+    }
+
+    if markers.isEmpty {
+      minLatV = 0
+      maxLatV = 0
+      minLonV = 0
+      maxLonV = 0
+    }
+
+    minLat = minLatV
+    minLon = minLonV
+    latStep = max(1e-9, (maxLatV - minLatV) / Double(side))
+    lonStep = max(1e-9, (maxLonV - minLonV) / Double(side))
+    cells = Array(repeating: [], count: side * side)
+
+    for marker in markers {
+      let index = cellIndex(
+        lat: marker.coordinate.latitude,
+        lon: marker.coordinate.longitude
+      )
+      cells[index].append(marker)
+    }
+  }
+
+  /// Markers whose grid cells overlap the padded region.
+  func candidates(in region: MKCoordinateRegion, padding: Double = 0.2) -> [MarkerDescriptor] {
+    guard count > 0 else {
+      return []
+    }
+
+    let latPad = region.span.latitudeDelta * padding
+    let lonPad = region.span.longitudeDelta * padding
+    let minLatQ = region.center.latitude - region.span.latitudeDelta / 2 - latPad
+    let maxLatQ = region.center.latitude + region.span.latitudeDelta / 2 + latPad
+    let minLonQ = region.center.longitude - region.span.longitudeDelta / 2 - lonPad
+    let maxLonQ = region.center.longitude + region.span.longitudeDelta / 2 + lonPad
+
+    let rowStart = clampedRow(minLatQ)
+    let rowEnd = clampedRow(maxLatQ)
+    let colStart = clampedColumn(minLonQ)
+    let colEnd = clampedColumn(maxLonQ)
+
+    var result: [MarkerDescriptor] = []
+    var row = rowStart
+    while row <= rowEnd {
+      let base = row * cellsPerSide
+      var column = colStart
+      while column <= colEnd {
+        result.append(contentsOf: cells[base + column])
+        column += 1
+      }
+      row += 1
+    }
+    return result
+  }
+
+  private func cellIndex(lat: Double, lon: Double) -> Int {
+    clampedRow(lat) * cellsPerSide + clampedColumn(lon)
+  }
+
+  private func clampedRow(_ lat: Double) -> Int {
+    min(cellsPerSide - 1, max(0, Int((lat - minLat) / latStep)))
+  }
+
+  private func clampedColumn(_ lon: Double) -> Int {
+    min(cellsPerSide - 1, max(0, Int((lon - minLon) / lonStep)))
+  }
+}
diff --git a/package/ios/MarkerViewportFilter.swift b/package/ios/MarkerViewportFilter.swift
new file mode 100644
index 0000000..33d54bb
--- /dev/null
+++ b/package/ios/MarkerViewportFilter.swift
@@ -0,0 +1,102 @@
+import MapKit
+
+/// Selects a zoom-appropriate marker subset for large datasets.
+enum MarkerViewportFilter {
+  /// Precise viewport filter + spatial subsample over pre-narrowed candidates.
+  ///
+  /// The caller (spatial index) has already restricted `candidates` to cells
+  /// near the region, so this runs over a small set and is safe to call off the
+  /// main thread.
+  static func displaySubset(
+    candidates: [MarkerDescriptor],
+    region: MKCoordinateRegion
+  ) -> [MarkerDescriptor] {
+    let maxCount = maxMarkers(for: region.span.latitudeDelta)
+    let visible = candidates.filter { region.contains($0.coordinate, padding: 0.2) }
+
+    guard visible.count > maxCount else {
+      return visible
+    }
+
+    return spatialSubsample(visible, maxCount: maxCount, region: region)
+  }
+
+  static func markersFingerprint(_ markers: [MarkerDescriptor]?) -> Int {
+    guard let markers, !markers.isEmpty else {
+      return 0
+    }
+
+    var hasher = Hasher()
+    hasher.combine(markers.count)
+    for marker in markers {
+      hasher.combine(marker.id)
+      hasher.combine(marker.coordinate.latitude)
+      hasher.combine(marker.coordinate.longitude)
+      hasher.combine(marker.title)
+      hasher.combine(marker.subtitle)
+      hasher.combine(marker.draggable)
+      hasher.combine(marker.clusterable)
+    }
+    return hasher.finalize()
+  }
+
+  /// Picks at most one marker per geographic cell so subsampling stays visually even.
+  private static func spatialSubsample(
+    _ markers: [MarkerDescriptor],
+    maxCount: Int,
+    region: MKCoordinateRegion
+  ) -> [MarkerDescriptor] {
+    let columns = Int(ceil(sqrt(Double(maxCount))))
+    let rows = Int(ceil(Double(maxCount) / Double(columns)))
+
+    let latMin = region.center.latitude - region.span.latitudeDelta * 0.6
+    let latMax = region.center.latitude + region.span.latitudeDelta * 0.6
+    let lonMin = region.center.longitude - region.span.longitudeDelta * 0.6
+    let lonMax = region.center.longitude + region.span.longitudeDelta * 0.6
+
+    let latStep = max(1e-9, (latMax - latMin) / Double(rows))
+    let lonStep = max(1e-9, (lonMax - lonMin) / Double(columns))
+
+    var buckets: [String: [MarkerDescriptor]] = [:]
+    buckets.reserveCapacity(maxCount)
+
+    for marker in markers {
+      let row = min(rows - 1, max(0, Int((marker.coordinate.latitude - latMin) / latStep)))
+      let column = min(columns - 1, max(0, Int((marker.coordinate.longitude - lonMin) / lonStep)))
+      buckets["\(row)-\(column)", default: []].append(marker)
+    }
+
+    return buckets.values.map { cell in
+      cell[cell.count / 2]
+    }
+  }
+
+  private static func maxMarkers(for latitudeDelta: Double) -> Int {
+    if latitudeDelta < 0.08 {
+      return 2_000
+    }
+    if latitudeDelta < 0.5 {
+      return 800
+    }
+    if latitudeDelta < 2.0 {
+      return 350
+    }
+    return 200
+  }
+}
+
+private extension MKCoordinateRegion {
+  func contains(_ coordinate: Coordinate, padding: Double) -> Bool {
+    let latPadding = span.latitudeDelta * padding
+    let lonPadding = span.longitudeDelta * padding
+    let minLat = center.latitude - span.latitudeDelta / 2 - latPadding
+    let maxLat = center.latitude + span.latitudeDelta / 2 + latPadding
+    let minLon = center.longitude - span.longitudeDelta / 2 - lonPadding
+    let maxLon = center.longitude + span.longitudeDelta / 2 + lonPadding
+
+    return coordinate.latitude >= minLat
+      && coordinate.latitude <= maxLat
+      && coordinate.longitude >= minLon
+      && coordinate.longitude <= maxLon
+  }
+}
diff --git a/package/ios/NitroClusterAnnotationView.swift b/package/ios/NitroClusterAnnotationView.swift
new file mode 100644
index 0000000..644ae0f
--- /dev/null
+++ b/package/ios/NitroClusterAnnotationView.swift
@@ -0,0 +1,74 @@
+import MapKit
+import UIKit
+
+/// Circular cluster badge with a gradient fill, soft shadow and member count.
+final class NitroClusterAnnotationView: MKAnnotationView {
+  static let reuseIdentifier = "NitroCluster"
+
+  private let label = UILabel()
+  private let circle = UIView()
+  private let gradient = CAGradientLayer()
+
+  override init(annotation: MKAnnotation?, reuseIdentifier: String?) {
+    super.init(annotation: annotation, reuseIdentifier: reuseIdentifier)
+    setUp()
+  }
+
+  @available(*, unavailable)
+  required init?(coder: NSCoder) {
+    fatalError("init(coder:) has not been implemented")
+  }
+
+  private func setUp() {
+    canShowCallout = false
+    displayPriority = .required
+    collisionMode = .circle
+    centerOffset = .zero
+
+    circle.isUserInteractionEnabled = false
+    circle.layer.borderWidth = 2
+    circle.layer.borderColor = UIColor.white.cgColor
+    circle.layer.shadowColor = UIColor.black.cgColor
+    circle.layer.shadowOpacity = 0.28
+    circle.layer.shadowRadius = 3
+    circle.layer.shadowOffset = CGSize(width: 0, height: 1.5)
+
+    gradient.colors = [
+      UIColor(red: 0.30, green: 0.62, blue: 1.0, alpha: 1).cgColor,
+      UIColor(red: 0.04, green: 0.52, blue: 1.0, alpha: 1).cgColor,
+    ]
+    gradient.startPoint = CGPoint(x: 0.5, y: 0)
+    gradient.endPoint = CGPoint(x: 0.5, y: 1)
+    gradient.masksToBounds = true
+    circle.layer.insertSublayer(gradient, at: 0)
+    addSubview(circle)
+
+    label.textAlignment = .center
+    label.textColor = .white
+    label.font = .systemFont(ofSize: 13, weight: .bold)
+    label.adjustsFontSizeToFitWidth = true
+    label.minimumScaleFactor = 0.6
+    label.isUserInteractionEnabled = false
+    addSubview(label)
+  }
+
+  func configure(count: Int) {
+    let diameter = ClusterBadgeMetrics.diameter(for: count)
+    let rect = CGRect(x: 0, y: 0, width: diameter, height: diameter)
+    bounds = rect
+    circle.frame = rect
+    circle.layer.cornerRadius = diameter / 2
+    circle.layer.shadowPath = UIBezierPath(ovalIn: rect).cgPath
+    gradient.frame = rect
+    gradient.cornerRadius = diameter / 2
+    label.frame = rect
+    label.text = Self.format(count)
+  }
+
+  private static func format(_ count: Int) -> String {
+    if count >= 1000 {
+      return String(format: "%.1fk", Double(count) / 1000)
+    }
+    return String(count)
+  }
+}
diff --git a/package/ios/NitroMKMapView.swift b/package/ios/NitroMKMapView.swift
new file mode 100644
index 0000000..82fdecc
--- /dev/null
+++ b/package/ios/NitroMKMapView.swift
@@ -0,0 +1,9 @@
+import MapKit
+
+/// MapKit view that keeps built-in controls styled for readability on busy basemaps.
+final class NitroMKMapView: MKMapView {
+  override func layoutSubviews() {
+    super.layoutSubviews()
+    applyScaleAppearance()
+  }
+}
diff --git a/package/ios/NitroPinAnnotationView.swift b/package/ios/NitroPinAnnotationView.swift
new file mode 100644
index 0000000..628ef50
--- /dev/null
+++ b/package/ios/NitroPinAnnotationView.swift
@@ -0,0 +1,113 @@
+import MapKit
+import UIKit
+
+/// Lightweight pin view for bulk markers — avoids MKMarkerAnnotationView overhead.
+final class NitroPinAnnotationView: MKAnnotationView {
+  static let reuseIdentifier = "NitroPin"
+
+  private static let pinSize = CGSize(width: 28, height: 38)
+  private static let pinInset: CGFloat = 3
+
+  /// Teardrop pin with a blue gradient (matching cluster badges), white border,
+  /// inner dot and a soft shadow. Rendered once and shared across all markers.
+  private static let pinImage: UIImage = {
+    let size = pinSize
+    let inset = pinInset
+    let renderer = UIGraphicsImageRenderer(size: size)
+    return renderer.image { context in
+      let cg = context.cgContext
+      let radius = (size.width - inset * 2) / 2
+      let center = CGPoint(x: size.width / 2, y: inset + radius)
+      let tip = CGPoint(x: size.width / 2, y: size.height - inset)
+
+      let topColor = UIColor(red: 0.30, green: 0.62, blue: 1.0, alpha: 1)
+      let bottomColor = UIColor(red: 0.04, green: 0.52, blue: 1.0, alpha: 1)
+
+      let distance = tip.y - center.y
+      let alpha = acos(min(1, radius / distance))
+      let rightTangent = CGPoint(
+        x: center.x + radius * sin(alpha),
+        y: center.y + radius * cos(alpha)
+      )
+      let leftTangent = CGPoint(
+        x: center.x - radius * sin(alpha),
+        y: center.y + radius * cos(alpha)
+      )
+
+      let path = UIBezierPath()
+      path.move(to: tip)
+      path.addLine(to: rightTangent)
+      path.addArc(
+        withCenter: center,
+        radius: radius,
+        startAngle: atan2(rightTangent.y - center.y, rightTangent.x - center.x),
+        endAngle: atan2(leftTangent.y - center.y, leftTangent.x - center.x),
+        clockwise: false
+      )
+      path.close()
+
+      cg.saveGState()
+      cg.setShadow(
+        offset: CGSize(width: 0, height: 1.5),
+        blur: 3,
+        color: UIColor.black.withAlphaComponent(0.3).cgColor
+      )
+      bottomColor.setFill()
+      path.fill()
+      cg.restoreGState()
+
+      cg.saveGState()
+      path.addClip()
+      let space = CGColorSpaceCreateDeviceRGB()
+      if let gradient = CGGradient(
+        colorsSpace: space,
+        colors: [topColor.cgColor, bottomColor.cgColor] as CFArray,
+        locations: [0, 1]
+      ) {
+        cg.drawLinearGradient(
+          gradient,
+          start: CGPoint(x: 0, y: inset),
+          end: CGPoint(x: 0, y: size.height - inset),
+          options: []
+        )
+      }
+      cg.restoreGState()
+
+      UIColor.white.setStroke()
+      path.lineWidth = 2
+      path.stroke()
+
+      let dotRadius: CGFloat = 3.6
+      let dot = UIBezierPath(
+        ovalIn: CGRect(
+          x: center.x - dotRadius,
+          y: center.y - dotRadius,
+          width: dotRadius * 2,
+          height: dotRadius * 2
+        )
+      )
+      UIColor.white.setFill()
+      dot.fill()
+    }
+  }()
+
+  override init(annotation: MKAnnotation?, reuseIdentifier: String?) {
+    super.init(annotation: annotation, reuseIdentifier: reuseIdentifier)
+    image = Self.pinImage
+    centerOffset = CGPoint(x: 0, y: -(Self.pinSize.height / 2 - Self.pinInset))
+    collisionMode = .circle
+    canShowCallout = false
+  }
+
+  @available(*, unavailable)
+  required init?(coder: NSCoder) {
+    fatalError("init(coder:) has not been implemented")
+  }
+
+  func configure(for marker: MapMarkerAnnotation) {
+    annotation = marker
+    isDraggable = marker.draggable
+    canShowCallout = marker.title != nil || marker.subtitle != nil
+    displayPriority = .required
+  }
+}
diff --git a/package/src/components/Circle.tsx b/package/src/components/Circle.tsx
index 8ff7fab..4b6ecca 100644
--- a/package/src/components/Circle.tsx
+++ b/package/src/components/Circle.tsx
@@ -1,3 +1,5 @@
+import type { OverlayComponentType } from '../overlays/overlayType';
+import { OverlayType } from '../overlays/overlayType';
 import type { CircleProps } from '../types/overlays';
 
 /**
@@ -9,3 +11,5 @@ import type { CircleProps } from '../types/overlays';
 export function Circle(_props: CircleProps): null {
   return null;
 }
+
+(Circle as OverlayComponentType).overlayType = OverlayType.Circle;
diff --git a/package/src/components/MapView.tsx b/package/src/components/MapView.tsx
index 5e2630b..59f2740 100644
--- a/package/src/components/MapView.tsx
+++ b/package/src/components/MapView.tsx
@@ -25,59 +25,104 @@ export const MapView = forwardRef<MapViewRef, MapViewProps>(function MapView(
     customMapStyle,
     clusteringEnabled,
     mapPadding,
+    markers: markersProp,
+    polylines: polylinesProp,
+    polygons: polygonsProp,
+    circles: circlesProp,
     onRegionChange,
     onRegionChangeComplete,
     onMapReady,
     onPress,
     onLongPress,
     onClusterPress,
+    onMarkerPress: onMarkerPressProp,
+    onMarkerDragEnd: onMarkerDragEndProp,
+    onPolylinePress: onPolylinePressProp,
+    onPolygonPress: onPolygonPressProp,
+    onCirclePress: onCirclePressProp,
   },
   ref,
 ) {
   const hybridRef = useRef<NativeMapViewHybrid>(null);
   const {
-    markers,
-    polylines,
-    polygons,
-    circles,
+    markers: collectedMarkers,
+    polylines: collectedPolylines,
+    polygons: collectedPolygons,
+    circles: collectedCircles,
     callbackRegistry,
-    hasMarkerPress,
-    hasMarkerDragEnd,
+    hasMarkerPress: hasCollectedMarkerPress,
+    hasMarkerDragEnd: hasCollectedMarkerDragEnd,
     hasPolylinePress,
     hasPolygonPress,
     hasCirclePress,
   } = useCollectedOverlays(children);
 
-  const handleMarkerPress = useCallback((id: string) => {
-    callbackRegistry.current.get(id)?.onPress?.();
-  }, [callbackRegistry]);
+  const markers =
+    markersProp != null && markersProp.length > 0
+      ? markersProp
+      : collectedMarkers;
+  const polylines =
+    polylinesProp != null && polylinesProp.length > 0
+      ? polylinesProp
+      : collectedPolylines;
+  const polygons =
+    polygonsProp != null && polygonsProp.length > 0
+      ? polygonsProp
+      : collectedPolygons;
+  const circles =
+    circlesProp != null && circlesProp.length > 0
+      ? circlesProp
+      : collectedCircles;
+
+  const hasMarkerPress =
+    onMarkerPressProp != null || hasCollectedMarkerPress;
+  const hasMarkerDragEnd =
+    onMarkerDragEndProp != null || hasCollectedMarkerDragEnd;
+  const hasPolylinePressHandler =
+    onPolylinePressProp != null || hasPolylinePress;
+  const hasPolygonPressHandler =
+    onPolygonPressProp != null || hasPolygonPress;
+  const hasCirclePressHandler =
+    onCirclePressProp != null || hasCirclePress;
+
+  const handleMarkerPress = useCallback(
+    (id: string) => {
+      callbackRegistry.current.get(id)?.onPress?.();
+      onMarkerPressProp?.(id);
+    },
+    [callbackRegistry, onMarkerPressProp],
+  );
 
   const handleMarkerDragEnd = useCallback(
     (id: string, coordinate: Coordinate) => {
       callbackRegistry.current.get(id)?.onDragEnd?.(coordinate);
+      onMarkerDragEndProp?.(id, coordinate);
     },
-    [callbackRegistry],
+    [callbackRegistry, onMarkerDragEndProp],
   );
 
   const handlePolylinePress = useCallback(
     (id: string) => {
       callbackRegistry.current.get(id)?.onPress?.();
+      onPolylinePressProp?.(id);
     },
-    [callbackRegistry],
+    [callbackRegistry, onPolylinePressProp],
   );
 
   const handlePolygonPress = useCallback(
     (id: string) => {
       callbackRegistry.current.get(id)?.onPress?.();
+      onPolygonPressProp?.(id);
     },
-    [callbackRegistry],
+    [callbackRegistry, onPolygonPressProp],
   );
 
   const handleCirclePress = useCallback(
     (id: string) => {
       callbackRegistry.current.get(id)?.onPress?.();
+      onCirclePressProp?.(id);
     },
-    [callbackRegistry],
+    [callbackRegistry, onCirclePressProp],
   );
 
   useImperativeHandle(
@@ -153,13 +198,13 @@ export const MapView = forwardRef<MapViewRef, MapViewProps>(function MapView(
         hasMarkerDragEnd ? callback(handleMarkerDragEnd) : undefined
       }
       onPolylinePress={
-        hasPolylinePress ? callback(handlePolylinePress) : undefined
+        hasPolylinePressHandler ? callback(handlePolylinePress) : undefined
       }
       onPolygonPress={
-        hasPolygonPress ? callback(handlePolygonPress) : undefined
+        hasPolygonPressHandler ? callback(handlePolygonPress) : undefined
       }
       onCirclePress={
-        hasCirclePress ? callback(handleCirclePress) : undefined
+        hasCirclePressHandler ? callback(handleCirclePress) : undefined
       }
     />
   );
diff --git a/package/src/components/Marker.tsx b/package/src/components/Marker.tsx
index bf40930..63ce055 100644
--- a/package/src/components/Marker.tsx
+++ b/package/src/components/Marker.tsx
@@ -1,3 +1,5 @@
+import type { OverlayComponentType } from '../overlays/overlayType';
+import { OverlayType } from '../overlays/overlayType';
 import type { MarkerProps } from '../types/overlays';
 
 /**
@@ -9,3 +11,5 @@ import type { MarkerProps } from '../types/overlays';
 export function Marker(_props: MarkerProps): null {
   return null;
 }
+
+(Marker as OverlayComponentType).overlayType = OverlayType.Marker;
diff --git a/package/src/components/Polygon.tsx b/package/src/components/Polygon.tsx
index 3baa721..c70ef68 100644
--- a/package/src/components/Polygon.tsx
+++ b/package/src/components/Polygon.tsx
@@ -1,3 +1,5 @@
+import type { OverlayComponentType } from '../overlays/overlayType';
+import { OverlayType } from '../overlays/overlayType';
 import type { PolygonProps } from '../types/overlays';
 
 /**
@@ -9,3 +11,5 @@ import type { PolygonProps } from '../types/overlays';
 export function Polygon(_props: PolygonProps): null {
   return null;
 }
+
+(Polygon as OverlayComponentType).overlayType = OverlayType.Polygon;
diff --git a/package/src/components/Polyline.tsx b/package/src/components/Polyline.tsx
index 7102a1a..9f7bc9b 100644
--- a/package/src/components/Polyline.tsx
+++ b/package/src/components/Polyline.tsx
@@ -1,3 +1,5 @@
+import type { OverlayComponentType } from '../overlays/overlayType';
+import { OverlayType } from '../overlays/overlayType';
 import type { PolylineProps } from '../types/overlays';
 
 /**
@@ -9,3 +11,5 @@ import type { PolylineProps } from '../types/overlays';
 export function Polyline(_props: PolylineProps): null {
   return null;
 }
+
+(Polyline as OverlayComponentType).overlayType = OverlayType.Polyline;
diff --git a/package/src/hooks/useCollectedOverlays.ts b/package/src/hooks/useCollectedOverlays.ts
index ca7745d..7e9c09e 100644
--- a/package/src/hooks/useCollectedOverlays.ts
+++ b/package/src/hooks/useCollectedOverlays.ts
@@ -1,5 +1,5 @@
 import { Children, isValidElement, useMemo, useRef } from 'react';
-import type { MutableRefObject, ReactNode } from 'react';
+import type { MutableRefObject, ReactElement, ReactNode } from 'react';
 import type {
   CircleDescriptor,
   MarkerDescriptor,
@@ -16,6 +16,8 @@ import { Circle } from '../components/Circle';
 import { Marker } from '../components/Marker';
 import { Polygon } from '../components/Polygon';
 import { Polyline } from '../components/Polyline';
+import type { OverlayComponentType, OverlayTypeName } from '../overlays/overlayType';
+import { OverlayType } from '../overlays/overlayType';
 
 interface OverlayCallbacks {
   onPress?: () => void;
@@ -47,132 +49,201 @@ function resolveOverlayId(
   return `${type}-${index}`;
 }
 
+function isOverlayChild(
+  child: ReactElement,
+  overlayType: OverlayTypeName,
+  component: unknown,
+): boolean {
+  if (typeof child.type === 'function' || typeof child.type === 'object') {
+    const childType = child.type as OverlayComponentType;
+    if (childType.overlayType === overlayType) {
+      return true;
+    }
+  }
+
+  return child.type === component;
+}
+
+interface OverlayCollectorState {
+  registry: Map<string, OverlayCallbacks>;
+  markers: MarkerDescriptor[];
+  polylines: PolylineDescriptor[];
+  polygons: PolygonDescriptor[];
+  circles: CircleDescriptor[];
+  markerIndex: number;
+  polylineIndex: number;
+  polygonIndex: number;
+  circleIndex: number;
+  hasMarkerPress: boolean;
+  hasMarkerDragEnd: boolean;
+  hasPolylinePress: boolean;
+  hasPolygonPress: boolean;
+  hasCirclePress: boolean;
+}
+
+interface OverlayCollector {
+  overlayType: OverlayTypeName;
+  component: unknown;
+  idPrefix: string;
+  collect: (child: ReactElement, state: OverlayCollectorState) => void;
+}
+
+function tappableFromPress(
+  onPress: (() => void) | undefined,
+  tappable: boolean | undefined,
+): boolean | undefined {
+  return onPress != null ? (tappable ?? true) : tappable;
+}
+
+const overlayCollectors: OverlayCollector[] = [
+  {
+    overlayType: OverlayType.Marker,
+    component: Marker,
+    idPrefix: 'marker',
+    collect: (child, state) => {
+      const props = child.props as MarkerProps;
+      const id = resolveOverlayId(props.id, 'marker', state.markerIndex);
+      state.markerIndex += 1;
+
+      state.markers.push({
+        id,
+        coordinate: props.coordinate,
+        title: props.title,
+        subtitle: props.subtitle,
+        draggable: props.draggable,
+        clusterable: props.clusterable,
+      });
+      state.registry.set(id, {
+        onPress: props.onPress,
+        onDragEnd: props.onDragEnd,
+      });
+      if (props.onPress != null) {
+        state.hasMarkerPress = true;
+      }
+      if (props.onDragEnd != null) {
+        state.hasMarkerDragEnd = true;
+      }
+    },
+  },
+  {
+    overlayType: OverlayType.Polyline,
+    component: Polyline,
+    idPrefix: 'polyline',
+    collect: (child, state) => {
+      const props = child.props as PolylineProps;
+      const id = resolveOverlayId(props.id, 'polyline', state.polylineIndex);
+      state.polylineIndex += 1;
+
+      state.polylines.push({
+        id,
+        coordinates: props.coordinates,
+        strokeColor: props.strokeColor,
+        strokeWidth: props.strokeWidth,
+        tappable: tappableFromPress(props.onPress, props.tappable),
+      });
+      state.registry.set(id, { onPress: props.onPress });
+      if (props.onPress != null) {
+        state.hasPolylinePress = true;
+      }
+    },
+  },
+  {
+    overlayType: OverlayType.Polygon,
+    component: Polygon,
+    idPrefix: 'polygon',
+    collect: (child, state) => {
+      const props = child.props as PolygonProps;
+      const id = resolveOverlayId(props.id, 'polygon', state.polygonIndex);
+      state.polygonIndex += 1;
+
+      state.polygons.push({
+        id,
+        coordinates: props.coordinates,
+        fillColor: props.fillColor,
+        strokeColor: props.strokeColor,
+        strokeWidth: props.strokeWidth,
+        tappable: tappableFromPress(props.onPress, props.tappable),
+      });
+      state.registry.set(id, { onPress: props.onPress });
+      if (props.onPress != null) {
+        state.hasPolygonPress = true;
+      }
+    },
+  },
+  {
+    overlayType: OverlayType.Circle,
+    component: Circle,
+    idPrefix: 'circle',
+    collect: (child, state) => {
+      const props = child.props as CircleProps;
+      const id = resolveOverlayId(props.id, 'circle', state.circleIndex);
+      state.circleIndex += 1;
+
+      state.circles.push({
+        id,
+        center: props.center,
+        radius: props.radius,
+        fillColor: props.fillColor,
+        strokeColor: props.strokeColor,
+        strokeWidth: props.strokeWidth,
+        tappable: tappableFromPress(props.onPress, props.tappable),
+      });
+      state.registry.set(id, { onPress: props.onPress });
+      if (props.onPress != null) {
+        state.hasCirclePress = true;
+      }
+    },
+  },
+];
+
 export function useCollectedOverlays(children: ReactNode): CollectedOverlays {
   const callbackRegistry = useRef(new Map<string, OverlayCallbacks>());
 
   const overlays = useMemo(() => {
-    const registry = new Map<string, OverlayCallbacks>();
-    const markers: MarkerDescriptor[] = [];
-    const polylines: PolylineDescriptor[] = [];
-    const polygons: PolygonDescriptor[] = [];
-    const circles: CircleDescriptor[] = [];
-
-    let markerIndex = 0;
-    let polylineIndex = 0;
-    let polygonIndex = 0;
-    let circleIndex = 0;
-    let hasMarkerPress = false;
-    let hasMarkerDragEnd = false;
-    let hasPolylinePress = false;
-    let hasPolygonPress = false;
-    let hasCirclePress = false;
+    const state: OverlayCollectorState = {
+      registry: new Map<string, OverlayCallbacks>(),
+      markers: [],
+      polylines: [],
+      polygons: [],
+      circles: [],
+      markerIndex: 0,
+      polylineIndex: 0,
+      polygonIndex: 0,
+      circleIndex: 0,
+      hasMarkerPress: false,
+      hasMarkerDragEnd: false,
+      hasPolylinePress: false,
+      hasPolygonPress: false,
+      hasCirclePress: false,
+    };
 
     Children.forEach(children, (child) => {
       if (!isValidElement(child)) {
         return;
       }
 
-      if (child.type === Marker) {
-        const props = child.props as MarkerProps;
-        const id = resolveOverlayId(props.id, 'marker', markerIndex);
-        markerIndex += 1;
-
-        markers.push({
-          id,
-          coordinate: props.coordinate,
-          title: props.title,
-          subtitle: props.subtitle,
-          draggable: props.draggable,
-          clusterable: props.clusterable,
-        });
-        registry.set(id, {
-          onPress: props.onPress,
-          onDragEnd: props.onDragEnd,
-        });
-        if (props.onPress != null) {
-          hasMarkerPress = true;
-        }
-        if (props.onDragEnd != null) {
-          hasMarkerDragEnd = true;
+      for (const collector of overlayCollectors) {
+        if (!isOverlayChild(child, collector.overlayType, collector.component)) {
+          continue;
         }
-        return;
-      }
 
-      if (child.type === Polyline) {
-        const props = child.props as PolylineProps;
-        const id = resolveOverlayId(props.id, 'polyline', polylineIndex);
-        polylineIndex += 1;
-
-        polylines.push({
-          id,
-          coordinates: props.coordinates,
-          strokeColor: props.strokeColor,
-          strokeWidth: props.strokeWidth,
-          tappable:
-            props.onPress != null ? (props.tappable ?? true) : props.tappable,
-        });
-        registry.set(id, { onPress: props.onPress });
-        if (props.onPress != null) {
-          hasPolylinePress = true;
-        }
-        return;
-      }
-
-      if (child.type === Polygon) {
-        const props = child.props as PolygonProps;
-        const id = resolveOverlayId(props.id, 'polygon', polygonIndex);
-        polygonIndex += 1;
-
-        polygons.push({
-          id,
-          coordinates: props.coordinates,
-          fillColor: props.fillColor,
-          strokeColor: props.strokeColor,
-          strokeWidth: props.strokeWidth,
-          tappable:
-            props.onPress != null ? (props.tappable ?? true) : props.tappable,
-        });
-        registry.set(id, { onPress: props.onPress });
-        if (props.onPress != null) {
-          hasPolygonPress = true;
-        }
-        return;
-      }
-
-      if (child.type === Circle) {
-        const props = child.props as CircleProps;
-        const id = resolveOverlayId(props.id, 'circle', circleIndex);
-        circleIndex += 1;
-
-        circles.push({
-          id,
-          center: props.center,
-          radius: props.radius,
-          fillColor: props.fillColor,
-          strokeColor: props.strokeColor,
-          strokeWidth: props.strokeWidth,
-          tappable:
-            props.onPress != null ? (props.tappable ?? true) : props.tappable,
-        });
-        registry.set(id, { onPress: props.onPress });
-        if (props.onPress != null) {
-          hasCirclePress = true;
-        }
+        collector.collect(child, state);
+        break;
       }
     });
 
-    callbackRegistry.current = registry;
+    callbackRegistry.current = state.registry;
 
     return {
-      markers,
-      polylines,
-      polygons,
-      circles,
-      hasMarkerPress,
-      hasMarkerDragEnd,
-      hasPolylinePress,
-      hasPolygonPress,
-      hasCirclePress,
+      markers: state.markers,
+      polylines: state.polylines,
+      polygons: state.polygons,
+      circles: state.circles,
+      hasMarkerPress: state.hasMarkerPress,
+      hasMarkerDragEnd: state.hasMarkerDragEnd,
+      hasPolylinePress: state.hasPolylinePress,
+      hasPolygonPress: state.hasPolygonPress,
+      hasCirclePress: state.hasCirclePress,
     };
   }, [children]);
 
diff --git a/package/src/overlays/overlayType.ts b/package/src/overlays/overlayType.ts
new file mode 100644
index 0000000..96ff0ff
--- /dev/null
+++ b/package/src/overlays/overlayType.ts
@@ -0,0 +1,18 @@
+/**
+ * Stable overlay identifiers used when collecting MapView children.
+ *
+ * Reference equality (`child.type === Marker`) breaks when Metro resolves the
+ * same component through different module paths (common in monorepos).
+ */
+export const OverlayType = {
+  Marker: 'NitroMaps.Marker',
+  Polyline: 'NitroMaps.Polyline',
+  Polygon: 'NitroMaps.Polygon',
+  Circle: 'NitroMaps.Circle',
+} as const;
+
+export type OverlayTypeName = (typeof OverlayType)[keyof typeof OverlayType];
+
+export interface OverlayComponentType {
+  overlayType?: OverlayTypeName;
+}
diff --git a/package/src/types/map.ts b/package/src/types/map.ts
index 7048820..4f50f2f 100644
--- a/package/src/types/map.ts
+++ b/package/src/types/map.ts
@@ -2,6 +2,12 @@ import type { ReactNode } from 'react';
 import type { StyleProp, ViewStyle } from 'react-native';
 import type { Camera } from './camera';
 import type { Coordinate } from './coordinate';
+import type {
+  CircleDescriptor,
+  MarkerDescriptor,
+  PolygonDescriptor,
+  PolylineDescriptor,
+} from '../native/specs/overlays';
 import type { EdgePadding, Region } from './region';
 
 /**
@@ -52,6 +58,36 @@ export interface MapViewProps {
   /** Padding applied to map edges, in density-independent pixels. */
   mapPadding?: EdgePadding;
 
+  /**
+   * Bulk marker descriptors. Prefer this over {@linkcode Marker} children
+   * when rendering hundreds or thousands of markers.
+   */
+  markers?: MarkerDescriptor[];
+
+  /** Bulk polyline descriptors. */
+  polylines?: PolylineDescriptor[];
+
+  /** Bulk polygon descriptors. */
+  polygons?: PolygonDescriptor[];
+
+  /** Bulk circle descriptors. */
+  circles?: CircleDescriptor[];
+
+  /** Called when any marker is pressed (bulk or child overlays). */
+  onMarkerPress?: (id: string) => void;
+
+  /** Called when any marker drag ends (bulk or child overlays). */
+  onMarkerDragEnd?: (id: string, coordinate: Coordinate) => void;
+
+  /** Called when any polyline is pressed (bulk or child overlays). */
+  onPolylinePress?: (id: string) => void;
+
+  /** Called when any polygon is pressed (bulk or child overlays). */
+  onPolygonPress?: (id: string) => void;
+
+  /** Called when any circle is pressed (bulk or child overlays). */
+  onCirclePress?: (id: string) => void;
+
   /** Called when the map region changes after user interaction. */
   onRegionChange?: (region: Region) => void;
 

From 0b200469e57f138d9245113a2aa547f20b2c8899 Mon Sep 17 00:00:00 2001
From: Jakub Kasprzyk <kasprzykjakub@proton.me>
Date: Fri, 26 Jun 2026 13:34:38 +0200
Subject: [PATCH 2/3] Add code generation step to CI workflow, improve marker
 clustering logic, and enhance overlay handling in MapView component.

---
 .github/workflows/ci.yml                      |   3 +
 example/App.tsx                               |   9 +-
 example/ios/Podfile.lock                      | 500 ++++++++++++------
 .../nitro/nitromaps/ClusterIconFactory.kt     |   3 +-
 .../nitro/nitromaps/MapOverlayController.kt   |  50 +-
 .../nitro/nitromaps/MarkerClusterEngine.kt    |  60 ++-
 .../nitro/nitromaps/MarkerSpatialIndex.kt     |  27 +-
 package/ios/HybridMapView.swift               |   9 +-
 package/ios/HybridMapViewDelegate.swift       |  15 +-
 package/ios/MapClusterAnnotation.swift        |  22 +-
 package/ios/MapOverlayController.swift        |  38 +-
 package/ios/MarkerClusterEngine.swift         |  53 +-
 package/ios/MarkerSpatialIndex.swift          |  18 +-
 package/ios/MarkerViewportFilter.swift        |  10 +-
 package/ios/NitroPinAnnotationView.swift      |  96 +---
 package/src/components/MapView.tsx            |  35 +-
 package/src/hooks/useCollectedOverlays.ts     |  15 +-
 package/src/overlays/overlayType.ts           |   7 +
 package/src/types/map.ts                      |  10 +-
 19 files changed, 630 insertions(+), 350 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 04cbdfd..a7dd308 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,6 +26,9 @@ jobs:
       - name: Install dependencies
         run: bun install --frozen-lockfile
 
+      - name: Codegen
+        run: bun run nitrogen
+
       - name: Lint
         run: bun run lint
 
diff --git a/example/App.tsx b/example/App.tsx
index ee78b19..74d57ef 100644
--- a/example/App.tsx
+++ b/example/App.tsx
@@ -493,10 +493,13 @@ export default function App() {
   }, []);
 
   const selectScenario = useCallback((index: number) => {
+    if (index === scenarioIndex) {
+      return;
+    }
     setScenarioIndex(index);
     setMapReady(false);
     setStatus(MAP_SCENARIOS[index].name);
-  }, []);
+  }, [scenarioIndex]);
 
   const toggleDockExpanded = useCallback(() => {
     setDockExpanded((current) => !current);
@@ -535,11 +538,11 @@ export default function App() {
     if (scenario.advanced?.fitToCoordinatesOnReady && scenario.markers != null) {
       mapRef.current?.fitToCoordinates(
         scenario.markers.map((marker) => marker.coordinate),
-        scenario.advanced.mapPadding,
+        mapPadding,
         true,
       );
     }
-  }, [scenario]);
+  }, [scenario, mapPadding]);
 
   const handleMapPress = useCallback((coordinate: Coordinate) => {
     setStatus(
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
index 2ef2bc9..b909155 100644
--- a/example/ios/Podfile.lock
+++ b/example/ios/Podfile.lock
@@ -69,6 +69,11 @@ PODS:
   - ExpoModulesWorklets (56.0.17):
     - ExpoModulesCore
     - ExpoModulesJSI
+  - ExpoModulesWorkletsAdapter (56.0.17):
+    - ExpoModulesCore
+    - ExpoModulesJSI
+    - ExpoModulesWorklets
+    - RNWorklets
   - FBLazyVector (0.85.3)
   - hermes-engine (250829098.0.10):
     - hermes-engine/Pre-built (= 250829098.0.10)
@@ -1904,274 +1909,428 @@ PODS:
     - React-utils (= 0.85.3)
     - ReactNativeDependencies
   - ReactNativeDependencies (0.85.3)
+  - RNReanimated (4.3.1):
+    - hermes-engine
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-Core-prebuilt
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-hermes
+    - React-ImageManager
+    - React-jsi
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-renderercss
+    - React-rendererdebug
+    - React-utils
+    - ReactCodegen
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - ReactNativeDependencies
+    - RNReanimated/apple (= 4.3.1)
+    - RNReanimated/common (= 4.3.1)
+    - RNWorklets
+    - Yoga
+  - RNReanimated/apple (4.3.1):
+    - hermes-engine
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-Core-prebuilt
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-hermes
+    - React-ImageManager
+    - React-jsi
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-renderercss
+    - React-rendererdebug
+    - React-utils
+    - ReactCodegen
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - ReactNativeDependencies
+    - RNWorklets
+    - Yoga
+  - RNReanimated/common (4.3.1):
+    - hermes-engine
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-Core-prebuilt
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-hermes
+    - React-ImageManager
+    - React-jsi
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-renderercss
+    - React-rendererdebug
+    - React-utils
+    - ReactCodegen
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - ReactNativeDependencies
+    - RNWorklets
+    - Yoga
+  - RNWorklets (0.8.3):
+    - hermes-engine
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-Core-prebuilt
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-hermes
+    - React-ImageManager
+    - React-jsi
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-renderercss
+    - React-rendererdebug
+    - React-utils
+    - ReactCodegen
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - ReactNativeDependencies
+    - RNWorklets/apple (= 0.8.3)
+    - RNWorklets/common (= 0.8.3)
+    - Yoga
+  - RNWorklets/apple (0.8.3):
+    - hermes-engine
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-Core-prebuilt
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-hermes
+    - React-ImageManager
+    - React-jsi
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-renderercss
+    - React-rendererdebug
+    - React-utils
+    - ReactCodegen
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - ReactNativeDependencies
+    - Yoga
+  - RNWorklets/common (0.8.3):
+    - hermes-engine
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-Core-prebuilt
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-hermes
+    - React-ImageManager
+    - React-jsi
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-renderercss
+    - React-rendererdebug
+    - React-utils
+    - ReactCodegen
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - ReactNativeDependencies
+    - Yoga
   - Yoga (0.0.0)
 
 DEPENDENCIES:
-  - "EXConstants (from `../../node_modules/.bun/expo-constants@56.0.18+cce5aae513a3a857/node_modules/expo-constants/ios`)"
-  - "Expo (from `../../node_modules/.bun/expo@56.0.12+7dcf3e6a9df9668a/node_modules/expo`)"
-  - "ExpoAsset (from `../../node_modules/.bun/expo-asset@56.0.17+720206a190cc34d0/node_modules/expo-asset/ios`)"
-  - "ExpoDomWebView (from `../../node_modules/.bun/@expo+dom-webview@56.0.5+cce5aae513a3a857/node_modules/@expo/dom-webview/ios`)"
-  - "ExpoFileSystem (from `../../node_modules/.bun/expo-file-system@56.0.8+cce5aae513a3a857/node_modules/expo-file-system/ios/ExpoFileSystem.podspec`)"
-  - "ExpoFont (from `../../node_modules/.bun/expo-font@56.0.7+cce5aae513a3a857/node_modules/expo-font/ios/ExpoFont.podspec`)"
+  - "EXConstants (from `../../node_modules/.bun/expo-constants@56.0.18+287a87011099de27/node_modules/expo-constants/ios`)"
+  - "Expo (from `../../node_modules/.bun/expo@56.0.12+195b118c4b5f5a32/node_modules/expo`)"
+  - "ExpoAsset (from `../../node_modules/.bun/expo-asset@56.0.17+36688fa712b0be51/node_modules/expo-asset/ios`)"
+  - "ExpoDomWebView (from `../../node_modules/.bun/@expo+dom-webview@56.0.5+287a87011099de27/node_modules/@expo/dom-webview/ios`)"
+  - "ExpoFileSystem (from `../../node_modules/.bun/expo-file-system@56.0.8+287a87011099de27/node_modules/expo-file-system/ios/ExpoFileSystem.podspec`)"
+  - "ExpoFont (from `../../node_modules/.bun/expo-font@56.0.7+287a87011099de27/node_modules/expo-font/ios/ExpoFont.podspec`)"
   - "ExpoKeepAwake (from `../../node_modules/.bun/expo-keep-awake@56.0.3+dc3ec1c4670f0f17/node_modules/expo-keep-awake/ios`)"
-  - "ExpoLogBox (from `../../node_modules/.bun/@expo+log-box@56.0.13+cce5aae513a3a857/node_modules/@expo/log-box`)"
-  - "ExpoModulesCore (from `../../node_modules/.bun/expo-modules-core@56.0.17+cb618bb9cb5c756e/node_modules/expo-modules-core/ExpoModulesCore.podspec`)"
-  - "ExpoModulesJSI (from `../../node_modules/.bun/expo-modules-jsi@56.0.10+cb618bb9cb5c756e/node_modules/expo-modules-jsi/apple`)"
-  - "ExpoModulesWorklets (from `../../node_modules/.bun/expo-modules-core@56.0.17+cb618bb9cb5c756e/node_modules/expo-modules-core/ExpoModulesWorklets.podspec`)"
-  - "FBLazyVector (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/Libraries/FBLazyVector`)"
-  - "hermes-engine (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec`)"
-  - "NitroModules (from `../../node_modules/.bun/react-native-nitro-modules@0.35.10+cb618bb9cb5c756e/node_modules/react-native-nitro-modules`)"
-  - "RCTDeprecation (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactApple/Libraries/RCTFoundation/RCTDeprecation`)"
-  - "RCTRequired (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/Libraries/Required`)"
-  - "RCTSwiftUI (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactApple/RCTSwiftUI`)"
-  - "RCTSwiftUIWrapper (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactApple/RCTSwiftUIWrapper`)"
-  - "RCTTypeSafety (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/Libraries/TypeSafety`)"
-  - "React (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/`)"
-  - "React-callinvoker (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/callinvoker`)"
-  - "React-Core (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/`)"
-  - "React-Core-prebuilt (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/React-Core-prebuilt.podspec`)"
-  - "React-Core/RCTWebSocket (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/`)"
-  - "React-CoreModules (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/React/CoreModules`)"
-  - "React-cxxreact (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/cxxreact`)"
-  - "React-debug (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/debug`)"
-  - "React-defaultsnativemodule (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/nativemodule/defaults`)"
-  - "React-domnativemodule (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/nativemodule/dom`)"
-  - "React-Fabric (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon`)"
-  - "React-FabricComponents (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon`)"
-  - "React-FabricImage (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon`)"
-  - "React-featureflags (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/featureflags`)"
-  - "React-featureflagsnativemodule (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/nativemodule/featureflags`)"
-  - "React-graphics (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/renderer/graphics`)"
-  - "React-hermes (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/hermes`)"
-  - "React-idlecallbacksnativemodule (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/nativemodule/idlecallbacks`)"
-  - "React-ImageManager (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/renderer/imagemanager/platform/ios`)"
-  - "React-intersectionobservernativemodule (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/nativemodule/intersectionobserver`)"
-  - "React-jserrorhandler (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/jserrorhandler`)"
-  - "React-jsi (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/jsi`)"
-  - "React-jsiexecutor (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/jsiexecutor`)"
-  - "React-jsinspector (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/jsinspector-modern`)"
-  - "React-jsinspectorcdp (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/jsinspector-modern/cdp`)"
-  - "React-jsinspectornetwork (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/jsinspector-modern/network`)"
-  - "React-jsinspectortracing (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/jsinspector-modern/tracing`)"
-  - "React-jsitooling (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/jsitooling`)"
-  - "React-jsitracing (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/hermes/executor/`)"
-  - "React-logger (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/logger`)"
-  - "React-Mapbuffer (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon`)"
-  - "React-microtasksnativemodule (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/nativemodule/microtasks`)"
-  - "React-mutationobservernativemodule (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/nativemodule/mutationobserver`)"
+  - "ExpoLogBox (from `../../node_modules/.bun/@expo+log-box@56.0.13+287a87011099de27/node_modules/@expo/log-box`)"
+  - "ExpoModulesCore (from `../../node_modules/.bun/expo-modules-core@56.0.17+1d41c862de1c46a9/node_modules/expo-modules-core/ExpoModulesCore.podspec`)"
+  - "ExpoModulesJSI (from `../../node_modules/.bun/expo-modules-jsi@56.0.10+d6f903d171a23bdf/node_modules/expo-modules-jsi/apple`)"
+  - "ExpoModulesWorklets (from `../../node_modules/.bun/expo-modules-core@56.0.17+1d41c862de1c46a9/node_modules/expo-modules-core/ExpoModulesWorklets.podspec`)"
+  - "ExpoModulesWorkletsAdapter (from `../../node_modules/.bun/expo-modules-core@56.0.17+1d41c862de1c46a9/node_modules/expo-modules-core`)"
+  - "FBLazyVector (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/Libraries/FBLazyVector`)"
+  - "hermes-engine (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec`)"
+  - "NitroModules (from `../../node_modules/.bun/react-native-nitro-modules@0.35.10+d6f903d171a23bdf/node_modules/react-native-nitro-modules`)"
+  - "RCTDeprecation (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactApple/Libraries/RCTFoundation/RCTDeprecation`)"
+  - "RCTRequired (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/Libraries/Required`)"
+  - "RCTSwiftUI (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactApple/RCTSwiftUI`)"
+  - "RCTSwiftUIWrapper (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactApple/RCTSwiftUIWrapper`)"
+  - "RCTTypeSafety (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/Libraries/TypeSafety`)"
+  - "React (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/`)"
+  - "React-callinvoker (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/callinvoker`)"
+  - "React-Core (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/`)"
+  - "React-Core-prebuilt (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/React-Core-prebuilt.podspec`)"
+  - "React-Core/RCTWebSocket (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/`)"
+  - "React-CoreModules (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/React/CoreModules`)"
+  - "React-cxxreact (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/cxxreact`)"
+  - "React-debug (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/debug`)"
+  - "React-defaultsnativemodule (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/nativemodule/defaults`)"
+  - "React-domnativemodule (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/nativemodule/dom`)"
+  - "React-Fabric (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon`)"
+  - "React-FabricComponents (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon`)"
+  - "React-FabricImage (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon`)"
+  - "React-featureflags (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/featureflags`)"
+  - "React-featureflagsnativemodule (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/nativemodule/featureflags`)"
+  - "React-graphics (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/renderer/graphics`)"
+  - "React-hermes (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/hermes`)"
+  - "React-idlecallbacksnativemodule (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/nativemodule/idlecallbacks`)"
+  - "React-ImageManager (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/renderer/imagemanager/platform/ios`)"
+  - "React-intersectionobservernativemodule (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/nativemodule/intersectionobserver`)"
+  - "React-jserrorhandler (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/jserrorhandler`)"
+  - "React-jsi (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/jsi`)"
+  - "React-jsiexecutor (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/jsiexecutor`)"
+  - "React-jsinspector (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/jsinspector-modern`)"
+  - "React-jsinspectorcdp (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/jsinspector-modern/cdp`)"
+  - "React-jsinspectornetwork (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/jsinspector-modern/network`)"
+  - "React-jsinspectortracing (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/jsinspector-modern/tracing`)"
+  - "React-jsitooling (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/jsitooling`)"
+  - "React-jsitracing (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/hermes/executor/`)"
+  - "React-logger (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/logger`)"
+  - "React-Mapbuffer (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon`)"
+  - "React-microtasksnativemodule (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/nativemodule/microtasks`)"
+  - "React-mutationobservernativemodule (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/nativemodule/mutationobserver`)"
   - react-native-nitro-maps (from `../../package`)
-  - "React-NativeModulesApple (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios`)"
-  - "React-networking (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/networking`)"
-  - "React-oscompat (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/oscompat`)"
-  - "React-perflogger (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/reactperflogger`)"
-  - "React-performancecdpmetrics (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/performance/cdpmetrics`)"
-  - "React-performancetimeline (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/performance/timeline`)"
-  - "React-RCTActionSheet (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/Libraries/ActionSheetIOS`)"
-  - "React-RCTAnimation (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/Libraries/NativeAnimation`)"
-  - "React-RCTAppDelegate (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/Libraries/AppDelegate`)"
-  - "React-RCTBlob (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/Libraries/Blob`)"
-  - "React-RCTFabric (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/React`)"
-  - "React-RCTFBReactNativeSpec (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/React`)"
-  - "React-RCTImage (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/Libraries/Image`)"
-  - "React-RCTLinking (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/Libraries/LinkingIOS`)"
-  - "React-RCTNetwork (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/Libraries/Network`)"
-  - "React-RCTRuntime (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/React/Runtime`)"
-  - "React-RCTSettings (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/Libraries/Settings`)"
-  - "React-RCTText (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/Libraries/Text`)"
-  - "React-RCTVibration (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/Libraries/Vibration`)"
-  - "React-rendererconsistency (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/renderer/consistency`)"
-  - "React-renderercss (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/renderer/css`)"
-  - "React-rendererdebug (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/renderer/debug`)"
-  - "React-RuntimeApple (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/runtime/platform/ios`)"
-  - "React-RuntimeCore (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/runtime`)"
-  - "React-runtimeexecutor (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/runtimeexecutor`)"
-  - "React-RuntimeHermes (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/runtime`)"
-  - "React-runtimescheduler (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/renderer/runtimescheduler`)"
-  - "React-timing (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/timing`)"
-  - "React-utils (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/utils`)"
-  - "React-webperformancenativemodule (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/nativemodule/webperformance`)"
+  - "React-NativeModulesApple (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios`)"
+  - "React-networking (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/networking`)"
+  - "React-oscompat (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/oscompat`)"
+  - "React-perflogger (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/reactperflogger`)"
+  - "React-performancecdpmetrics (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/performance/cdpmetrics`)"
+  - "React-performancetimeline (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/performance/timeline`)"
+  - "React-RCTActionSheet (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/Libraries/ActionSheetIOS`)"
+  - "React-RCTAnimation (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/Libraries/NativeAnimation`)"
+  - "React-RCTAppDelegate (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/Libraries/AppDelegate`)"
+  - "React-RCTBlob (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/Libraries/Blob`)"
+  - "React-RCTFabric (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/React`)"
+  - "React-RCTFBReactNativeSpec (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/React`)"
+  - "React-RCTImage (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/Libraries/Image`)"
+  - "React-RCTLinking (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/Libraries/LinkingIOS`)"
+  - "React-RCTNetwork (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/Libraries/Network`)"
+  - "React-RCTRuntime (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/React/Runtime`)"
+  - "React-RCTSettings (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/Libraries/Settings`)"
+  - "React-RCTText (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/Libraries/Text`)"
+  - "React-RCTVibration (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/Libraries/Vibration`)"
+  - "React-rendererconsistency (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/renderer/consistency`)"
+  - "React-renderercss (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/renderer/css`)"
+  - "React-rendererdebug (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/renderer/debug`)"
+  - "React-RuntimeApple (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/runtime/platform/ios`)"
+  - "React-RuntimeCore (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/runtime`)"
+  - "React-runtimeexecutor (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/runtimeexecutor`)"
+  - "React-RuntimeHermes (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/runtime`)"
+  - "React-runtimescheduler (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/renderer/runtimescheduler`)"
+  - "React-timing (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/timing`)"
+  - "React-utils (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/utils`)"
+  - "React-webperformancenativemodule (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/nativemodule/webperformance`)"
   - ReactAppDependencyProvider (from `build/generated/ios/ReactAppDependencyProvider`)
   - ReactCodegen (from `build/generated/ios/ReactCodegen`)
-  - "ReactCommon/turbomodule/core (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon`)"
-  - "ReactNativeDependencies (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/third-party-podspecs/ReactNativeDependencies.podspec`)"
-  - "Yoga (from `../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/yoga`)"
+  - "ReactCommon/turbomodule/core (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon`)"
+  - "ReactNativeDependencies (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/third-party-podspecs/ReactNativeDependencies.podspec`)"
+  - "RNReanimated (from `../../node_modules/.bun/react-native-reanimated@4.3.1+1d41c862de1c46a9/node_modules/react-native-reanimated`)"
+  - "RNWorklets (from `../../node_modules/.bun/react-native-worklets@0.8.3+fb96e01b5a95c1ee/node_modules/react-native-worklets`)"
+  - "Yoga (from `../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/yoga`)"
 
 EXTERNAL SOURCES:
   EXConstants:
-    :path: "../../node_modules/.bun/expo-constants@56.0.18+cce5aae513a3a857/node_modules/expo-constants/ios"
+    :path: "../../node_modules/.bun/expo-constants@56.0.18+287a87011099de27/node_modules/expo-constants/ios"
   Expo:
-    :path: "../../node_modules/.bun/expo@56.0.12+7dcf3e6a9df9668a/node_modules/expo"
+    :path: "../../node_modules/.bun/expo@56.0.12+195b118c4b5f5a32/node_modules/expo"
   ExpoAsset:
-    :path: "../../node_modules/.bun/expo-asset@56.0.17+720206a190cc34d0/node_modules/expo-asset/ios"
+    :path: "../../node_modules/.bun/expo-asset@56.0.17+36688fa712b0be51/node_modules/expo-asset/ios"
   ExpoDomWebView:
-    :path: "../../node_modules/.bun/@expo+dom-webview@56.0.5+cce5aae513a3a857/node_modules/@expo/dom-webview/ios"
+    :path: "../../node_modules/.bun/@expo+dom-webview@56.0.5+287a87011099de27/node_modules/@expo/dom-webview/ios"
   ExpoFileSystem:
-    :podspec: "../../node_modules/.bun/expo-file-system@56.0.8+cce5aae513a3a857/node_modules/expo-file-system/ios/ExpoFileSystem.podspec"
+    :podspec: "../../node_modules/.bun/expo-file-system@56.0.8+287a87011099de27/node_modules/expo-file-system/ios/ExpoFileSystem.podspec"
   ExpoFont:
-    :podspec: "../../node_modules/.bun/expo-font@56.0.7+cce5aae513a3a857/node_modules/expo-font/ios/ExpoFont.podspec"
+    :podspec: "../../node_modules/.bun/expo-font@56.0.7+287a87011099de27/node_modules/expo-font/ios/ExpoFont.podspec"
   ExpoKeepAwake:
     :path: "../../node_modules/.bun/expo-keep-awake@56.0.3+dc3ec1c4670f0f17/node_modules/expo-keep-awake/ios"
   ExpoLogBox:
-    :path: "../../node_modules/.bun/@expo+log-box@56.0.13+cce5aae513a3a857/node_modules/@expo/log-box"
+    :path: "../../node_modules/.bun/@expo+log-box@56.0.13+287a87011099de27/node_modules/@expo/log-box"
   ExpoModulesCore:
-    :podspec: "../../node_modules/.bun/expo-modules-core@56.0.17+cb618bb9cb5c756e/node_modules/expo-modules-core/ExpoModulesCore.podspec"
+    :podspec: "../../node_modules/.bun/expo-modules-core@56.0.17+1d41c862de1c46a9/node_modules/expo-modules-core/ExpoModulesCore.podspec"
   ExpoModulesJSI:
-    :path: "../../node_modules/.bun/expo-modules-jsi@56.0.10+cb618bb9cb5c756e/node_modules/expo-modules-jsi/apple"
+    :path: "../../node_modules/.bun/expo-modules-jsi@56.0.10+d6f903d171a23bdf/node_modules/expo-modules-jsi/apple"
   ExpoModulesWorklets:
-    :podspec: "../../node_modules/.bun/expo-modules-core@56.0.17+cb618bb9cb5c756e/node_modules/expo-modules-core/ExpoModulesWorklets.podspec"
+    :podspec: "../../node_modules/.bun/expo-modules-core@56.0.17+1d41c862de1c46a9/node_modules/expo-modules-core/ExpoModulesWorklets.podspec"
+  ExpoModulesWorkletsAdapter:
+    :path: "../../node_modules/.bun/expo-modules-core@56.0.17+1d41c862de1c46a9/node_modules/expo-modules-core"
   FBLazyVector:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/Libraries/FBLazyVector"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/Libraries/FBLazyVector"
   hermes-engine:
-    :podspec: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec"
+    :podspec: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec"
     :tag: hermes-v250829098.0.10
   NitroModules:
-    :path: "../../node_modules/.bun/react-native-nitro-modules@0.35.10+cb618bb9cb5c756e/node_modules/react-native-nitro-modules"
+    :path: "../../node_modules/.bun/react-native-nitro-modules@0.35.10+d6f903d171a23bdf/node_modules/react-native-nitro-modules"
   RCTDeprecation:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactApple/Libraries/RCTFoundation/RCTDeprecation"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactApple/Libraries/RCTFoundation/RCTDeprecation"
   RCTRequired:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/Libraries/Required"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/Libraries/Required"
   RCTSwiftUI:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactApple/RCTSwiftUI"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactApple/RCTSwiftUI"
   RCTSwiftUIWrapper:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactApple/RCTSwiftUIWrapper"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactApple/RCTSwiftUIWrapper"
   RCTTypeSafety:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/Libraries/TypeSafety"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/Libraries/TypeSafety"
   React:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/"
   React-callinvoker:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/callinvoker"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/callinvoker"
   React-Core:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/"
   React-Core-prebuilt:
-    :podspec: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/React-Core-prebuilt.podspec"
+    :podspec: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/React-Core-prebuilt.podspec"
   React-CoreModules:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/React/CoreModules"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/React/CoreModules"
   React-cxxreact:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/cxxreact"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/cxxreact"
   React-debug:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/debug"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/debug"
   React-defaultsnativemodule:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/nativemodule/defaults"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/nativemodule/defaults"
   React-domnativemodule:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/nativemodule/dom"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/nativemodule/dom"
   React-Fabric:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon"
   React-FabricComponents:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon"
   React-FabricImage:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon"
   React-featureflags:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/featureflags"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/featureflags"
   React-featureflagsnativemodule:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/nativemodule/featureflags"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/nativemodule/featureflags"
   React-graphics:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/renderer/graphics"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/renderer/graphics"
   React-hermes:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/hermes"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/hermes"
   React-idlecallbacksnativemodule:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/nativemodule/idlecallbacks"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/nativemodule/idlecallbacks"
   React-ImageManager:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/renderer/imagemanager/platform/ios"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/renderer/imagemanager/platform/ios"
   React-intersectionobservernativemodule:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/nativemodule/intersectionobserver"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/nativemodule/intersectionobserver"
   React-jserrorhandler:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/jserrorhandler"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/jserrorhandler"
   React-jsi:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/jsi"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/jsi"
   React-jsiexecutor:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/jsiexecutor"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/jsiexecutor"
   React-jsinspector:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/jsinspector-modern"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/jsinspector-modern"
   React-jsinspectorcdp:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/jsinspector-modern/cdp"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/jsinspector-modern/cdp"
   React-jsinspectornetwork:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/jsinspector-modern/network"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/jsinspector-modern/network"
   React-jsinspectortracing:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/jsinspector-modern/tracing"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/jsinspector-modern/tracing"
   React-jsitooling:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/jsitooling"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/jsitooling"
   React-jsitracing:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/hermes/executor/"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/hermes/executor/"
   React-logger:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/logger"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/logger"
   React-Mapbuffer:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon"
   React-microtasksnativemodule:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/nativemodule/microtasks"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/nativemodule/microtasks"
   React-mutationobservernativemodule:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/nativemodule/mutationobserver"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/nativemodule/mutationobserver"
   react-native-nitro-maps:
     :path: "../../package"
   React-NativeModulesApple:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios"
   React-networking:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/networking"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/networking"
   React-oscompat:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/oscompat"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/oscompat"
   React-perflogger:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/reactperflogger"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/reactperflogger"
   React-performancecdpmetrics:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/performance/cdpmetrics"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/performance/cdpmetrics"
   React-performancetimeline:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/performance/timeline"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/performance/timeline"
   React-RCTActionSheet:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/Libraries/ActionSheetIOS"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/Libraries/ActionSheetIOS"
   React-RCTAnimation:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/Libraries/NativeAnimation"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/Libraries/NativeAnimation"
   React-RCTAppDelegate:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/Libraries/AppDelegate"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/Libraries/AppDelegate"
   React-RCTBlob:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/Libraries/Blob"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/Libraries/Blob"
   React-RCTFabric:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/React"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/React"
   React-RCTFBReactNativeSpec:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/React"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/React"
   React-RCTImage:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/Libraries/Image"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/Libraries/Image"
   React-RCTLinking:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/Libraries/LinkingIOS"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/Libraries/LinkingIOS"
   React-RCTNetwork:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/Libraries/Network"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/Libraries/Network"
   React-RCTRuntime:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/React/Runtime"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/React/Runtime"
   React-RCTSettings:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/Libraries/Settings"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/Libraries/Settings"
   React-RCTText:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/Libraries/Text"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/Libraries/Text"
   React-RCTVibration:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/Libraries/Vibration"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/Libraries/Vibration"
   React-rendererconsistency:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/renderer/consistency"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/renderer/consistency"
   React-renderercss:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/renderer/css"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/renderer/css"
   React-rendererdebug:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/renderer/debug"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/renderer/debug"
   React-RuntimeApple:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/runtime/platform/ios"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/runtime/platform/ios"
   React-RuntimeCore:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/runtime"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/runtime"
   React-runtimeexecutor:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/runtimeexecutor"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/runtimeexecutor"
   React-RuntimeHermes:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/runtime"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/runtime"
   React-runtimescheduler:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/renderer/runtimescheduler"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/renderer/runtimescheduler"
   React-timing:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/timing"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/timing"
   React-utils:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/utils"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/utils"
   React-webperformancenativemodule:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/react/nativemodule/webperformance"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/react/nativemodule/webperformance"
   ReactAppDependencyProvider:
     :path: build/generated/ios/ReactAppDependencyProvider
   ReactCodegen:
     :path: build/generated/ios/ReactCodegen
   ReactCommon:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon"
   ReactNativeDependencies:
-    :podspec: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/third-party-podspecs/ReactNativeDependencies.podspec"
+    :podspec: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/third-party-podspecs/ReactNativeDependencies.podspec"
+  RNReanimated:
+    :path: "../../node_modules/.bun/react-native-reanimated@4.3.1+1d41c862de1c46a9/node_modules/react-native-reanimated"
+  RNWorklets:
+    :path: "../../node_modules/.bun/react-native-worklets@0.8.3+fb96e01b5a95c1ee/node_modules/react-native-worklets"
   Yoga:
-    :path: "../../node_modules/.bun/react-native@0.85.3+cb618bb9cb5c756e/node_modules/react-native/ReactCommon/yoga"
+    :path: "../../node_modules/.bun/react-native@0.85.3+d6f903d171a23bdf/node_modules/react-native/ReactCommon/yoga"
 
 SPEC CHECKSUMS:
   EXConstants: e836b478e4f5c835f3c77921d8162e1918e2c06e
@@ -2182,9 +2341,10 @@ SPEC CHECKSUMS:
   ExpoFont: 274487aa78f8c65d6551e2558eca3ec6ce3432ce
   ExpoKeepAwake: 359c47a1d9ccc3a3c519bca6e39562cce230c5bb
   ExpoLogBox: 63977cf56b04547c713535d2d4e9bbf2f012e3c6
-  ExpoModulesCore: f6676a3a3bba3dabd6c25a5f49a2c85303633452
+  ExpoModulesCore: 24b4f3ab5f5c4d5d669023c931639ab7eb41acb8
   ExpoModulesJSI: abc606cf32f6eeb4e2ad44ec3fc4b24143abd8f6
   ExpoModulesWorklets: 25d712f4e0a4eb37397d46c0ff5b450eca897fd1
+  ExpoModulesWorkletsAdapter: c3388fcbf667302ec0444dd698e694066eb60898
   FBLazyVector: 24e62c765683b8d89006a88a2c8f5cf019f0074d
   hermes-engine: fe6c9a684d9871dfd86af7d57280b69e9f1e1151
   NitroModules: 994eaa7fc39d1fb4b76bb61054312c9796c4a649
@@ -2257,9 +2417,11 @@ SPEC CHECKSUMS:
   React-utils: ccc01da318979af773259c4f6cdb1876f6f86f1a
   React-webperformancenativemodule: f8b97c2cb6cfa94e92a503c09ad6d491c50a1390
   ReactAppDependencyProvider: 25c9c516839be2c5e3d3344f95dc7da5f7e63fc2
-  ReactCodegen: a66c762a235ae20dbf803cde042f838fb00e8fe6
+  ReactCodegen: 81fd07902e3ea9bc36e065e2499d0c4a45d360b2
   ReactCommon: 7dfc3250793bf36cf221096ff59e1179e13eef7f
   ReactNativeDependencies: 592885d331bed09b4a65296b84431d7219e5f25a
+  RNReanimated: b885e0396811f61642fcd9b258d5cc849dddc72d
+  RNWorklets: f42494ba22e4c4f41024c949a8f423b574ad5bfc
   Yoga: 77dfa8673de2874e1855002ae59c68b8be9b007b
 
 PODFILE CHECKSUM: 92665943e2902bb2f1113e5bb4cc85e873dfc9b1
diff --git a/package/android/src/main/java/com/margelo/nitro/nitromaps/ClusterIconFactory.kt b/package/android/src/main/java/com/margelo/nitro/nitromaps/ClusterIconFactory.kt
index face3cb..a32fcd1 100644
--- a/package/android/src/main/java/com/margelo/nitro/nitromaps/ClusterIconFactory.kt
+++ b/package/android/src/main/java/com/margelo/nitro/nitromaps/ClusterIconFactory.kt
@@ -8,6 +8,7 @@ import android.graphics.RadialGradient
 import android.graphics.Shader
 import com.google.android.gms.maps.model.BitmapDescriptor
 import com.google.android.gms.maps.model.BitmapDescriptorFactory
+import java.util.Locale
 
 /** Builds and caches circular cluster badge icons (gradient + soft shadow). */
 internal class ClusterIconFactory(private val density: Float) {
@@ -65,6 +66,6 @@ internal class ClusterIconFactory(private val density: Float) {
   }
 
   private fun formatCount(count: Int): String {
-    return if (count >= 1000) String.format("%.1fk", count / 1000.0) else count.toString()
+    return if (count >= 1000) String.format(Locale.US, "%.1fk", count / 1000.0) else count.toString()
   }
 }
diff --git a/package/android/src/main/java/com/margelo/nitro/nitromaps/MapOverlayController.kt b/package/android/src/main/java/com/margelo/nitro/nitromaps/MapOverlayController.kt
index 72c0060..e7c4417 100644
--- a/package/android/src/main/java/com/margelo/nitro/nitromaps/MapOverlayController.kt
+++ b/package/android/src/main/java/com/margelo/nitro/nitromaps/MapOverlayController.kt
@@ -123,6 +123,9 @@ class MapOverlayController(
     if (!usesViewportPipeline()) {
       return
     }
+    if (viewWidthPx <= 0 || viewHeightPx <= 0) {
+      return
+    }
 
     val bounds = map.projection.visibleRegion.latLngBounds
     val latitudeSpan = bounds.northeast.latitude - bounds.southwest.latitude
@@ -144,12 +147,15 @@ class MapOverlayController(
 
       val nextKeys = HashSet<String>(elements.size)
       val added = ArrayList<ClusterElement>()
+      val retained = ArrayList<ClusterElement>()
       for (element in elements) {
         val key = element.diffKey
         if (!nextKeys.add(key)) {
           continue
         }
-        if (!displayed.contains(key)) {
+        if (displayed.contains(key)) {
+          retained.add(element)
+        } else {
           added.add(element)
         }
       }
@@ -159,7 +165,7 @@ class MapOverlayController(
         if (generation != refreshGeneration) {
           return@post
         }
-        applyDiff(removed, added)
+        applyDiff(removed, added, retained)
       }
     }
   }
@@ -181,7 +187,11 @@ class MapOverlayController(
     }
   }
 
-  private fun applyDiff(removedKeys: Set<String>, added: List<ClusterElement>) {
+  private fun applyDiff(
+    removedKeys: Set<String>,
+    added: List<ClusterElement>,
+    retained: List<ClusterElement>,
+  ) {
     val map = googleMap ?: return
 
     for (key in removedKeys) {
@@ -215,6 +225,27 @@ class MapOverlayController(
       }
     }
 
+    for (element in retained) {
+      val key = element.diffKey
+      val marker = markers[key] ?: continue
+      when (element) {
+        is ClusterElement.Single -> {
+          marker.position = LatLng(
+            element.descriptor.coordinate.latitude,
+            element.descriptor.coordinate.longitude,
+          )
+          marker.title = element.descriptor.title
+          marker.snippet = element.descriptor.subtitle
+          marker.isDraggable = element.descriptor.draggable == true
+        }
+        is ClusterElement.Cluster -> {
+          marker.position = element.position
+          marker.setIcon(iconFactory.icon(element.count))
+          clusterByKey[key] = element
+        }
+      }
+    }
+
     animateFadeIn(addedMarkers)
   }
 
@@ -224,13 +255,20 @@ class MapOverlayController(
       return
     }
 
-    added.forEach { runCatching { it.alpha = 0f } }
+    added.forEach { marker ->
+      if (markers.containsValue(marker)) {
+        marker.alpha = 0f
+      }
+    }
     ValueAnimator.ofFloat(0f, 1f).apply {
       duration = 220
       addUpdateListener { animator ->
         val value = animator.animatedValue as Float
-        // Markers may be removed by a later refresh mid-animation.
-        added.forEach { runCatching { it.alpha = value } }
+        added.forEach { marker ->
+          if (markers.containsValue(marker)) {
+            marker.alpha = value
+          }
+        }
       }
       start()
     }
diff --git a/package/android/src/main/java/com/margelo/nitro/nitromaps/MarkerClusterEngine.kt b/package/android/src/main/java/com/margelo/nitro/nitromaps/MarkerClusterEngine.kt
index f59fda9..503ebdc 100644
--- a/package/android/src/main/java/com/margelo/nitro/nitromaps/MarkerClusterEngine.kt
+++ b/package/android/src/main/java/com/margelo/nitro/nitromaps/MarkerClusterEngine.kt
@@ -36,6 +36,37 @@ internal sealed interface ClusterElement {
 internal object MarkerClusterEngine {
   private const val CELL_DP = 64.0
 
+  private fun wrapsLongitude(sw: LatLng, ne: LatLng): Boolean {
+    return ne.longitude < sw.longitude
+  }
+
+  private fun longitudeSpan(sw: LatLng, ne: LatLng): Double {
+    val raw = ne.longitude - sw.longitude
+    return if (raw < 0) raw + 360.0 else raw
+  }
+
+  private fun normalizeLongitude(lon: Double, reference: Double): Double {
+    var normalized = lon
+    while (normalized - reference > 180.0) {
+      normalized -= 360.0
+    }
+    while (normalized - reference < -180.0) {
+      normalized += 360.0
+    }
+    return normalized
+  }
+
+  private fun wrapTo180(lon: Double): Double {
+    var wrapped = lon
+    while (wrapped > 180.0) {
+      wrapped -= 360.0
+    }
+    while (wrapped < -180.0) {
+      wrapped += 360.0
+    }
+    return wrapped
+  }
+
   /**
    * Snaps a cell size (degrees) to the nearest power of two so small zoom
    * changes keep the same absolute grid.
@@ -77,16 +108,21 @@ internal object MarkerClusterEngine {
     val rows = maxOf(1, (viewHeightPx / cellPx).toInt())
     val sw = bounds.southwest
     val ne = bounds.northeast
+    val wraps = wrapsLongitude(sw, ne)
     // Quantize cell size and anchor the grid to absolute (0,0) coordinates so
     // cells stay fixed to geography while panning — clusters don't churn or
     // "swim", only re-forming when the zoom level crosses an octave.
     val cellLat = quantize((ne.latitude - sw.latitude) / rows)
-    val cellLon = quantize((ne.longitude - sw.longitude) / cols)
+    val cellLon = quantize(longitudeSpan(sw, ne) / cols)
 
     val buckets = HashMap<String, Bucket>()
     for (descriptor in clusterableCandidates) {
       val lat = descriptor.coordinate.latitude
-      val lon = descriptor.coordinate.longitude
+      val lon = if (wraps) {
+        normalizeLongitude(descriptor.coordinate.longitude, sw.longitude)
+      } else {
+        descriptor.coordinate.longitude
+      }
       val row = floor(lat / cellLat).toInt()
       val col = floor(lon / cellLon).toInt()
       val key = "$row:$col"
@@ -108,6 +144,7 @@ internal object MarkerClusterEngine {
     val merged = mergeOverlapping(
       ArrayList(buckets.values),
       bounds,
+      wraps,
       viewWidthPx,
       viewHeightPx,
       density,
@@ -127,8 +164,8 @@ internal object MarkerClusterEngine {
             count = bucket.count,
             memberIds = bucket.memberIds,
             bounds = LatLngBounds(
-              LatLng(bucket.minLat, bucket.minLon),
-              LatLng(bucket.maxLat, bucket.maxLon),
+              LatLng(bucket.minLat, wrapTo180(bucket.minLon)),
+              LatLng(bucket.maxLat, wrapTo180(bucket.maxLon)),
             ),
           ),
         )
@@ -152,6 +189,7 @@ internal object MarkerClusterEngine {
   private fun mergeOverlapping(
     buckets: ArrayList<Bucket>,
     bounds: LatLngBounds,
+    wraps: Boolean,
     viewWidthPx: Int,
     viewHeightPx: Int,
     density: Float,
@@ -166,16 +204,24 @@ internal object MarkerClusterEngine {
     val sw = bounds.southwest
     val ne = bounds.northeast
     val centerLat = (sw.latitude + ne.latitude) / 2
-    val centerLon = (sw.longitude + ne.longitude) / 2
     val spanLat = maxOf(ne.latitude - sw.latitude, 1e-9)
-    val spanLon = maxOf(ne.longitude - sw.longitude, 1e-9)
+    val spanLon = maxOf(longitudeSpan(sw, ne), 1e-9)
+    val centerLon = if (wraps) {
+      normalizeLongitude(sw.longitude + spanLon / 2, sw.longitude)
+    } else {
+      (sw.longitude + ne.longitude) / 2
+    }
 
     val px = DoubleArray(n)
     val py = DoubleArray(n)
     for (i in 0 until n) {
       val bucket = buckets[i]
       val lat = bucket.sumLat / bucket.count
-      val lon = bucket.sumLon / bucket.count
+      val lon = if (wraps) {
+        normalizeLongitude(bucket.sumLon / bucket.count, sw.longitude)
+      } else {
+        bucket.sumLon / bucket.count
+      }
       px[i] = (lon - centerLon) / spanLon * width
       py[i] = (centerLat - lat) / spanLat * height
     }
diff --git a/package/android/src/main/java/com/margelo/nitro/nitromaps/MarkerSpatialIndex.kt b/package/android/src/main/java/com/margelo/nitro/nitromaps/MarkerSpatialIndex.kt
index 7659274..2c58d4a 100644
--- a/package/android/src/main/java/com/margelo/nitro/nitromaps/MarkerSpatialIndex.kt
+++ b/package/android/src/main/java/com/margelo/nitro/nitromaps/MarkerSpatialIndex.kt
@@ -62,29 +62,44 @@ internal class MarkerSpatialIndex(
     }
 
     val latSpan = bounds.northeast.latitude - bounds.southwest.latitude
-    val lonSpan = bounds.northeast.longitude - bounds.southwest.longitude
+    val lonSpan = if (bounds.northeast.longitude < bounds.southwest.longitude) {
+      bounds.northeast.longitude - bounds.southwest.longitude + 360.0
+    } else {
+      bounds.northeast.longitude - bounds.southwest.longitude
+    }
     val latPad = latSpan * padding
     val lonPad = lonSpan * padding
 
     val rowStart = clampedRow(bounds.southwest.latitude - latPad)
     val rowEnd = clampedRow(bounds.northeast.latitude + latPad)
-    val colStart = clampedColumn(bounds.southwest.longitude - lonPad)
-    val colEnd = clampedColumn(bounds.northeast.longitude + lonPad)
+    val minLonQ = bounds.southwest.longitude - lonPad
+    val maxLonQ = bounds.northeast.longitude + lonPad
 
     val result = ArrayList<MarkerDescriptor>()
+    val columns = longitudeColumns(minLonQ, maxLonQ)
     var row = rowStart
     while (row <= rowEnd) {
       val base = row * side
-      var column = colStart
-      while (column <= colEnd) {
+      for (column in columns) {
         result.addAll(cells[base + column])
-        column += 1
       }
       row += 1
     }
     return result
   }
 
+  private fun longitudeColumns(minLon: Double, maxLon: Double): List<Int> {
+    if (minLon <= maxLon) {
+      val colStart = clampedColumn(minLon)
+      val colEnd = clampedColumn(maxLon)
+      return (colStart..colEnd).toList()
+    }
+
+    val firstRange = clampedColumn(minLon) until side
+    val secondRange = 0..clampedColumn(maxLon)
+    return firstRange.toList() + secondRange.toList()
+  }
+
   private fun cellIndex(lat: Double, lon: Double): Int {
     return clampedRow(lat) * side + clampedColumn(lon)
   }
diff --git a/package/ios/HybridMapView.swift b/package/ios/HybridMapView.swift
index 88e22aa..2fc9a31 100644
--- a/package/ios/HybridMapView.swift
+++ b/package/ios/HybridMapView.swift
@@ -251,12 +251,11 @@ final class HybridMapView: HybridMapViewSpec {
     guard liveClusterTimer == nil else {
       return
     }
-    liveClusterTimer = Timer.scheduledTimer(
-      withTimeInterval: 0.1,
-      repeats: true
-    ) { [weak self] _ in
+    let timer = Timer(timeInterval: 0.1, repeats: true) { [weak self] _ in
       self?.overlayController.refreshNow()
     }
+    RunLoop.main.add(timer, forMode: .common)
+    liveClusterTimer = timer
   }
 
   func stopLiveClustering() {
@@ -322,6 +321,8 @@ final class HybridMapView: HybridMapViewSpec {
   }
 
   func prepareForRecycle() {
+    liveClusterTimer?.invalidate()
+    liveClusterTimer = nil
     isProgrammaticUpdate = false
     hasFiredMapReady = false
     onRegionChange = nil
diff --git a/package/ios/HybridMapViewDelegate.swift b/package/ios/HybridMapViewDelegate.swift
index 1b6c832..bc698f8 100644
--- a/package/ios/HybridMapViewDelegate.swift
+++ b/package/ios/HybridMapViewDelegate.swift
@@ -108,12 +108,9 @@ final class HybridMapViewDelegate: NSObject, MKMapViewDelegate, UIGestureRecogni
     }
 
     let pinView = mapView.dequeueReusableAnnotationView(
-      withIdentifier: NitroPinAnnotationView.reuseIdentifier
-    ) as? NitroPinAnnotationView
-      ?? NitroPinAnnotationView(
-        annotation: marker,
-        reuseIdentifier: NitroPinAnnotationView.reuseIdentifier
-      )
+      withIdentifier: NitroPinAnnotationView.reuseIdentifier,
+      for: marker
+    ) as! NitroPinAnnotationView
 
     pinView.configure(for: marker)
     return pinView
@@ -121,7 +118,7 @@ final class HybridMapViewDelegate: NSObject, MKMapViewDelegate, UIGestureRecogni
 
   func mapView(_ mapView: MKMapView, didAdd views: [MKAnnotationView]) {
     for view in views {
-      // Markers use MapKit's native drop animation; only fade in cluster badges.
+      // MKMarkerAnnotationView handles its own drop animation; only fade in cluster badges.
       guard view.annotation is MapClusterAnnotation else {
         continue
       }
@@ -153,7 +150,9 @@ final class HybridMapViewDelegate: NSObject, MKMapViewDelegate, UIGestureRecogni
     }
 
     parent?.onMarkerPress?(marker.id)
-    mapView.deselectAnnotation(view.annotation, animated: true)
+    if marker.title == nil && marker.subtitle == nil {
+      mapView.deselectAnnotation(view.annotation, animated: true)
+    }
   }
 
   func mapView(
diff --git a/package/ios/MapClusterAnnotation.swift b/package/ios/MapClusterAnnotation.swift
index 82948de..968386f 100644
--- a/package/ios/MapClusterAnnotation.swift
+++ b/package/ios/MapClusterAnnotation.swift
@@ -5,11 +5,11 @@ import MapKit
 /// Clusters are produced by `MarkerClusterEngine` on a background queue, so the
 /// map view only ever receives a small, bounded number of annotations.
 final class MapClusterAnnotation: NSObject, MKAnnotation {
-  let id: String
-  let count: Int
-  let memberIds: [String]
+  var id: String
+  var count: Int
+  var memberIds: [String]
   /// Region that frames this cluster's members, used for tap-to-zoom.
-  let region: MKCoordinateRegion
+  var region: MKCoordinateRegion
 
   @objc dynamic var coordinate: CLLocationCoordinate2D
 
@@ -26,4 +26,18 @@ final class MapClusterAnnotation: NSObject, MKAnnotation {
     self.memberIds = memberIds
     self.region = region
   }
+
+  func update(
+    id: String,
+    coordinate: CLLocationCoordinate2D,
+    count: Int,
+    memberIds: [String],
+    region: MKCoordinateRegion
+  ) {
+    self.id = id
+    self.coordinate = coordinate
+    self.count = count
+    self.memberIds = memberIds
+    self.region = region
+  }
 }
diff --git a/package/ios/MapOverlayController.swift b/package/ios/MapOverlayController.swift
index b027435..24de613 100644
--- a/package/ios/MapOverlayController.swift
+++ b/package/ios/MapOverlayController.swift
@@ -92,6 +92,9 @@ final class MapOverlayController {
     if usesViewportPipeline {
       rebuildIndexAndRefresh()
     } else {
+      viewportRefreshWorkItem?.cancel()
+      viewportRefreshWorkItem = nil
+      refreshGeneration += 1
       reconcileMarkersSync(allMarkerDescriptors)
     }
   }
@@ -180,6 +183,7 @@ final class MapOverlayController {
   private struct MarkerDiff {
     let removedKeys: Set<String>
     let added: [(key: String, annotation: MKAnnotation)]
+    let retained: [(key: String, element: MarkerClusterEngine.Element)]
   }
 
   private static func computeDiff(
@@ -189,20 +193,24 @@ final class MapOverlayController {
     var nextKeys = Set<String>()
     nextKeys.reserveCapacity(target.count)
     var added: [(key: String, annotation: MKAnnotation)] = []
+    var retained: [(key: String, element: MarkerClusterEngine.Element)] = []
 
     for element in target {
       let key = element.diffKey
       guard nextKeys.insert(key).inserted else {
         continue
       }
-      if !displayed.contains(key) {
+      if displayed.contains(key) {
+        retained.append((key, element))
+      } else {
         added.append((key, element.makeAnnotation()))
       }
     }
 
     return MarkerDiff(
       removedKeys: displayed.subtracting(nextKeys),
-      added: added
+      added: added,
+      retained: retained
     )
   }
 
@@ -225,6 +233,32 @@ final class MapOverlayController {
       }
       mapView.addAnnotations(annotations)
     }
+
+    for entry in diff.retained {
+      guard let existing = displayedAnnotations[entry.key] else {
+        continue
+      }
+
+      switch entry.element {
+      case let .single(descriptor):
+        if let marker = existing as? MapMarkerAnnotation {
+          marker.update(from: descriptor)
+        }
+      case let .cluster(key, coordinate, count, memberIds, region):
+        if let cluster = existing as? MapClusterAnnotation {
+          cluster.update(
+            id: key,
+            coordinate: coordinate,
+            count: count,
+            memberIds: memberIds,
+            region: region
+          )
+          if let view = mapView.view(for: cluster) as? NitroClusterAnnotationView {
+            view.configure(count: count)
+          }
+        }
+      }
+    }
   }
 
   /// Synchronous reconcile for small, non-clustered datasets, including per-id
diff --git a/package/ios/MarkerClusterEngine.swift b/package/ios/MarkerClusterEngine.swift
index 61f4b91..8a03a0e 100644
--- a/package/ios/MarkerClusterEngine.swift
+++ b/package/ios/MarkerClusterEngine.swift
@@ -47,6 +47,32 @@ enum MarkerClusterEngine {
   /// Target cluster cell size in points.
   private static let cellPoints: Double = 64
 
+  private static func wrapsLongitude(in region: MKCoordinateRegion) -> Bool {
+    region.span.longitudeDelta > 180
+  }
+
+  private static func normalizeLongitude(_ lon: Double, reference: Double) -> Double {
+    var normalized = lon
+    while normalized - reference > 180 {
+      normalized -= 360
+    }
+    while normalized - reference < -180 {
+      normalized += 360
+    }
+    return normalized
+  }
+
+  private static func wrapTo180(_ lon: Double) -> Double {
+    var wrapped = lon
+    while wrapped > 180 {
+      wrapped -= 360
+    }
+    while wrapped < -180 {
+      wrapped += 360
+    }
+    return wrapped
+  }
+
   /// Snaps a cell size (degrees) to the nearest power of two so small zoom
   /// changes keep the same absolute grid.
   private static func quantize(_ value: Double) -> Double {
@@ -116,6 +142,8 @@ enum MarkerClusterEngine {
 
     let cols = max(1, Int(Double(viewSize.width) / cellPoints))
     let rows = max(1, Int(Double(viewSize.height) / cellPoints))
+    let wraps = wrapsLongitude(in: region)
+    let referenceLon = region.center.longitude - region.span.longitudeDelta / 2
     // Quantize cell size and anchor the grid to absolute (0,0) coordinates so
     // cells stay fixed to geography while panning — clusters don't churn or
     // "swim", only re-forming when the zoom level crosses an octave.
@@ -125,7 +153,9 @@ enum MarkerClusterEngine {
     var buckets: [String: Bucket] = [:]
     for descriptor in clusterableCandidates {
       let lat = descriptor.coordinate.latitude
-      let lon = descriptor.coordinate.longitude
+      let lon = wraps
+        ? normalizeLongitude(descriptor.coordinate.longitude, reference: referenceLon)
+        : descriptor.coordinate.longitude
       let row = Int((lat / cellLat).rounded(.down))
       let col = Int((lon / cellLon).rounded(.down))
       let key = "\(row):\(col)"
@@ -146,7 +176,12 @@ enum MarkerClusterEngine {
       buckets[key] = bucket
     }
 
-    let merged = mergeOverlapping(Array(buckets.values), region: region, viewSize: viewSize)
+    let merged = mergeOverlapping(
+      Array(buckets.values),
+      region: region,
+      wraps: wraps,
+      viewSize: viewSize
+    )
 
     var elements = singles
     elements.reserveCapacity(merged.count + singles.count)
@@ -165,8 +200,8 @@ enum MarkerClusterEngine {
           region: expandedRegion(
             minLat: bucket.minLat,
             maxLat: bucket.maxLat,
-            minLon: bucket.minLon,
-            maxLon: bucket.maxLon
+            minLon: wrapTo180(bucket.minLon),
+            maxLon: wrapTo180(bucket.maxLon)
           )
         ))
       }
@@ -181,6 +216,7 @@ enum MarkerClusterEngine {
   private static func mergeOverlapping(
     _ buckets: [Bucket],
     region: MKCoordinateRegion,
+    wraps: Bool,
     viewSize: CGSize
   ) -> [Bucket] {
     let n = buckets.count
@@ -191,16 +227,21 @@ enum MarkerClusterEngine {
     let width = Double(viewSize.width)
     let height = Double(viewSize.height)
     let centerLat = region.center.latitude
-    let centerLon = region.center.longitude
+    let referenceLon = region.center.longitude - region.span.longitudeDelta / 2
     let spanLat = max(region.span.latitudeDelta, 1e-9)
     let spanLon = max(region.span.longitudeDelta, 1e-9)
+    let centerLon = wraps
+      ? normalizeLongitude(referenceLon + spanLon / 2, reference: referenceLon)
+      : region.center.longitude
 
     var px = [Double](repeating: 0, count: n)
     var py = [Double](repeating: 0, count: n)
     for i in 0..<n {
       let bucket = buckets[i]
       let lat = bucket.sumLat / Double(bucket.count)
-      let lon = bucket.sumLon / Double(bucket.count)
+      let lon = wraps
+        ? normalizeLongitude(bucket.sumLon / Double(bucket.count), reference: referenceLon)
+        : bucket.sumLon / Double(bucket.count)
       px[i] = (lon - centerLon) / spanLon * width
       py[i] = (centerLat - lat) / spanLat * height
     }
diff --git a/package/ios/MarkerSpatialIndex.swift b/package/ios/MarkerSpatialIndex.swift
index 7a2a3a6..6d0597b 100644
--- a/package/ios/MarkerSpatialIndex.swift
+++ b/package/ios/MarkerSpatialIndex.swift
@@ -70,23 +70,31 @@ final class MarkerSpatialIndex {
 
     let rowStart = clampedRow(minLatQ)
     let rowEnd = clampedRow(maxLatQ)
-    let colStart = clampedColumn(minLonQ)
-    let colEnd = clampedColumn(maxLonQ)
 
     var result: [MarkerDescriptor] = []
     var row = rowStart
     while row <= rowEnd {
       let base = row * cellsPerSide
-      var column = colStart
-      while column <= colEnd {
+      for column in longitudeColumnRange(minLon: minLonQ, maxLon: maxLonQ) {
         result.append(contentsOf: cells[base + column])
-        column += 1
       }
       row += 1
     }
     return result
   }
 
+  private func longitudeColumnRange(minLon: Double, maxLon: Double) -> [Int] {
+    if minLon <= maxLon {
+      let colStart = clampedColumn(minLon)
+      let colEnd = clampedColumn(maxLon)
+      return Array(colStart...colEnd)
+    }
+
+    let firstRange = clampedColumn(minLon)...cellsPerSide - 1
+    let secondRange = 0...clampedColumn(maxLon)
+    return Array(firstRange) + Array(secondRange)
+  }
+
   private func cellIndex(lat: Double, lon: Double) -> Int {
     clampedRow(lat) * cellsPerSide + clampedColumn(lon)
   }
diff --git a/package/ios/MarkerViewportFilter.swift b/package/ios/MarkerViewportFilter.swift
index 33d54bb..ba66eac 100644
--- a/package/ios/MarkerViewportFilter.swift
+++ b/package/ios/MarkerViewportFilter.swift
@@ -94,9 +94,15 @@ private extension MKCoordinateRegion {
     let minLon = center.longitude - span.longitudeDelta / 2 - lonPadding
     let maxLon = center.longitude + span.longitudeDelta / 2 + lonPadding
 
+    let lonInRegion: Bool
+    if minLon <= maxLon {
+      lonInRegion = coordinate.longitude >= minLon && coordinate.longitude <= maxLon
+    } else {
+      lonInRegion = coordinate.longitude >= minLon || coordinate.longitude <= maxLon
+    }
+
     return coordinate.latitude >= minLat
       && coordinate.latitude <= maxLat
-      && coordinate.longitude >= minLon
-      && coordinate.longitude <= maxLon
+      && lonInRegion
   }
 }
diff --git a/package/ios/NitroPinAnnotationView.swift b/package/ios/NitroPinAnnotationView.swift
index 628ef50..db5283b 100644
--- a/package/ios/NitroPinAnnotationView.swift
+++ b/package/ios/NitroPinAnnotationView.swift
@@ -1,102 +1,16 @@
 import MapKit
 import UIKit
 
-/// Lightweight pin view for bulk markers — avoids MKMarkerAnnotationView overhead.
-final class NitroPinAnnotationView: MKAnnotationView {
+/// Native MapKit marker pin — drop animation, selection bounce, and system styling.
+final class NitroPinAnnotationView: MKMarkerAnnotationView {
   static let reuseIdentifier = "NitroPin"
 
-  private static let pinSize = CGSize(width: 28, height: 38)
-  private static let pinInset: CGFloat = 3
-
-  /// Teardrop pin with a blue gradient (matching cluster badges), white border,
-  /// inner dot and a soft shadow. Rendered once and shared across all markers.
-  private static let pinImage: UIImage = {
-    let size = pinSize
-    let inset = pinInset
-    let renderer = UIGraphicsImageRenderer(size: size)
-    return renderer.image { context in
-      let cg = context.cgContext
-      let radius = (size.width - inset * 2) / 2
-      let center = CGPoint(x: size.width / 2, y: inset + radius)
-      let tip = CGPoint(x: size.width / 2, y: size.height - inset)
-
-      let topColor = UIColor(red: 0.30, green: 0.62, blue: 1.0, alpha: 1)
-      let bottomColor = UIColor(red: 0.04, green: 0.52, blue: 1.0, alpha: 1)
-
-      let distance = tip.y - center.y
-      let alpha = acos(min(1, radius / distance))
-      let rightTangent = CGPoint(
-        x: center.x + radius * sin(alpha),
-        y: center.y + radius * cos(alpha)
-      )
-      let leftTangent = CGPoint(
-        x: center.x - radius * sin(alpha),
-        y: center.y + radius * cos(alpha)
-      )
-
-      let path = UIBezierPath()
-      path.move(to: tip)
-      path.addLine(to: rightTangent)
-      path.addArc(
-        withCenter: center,
-        radius: radius,
-        startAngle: atan2(rightTangent.y - center.y, rightTangent.x - center.x),
-        endAngle: atan2(leftTangent.y - center.y, leftTangent.x - center.x),
-        clockwise: false
-      )
-      path.close()
-
-      cg.saveGState()
-      cg.setShadow(
-        offset: CGSize(width: 0, height: 1.5),
-        blur: 3,
-        color: UIColor.black.withAlphaComponent(0.3).cgColor
-      )
-      bottomColor.setFill()
-      path.fill()
-      cg.restoreGState()
-
-      cg.saveGState()
-      path.addClip()
-      let space = CGColorSpaceCreateDeviceRGB()
-      if let gradient = CGGradient(
-        colorsSpace: space,
-        colors: [topColor.cgColor, bottomColor.cgColor] as CFArray,
-        locations: [0, 1]
-      ) {
-        cg.drawLinearGradient(
-          gradient,
-          start: CGPoint(x: 0, y: inset),
-          end: CGPoint(x: 0, y: size.height - inset),
-          options: []
-        )
-      }
-      cg.restoreGState()
-
-      UIColor.white.setStroke()
-      path.lineWidth = 2
-      path.stroke()
-
-      let dotRadius: CGFloat = 3.6
-      let dot = UIBezierPath(
-        ovalIn: CGRect(
-          x: center.x - dotRadius,
-          y: center.y - dotRadius,
-          width: dotRadius * 2,
-          height: dotRadius * 2
-        )
-      )
-      UIColor.white.setFill()
-      dot.fill()
-    }
-  }()
-
   override init(annotation: MKAnnotation?, reuseIdentifier: String?) {
     super.init(annotation: annotation, reuseIdentifier: reuseIdentifier)
-    image = Self.pinImage
-    centerOffset = CGPoint(x: 0, y: -(Self.pinSize.height / 2 - Self.pinInset))
-    collisionMode = .circle
+    animatesWhenAdded = true
     canShowCallout = false
+    collisionMode = .circle
+    displayPriority = .required
   }
 
   @available(*, unavailable)
diff --git a/package/src/components/MapView.tsx b/package/src/components/MapView.tsx
index 59f2740..9454e84 100644
--- a/package/src/components/MapView.tsx
+++ b/package/src/components/MapView.tsx
@@ -3,6 +3,7 @@ import { callback } from 'react-native-nitro-modules';
 import { useCollectedOverlays } from '../hooks/useCollectedOverlays';
 import { NativeMapView } from '../native/MapViewNative';
 import type { MapView as NativeMapViewHybrid } from '../native/specs/MapView.nitro';
+import { OverlayType, overlayCallbackKey } from '../overlays/overlayType';
 import type { Coordinate } from '../types/coordinate';
 import type { MapViewProps } from '../types/map';
 import type { MapViewRef } from '../types/ref';
@@ -58,21 +59,13 @@ export const MapView = forwardRef<MapViewRef, MapViewProps>(function MapView(
   } = useCollectedOverlays(children);
 
   const markers =
-    markersProp != null && markersProp.length > 0
-      ? markersProp
-      : collectedMarkers;
+    markersProp != null ? markersProp : collectedMarkers;
   const polylines =
-    polylinesProp != null && polylinesProp.length > 0
-      ? polylinesProp
-      : collectedPolylines;
+    polylinesProp != null ? polylinesProp : collectedPolylines;
   const polygons =
-    polygonsProp != null && polygonsProp.length > 0
-      ? polygonsProp
-      : collectedPolygons;
+    polygonsProp != null ? polygonsProp : collectedPolygons;
   const circles =
-    circlesProp != null && circlesProp.length > 0
-      ? circlesProp
-      : collectedCircles;
+    circlesProp != null ? circlesProp : collectedCircles;
 
   const hasMarkerPress =
     onMarkerPressProp != null || hasCollectedMarkerPress;
@@ -87,7 +80,7 @@ export const MapView = forwardRef<MapViewRef, MapViewProps>(function MapView(
 
   const handleMarkerPress = useCallback(
     (id: string) => {
-      callbackRegistry.current.get(id)?.onPress?.();
+      callbackRegistry.current.get(overlayCallbackKey(OverlayType.Marker, id))?.onPress?.();
       onMarkerPressProp?.(id);
     },
     [callbackRegistry, onMarkerPressProp],
@@ -95,7 +88,7 @@ export const MapView = forwardRef<MapViewRef, MapViewProps>(function MapView(
 
   const handleMarkerDragEnd = useCallback(
     (id: string, coordinate: Coordinate) => {
-      callbackRegistry.current.get(id)?.onDragEnd?.(coordinate);
+      callbackRegistry.current.get(overlayCallbackKey(OverlayType.Marker, id))?.onDragEnd?.(coordinate);
       onMarkerDragEndProp?.(id, coordinate);
     },
     [callbackRegistry, onMarkerDragEndProp],
@@ -103,7 +96,7 @@ export const MapView = forwardRef<MapViewRef, MapViewProps>(function MapView(
 
   const handlePolylinePress = useCallback(
     (id: string) => {
-      callbackRegistry.current.get(id)?.onPress?.();
+      callbackRegistry.current.get(overlayCallbackKey(OverlayType.Polyline, id))?.onPress?.();
       onPolylinePressProp?.(id);
     },
     [callbackRegistry, onPolylinePressProp],
@@ -111,7 +104,7 @@ export const MapView = forwardRef<MapViewRef, MapViewProps>(function MapView(
 
   const handlePolygonPress = useCallback(
     (id: string) => {
-      callbackRegistry.current.get(id)?.onPress?.();
+      callbackRegistry.current.get(overlayCallbackKey(OverlayType.Polygon, id))?.onPress?.();
       onPolygonPressProp?.(id);
     },
     [callbackRegistry, onPolygonPressProp],
@@ -119,7 +112,7 @@ export const MapView = forwardRef<MapViewRef, MapViewProps>(function MapView(
 
   const handleCirclePress = useCallback(
     (id: string) => {
-      callbackRegistry.current.get(id)?.onPress?.();
+      callbackRegistry.current.get(overlayCallbackKey(OverlayType.Circle, id))?.onPress?.();
       onCirclePressProp?.(id);
     },
     [callbackRegistry, onCirclePressProp],
@@ -173,10 +166,10 @@ export const MapView = forwardRef<MapViewRef, MapViewProps>(function MapView(
       customMapStyle={customMapStyle}
       clusteringEnabled={clusteringEnabled}
       mapPadding={mapPadding}
-      markers={markers.length > 0 ? markers : undefined}
-      polylines={polylines.length > 0 ? polylines : undefined}
-      polygons={polygons.length > 0 ? polygons : undefined}
-      circles={circles.length > 0 ? circles : undefined}
+      markers={markers}
+      polylines={polylines}
+      polygons={polygons}
+      circles={circles}
       onRegionChange={
         onRegionChange == null ? undefined : callback(onRegionChange)
       }
diff --git a/package/src/hooks/useCollectedOverlays.ts b/package/src/hooks/useCollectedOverlays.ts
index 7e9c09e..32c8788 100644
--- a/package/src/hooks/useCollectedOverlays.ts
+++ b/package/src/hooks/useCollectedOverlays.ts
@@ -17,7 +17,7 @@ import { Marker } from '../components/Marker';
 import { Polygon } from '../components/Polygon';
 import { Polyline } from '../components/Polyline';
 import type { OverlayComponentType, OverlayTypeName } from '../overlays/overlayType';
-import { OverlayType } from '../overlays/overlayType';
+import { OverlayType, overlayCallbackKey } from '../overlays/overlayType';
 
 interface OverlayCallbacks {
   onPress?: () => void;
@@ -84,7 +84,6 @@ interface OverlayCollectorState {
 interface OverlayCollector {
   overlayType: OverlayTypeName;
   component: unknown;
-  idPrefix: string;
   collect: (child: ReactElement, state: OverlayCollectorState) => void;
 }
 
@@ -99,7 +98,6 @@ const overlayCollectors: OverlayCollector[] = [
   {
     overlayType: OverlayType.Marker,
     component: Marker,
-    idPrefix: 'marker',
     collect: (child, state) => {
       const props = child.props as MarkerProps;
       const id = resolveOverlayId(props.id, 'marker', state.markerIndex);
@@ -113,7 +111,7 @@ const overlayCollectors: OverlayCollector[] = [
         draggable: props.draggable,
         clusterable: props.clusterable,
       });
-      state.registry.set(id, {
+      state.registry.set(overlayCallbackKey(OverlayType.Marker, id), {
         onPress: props.onPress,
         onDragEnd: props.onDragEnd,
       });
@@ -128,7 +126,6 @@ const overlayCollectors: OverlayCollector[] = [
   {
     overlayType: OverlayType.Polyline,
     component: Polyline,
-    idPrefix: 'polyline',
     collect: (child, state) => {
       const props = child.props as PolylineProps;
       const id = resolveOverlayId(props.id, 'polyline', state.polylineIndex);
@@ -141,7 +138,7 @@ const overlayCollectors: OverlayCollector[] = [
         strokeWidth: props.strokeWidth,
         tappable: tappableFromPress(props.onPress, props.tappable),
       });
-      state.registry.set(id, { onPress: props.onPress });
+      state.registry.set(overlayCallbackKey(OverlayType.Polyline, id), { onPress: props.onPress });
       if (props.onPress != null) {
         state.hasPolylinePress = true;
       }
@@ -150,7 +147,6 @@ const overlayCollectors: OverlayCollector[] = [
   {
     overlayType: OverlayType.Polygon,
     component: Polygon,
-    idPrefix: 'polygon',
     collect: (child, state) => {
       const props = child.props as PolygonProps;
       const id = resolveOverlayId(props.id, 'polygon', state.polygonIndex);
@@ -164,7 +160,7 @@ const overlayCollectors: OverlayCollector[] = [
         strokeWidth: props.strokeWidth,
         tappable: tappableFromPress(props.onPress, props.tappable),
       });
-      state.registry.set(id, { onPress: props.onPress });
+      state.registry.set(overlayCallbackKey(OverlayType.Polygon, id), { onPress: props.onPress });
       if (props.onPress != null) {
         state.hasPolygonPress = true;
       }
@@ -173,7 +169,6 @@ const overlayCollectors: OverlayCollector[] = [
   {
     overlayType: OverlayType.Circle,
     component: Circle,
-    idPrefix: 'circle',
     collect: (child, state) => {
       const props = child.props as CircleProps;
       const id = resolveOverlayId(props.id, 'circle', state.circleIndex);
@@ -188,7 +183,7 @@ const overlayCollectors: OverlayCollector[] = [
         strokeWidth: props.strokeWidth,
         tappable: tappableFromPress(props.onPress, props.tappable),
       });
-      state.registry.set(id, { onPress: props.onPress });
+      state.registry.set(overlayCallbackKey(OverlayType.Circle, id), { onPress: props.onPress });
       if (props.onPress != null) {
         state.hasCirclePress = true;
       }
diff --git a/package/src/overlays/overlayType.ts b/package/src/overlays/overlayType.ts
index 96ff0ff..8909f77 100644
--- a/package/src/overlays/overlayType.ts
+++ b/package/src/overlays/overlayType.ts
@@ -16,3 +16,10 @@ export type OverlayTypeName = (typeof OverlayType)[keyof typeof OverlayType];
 export interface OverlayComponentType {
   overlayType?: OverlayTypeName;
 }
+
+export function overlayCallbackKey(
+  type: OverlayTypeName,
+  id: string,
+): string {
+  return `${type}:${id}`;
+}
diff --git a/package/src/types/map.ts b/package/src/types/map.ts
index 4f50f2f..462b7f5 100644
--- a/package/src/types/map.ts
+++ b/package/src/types/map.ts
@@ -73,19 +73,19 @@ export interface MapViewProps {
   /** Bulk circle descriptors. */
   circles?: CircleDescriptor[];
 
-  /** Called when any marker is pressed (bulk or child overlays). */
+  /** Called when any marker is pressed. */
   onMarkerPress?: (id: string) => void;
 
-  /** Called when any marker drag ends (bulk or child overlays). */
+  /** Called when any marker drag ends. */
   onMarkerDragEnd?: (id: string, coordinate: Coordinate) => void;
 
-  /** Called when any polyline is pressed (bulk or child overlays). */
+  /** Called when any polyline is pressed. */
   onPolylinePress?: (id: string) => void;
 
-  /** Called when any polygon is pressed (bulk or child overlays). */
+  /** Called when any polygon is pressed. */
   onPolygonPress?: (id: string) => void;
 
-  /** Called when any circle is pressed (bulk or child overlays). */
+  /** Called when any circle is pressed. */
   onCirclePress?: (id: string) => void;
 
   /** Called when the map region changes after user interaction. */

From e66ef9155f149f88a047cbf4106f98b3fd498f5c Mon Sep 17 00:00:00 2001
From: Jakub Kasprzyk <kasprzykjakub@proton.me>
Date: Fri, 26 Jun 2026 13:46:14 +0200
Subject: [PATCH 3/3] Refactor longitude column range calculation in
 MarkerSpatialIndex for better handling of longitude wrapping and edge cases.

---
 .../nitro/nitromaps/MarkerSpatialIndex.kt     | 23 +++++++++++++++----
 package/ios/MarkerSpatialIndex.swift          | 23 +++++++++++++++----
 2 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/package/android/src/main/java/com/margelo/nitro/nitromaps/MarkerSpatialIndex.kt b/package/android/src/main/java/com/margelo/nitro/nitromaps/MarkerSpatialIndex.kt
index 2c58d4a..0c53335 100644
--- a/package/android/src/main/java/com/margelo/nitro/nitromaps/MarkerSpatialIndex.kt
+++ b/package/android/src/main/java/com/margelo/nitro/nitromaps/MarkerSpatialIndex.kt
@@ -89,17 +89,30 @@ internal class MarkerSpatialIndex(
   }
 
   private fun longitudeColumns(minLon: Double, maxLon: Double): List<Int> {
-    if (minLon <= maxLon) {
-      val colStart = clampedColumn(minLon)
-      val colEnd = clampedColumn(maxLon)
+    if (maxLon - minLon >= 360.0) {
+      return (0 until side).toList()
+    }
+
+    val wrappedMin = wrapLongitude(minLon)
+    val wrappedMax = wrapLongitude(maxLon)
+    if (wrappedMin <= wrappedMax && maxLon <= 180.0 && minLon >= -180.0) {
+      val colStart = clampedColumn(wrappedMin)
+      val colEnd = clampedColumn(wrappedMax)
       return (colStart..colEnd).toList()
     }
 
-    val firstRange = clampedColumn(minLon) until side
-    val secondRange = 0..clampedColumn(maxLon)
+    val firstRange = clampedColumn(wrappedMin) until side
+    val secondRange = 0..clampedColumn(wrappedMax)
     return firstRange.toList() + secondRange.toList()
   }
 
+  private fun wrapLongitude(lon: Double): Double {
+    var wrapped = lon
+    while (wrapped > 180.0) wrapped -= 360.0
+    while (wrapped < -180.0) wrapped += 360.0
+    return wrapped
+  }
+
   private fun cellIndex(lat: Double, lon: Double): Int {
     return clampedRow(lat) * side + clampedColumn(lon)
   }
diff --git a/package/ios/MarkerSpatialIndex.swift b/package/ios/MarkerSpatialIndex.swift
index 6d0597b..b25f3f6 100644
--- a/package/ios/MarkerSpatialIndex.swift
+++ b/package/ios/MarkerSpatialIndex.swift
@@ -84,17 +84,30 @@ final class MarkerSpatialIndex {
   }
 
   private func longitudeColumnRange(minLon: Double, maxLon: Double) -> [Int] {
-    if minLon <= maxLon {
-      let colStart = clampedColumn(minLon)
-      let colEnd = clampedColumn(maxLon)
+    if maxLon - minLon >= 360.0 {
+      return Array(0..<cellsPerSide)
+    }
+
+    let wrappedMin = wrapLongitude(minLon)
+    let wrappedMax = wrapLongitude(maxLon)
+    if wrappedMin <= wrappedMax && maxLon <= 180.0 && minLon >= -180.0 {
+      let colStart = clampedColumn(wrappedMin)
+      let colEnd = clampedColumn(wrappedMax)
       return Array(colStart...colEnd)
     }
 
-    let firstRange = clampedColumn(minLon)...cellsPerSide - 1
-    let secondRange = 0...clampedColumn(maxLon)
+    let firstRange = clampedColumn(wrappedMin)...cellsPerSide - 1
+    let secondRange = 0...clampedColumn(wrappedMax)
     return Array(firstRange) + Array(secondRange)
   }
 
+  private func wrapLongitude(_ lon: Double) -> Double {
+    var wrapped = lon
+    while wrapped > 180.0 { wrapped -= 360.0 }
+    while wrapped < -180.0 { wrapped += 360.0 }
+    return wrapped
+  }
+
   private func cellIndex(lat: Double, lon: Double) -> Int {
     clampedRow(lat) * cellsPerSide + clampedColumn(lon)
   }