@maplibre/maplibre-react-native 10.0.0-alpha.22 → 10.0.0-alpha.24

package/CHANGELOG.md

@@ -6,6 +6,18 @@ PR Title ([#123](link to my pr))
 
 ```
 
+## 10.0.0-alpha.24
+
+feat: support new arch through interop layer ([#483](https://github.com/maplibre/maplibre-react-native/pull/483))
+
+## 10.0.0-alpha.23
+
+fix: keep @ts-ignore for headingIcon in library ([#477](https://github.com/maplibre/maplibre-react-native/pull/477))
+feat: upgrade @turf to v7 and remove geo utils ([#478](https://github.com/maplibre/maplibre-react-native/pull/478))
+docs: improve guides and branding ([#475](https://github.com/maplibre/maplibre-react-native/pull/475))
+chore: improve examples monorepo setup with reusable App ([#474](https://github.com/maplibre/maplibre-react-native/pull/474))
+chore: remove react native elements from examples ([#472](https://github.com/maplibre/maplibre-react-native/pull/472))
+
 ## 10.0.0-alpha.22
 
 chore: configure jest to use with ts

package/CONTRIBUTING.md

@@ -8,26 +8,32 @@ your dev environment and streamline the review process.
 This project includes `.nvmrc`. You should use nvm so that you're always developing for the correct
 version of Node.
 
-This project uses `yarn` as a package manager. DO NOT install `yarn` using `npm` as that will install
-the outdated 1.x branch. Full instructions are in the [yarn docs](https://yarnpkg.com/getting-started/install),
-but here's the quick checklist at the time of this writing.
+This project uses `yarn` as a package manager.
+
+> [!CAUTION]
+> DO NOT install `yarn` using `npm` as that will install the outdated 1.x branch. Full instructions are in
+> the [yarn docs](https://yarnpkg.com/getting-started/install), but here's the quick checklist at the time of this
+> writing.
 
 Make sure to correctly configure your Editor following [this docs](https://yarnpkg.com/getting-started/editor-sdks).
 
 1. `corepack enable`
 2. `corepack prepare yarn@stable --activate`
-3. On first install, the above may change your yarn config away from `pnp`; check your git working copy for changes and revert if necessary.
+3. On first install, the above may change your yarn config away from `pnp`; check your git working copy for changes and
+   revert if necessary.
 4. `yarn install`
 
 ## Testing
 
-The metro bundler under `/example` is set up to use the libraries files under root.
-Which means, when you change something within `javascript/components/UserLocation.js`
+The metro bundlers under [`/packages/react-native-app`](/packages/react-native-app) and [
+`/packages/expo-app`](/packages/expo-app) is set up to use the libraries files under root.
+Which means, when you change something within [
+`/javascript/components/UserLocation.tsx`](/javascript/components/UserLocation.tsx)
 it will be reflected in any scene in example that uses that component.
 
 TODO: A better overview of how we use jest, detox, etc. (issue #22)
 
-## Optional: Local development with yalc
+## Optional: Local development with `yalc`
 
 It is often desirable to test in the context of an external project (for example,
 if you have a complex application using a map and want to test your changes directly).
@@ -42,14 +48,14 @@ can mitigate some of the pain with this.
 - Make sure to use small concise commits
 - Use meaningful commit messages
 - Make sure to update/ add new tests for your changes
-- If you add a new feature, make sure to add a scene in `/example` for others to see/ test it
+- If you add a new feature, make sure to add a scene in [`/packages/examples`](/packages/examples) for others to
+  see/test it
 
 ## Documentation
 
-Documentation is generated from code blocks and comments.
-It will be auto-generated when you commit changes.
-If any changes are generated from your edits, the changed files will need to be added using `git add` before attempting the commit again.
-To manually generate the changes, run `yarn generate`.
+Documentation is generated from code blocks and comments. It will be auto-generated when you commit changes. If any
+changes are generated from your edits, the changed files will need to be added using `git add` before attempting the
+commit again. To manually generate the changes, run `yarn generate`.
 
-Notice, that changing the documentation in the individual <COMPONENT>.md within `/docs` will not suffice.
-The correct way is the above described
+Notice, that changing the documentation in the individual <COMPONENT>.md within `/docs` will not suffice. The correct
+way is the above described

package/README.md

@@ -1,23 +1,17 @@
----
-
 [![MapLibre Logo](https://maplibre.org/img/maplibre-logo-big.svg)](https://maplibre.org)
 
+# MapLibre React Native
 
-# MapLibre GL SDK for React Native
-
-_A React Native library for building maps with   
-the [MapLibre GL Native SDK for iOS & Android](https://github.com/maplibre/maplibre-gl-native)_.
+_React Native library for creating maps with [MapLibre Native for Android & iOS](https://github.com/maplibre/maplibre-gl-native)_.
 
 This project originated as a fork of [rnmapbox](https://github.com/rnmapbox/maps), a community-maintained
-React Native Library for building maps with the Mapbox iOS and Android mobile SDKs. The original product
+React Native library for building maps with the Mapbox iOS and Android mobile SDKs. The original product
 supported both Mapbox and MapLibre for some time, but as the MapLibre and Mapbox SDKs have
 diverged, it has become necessary to separate the projects into specific wrappers by underlying renderer.
 
 ---
 
-[![npm version](https://badge.fury.io/js/%40maplibre%2Fmaplibre-react-native.svg)](https://badge.fury.io/js/%40maplibre%2Fmaplibre-react-native)  
-[![Android Build](https://github.com/maplibre/maplibre-react-native/actions/workflows/android-actions.yml/badge.svg)](https://github.com/maplibre/maplibre-react-native/actions/workflows/android-actions.yml)  
-[![iOS Build](https://github.com/maplibre/maplibre-react-native/actions/workflows/ios-actions.yml/badge.svg)](https://github.com/maplibre/maplibre-react-native/actions/workflows/ios-actions.yml)  
+[![npm version](https://badge.fury.io/js/%40maplibre%2Fmaplibre-react-native.svg)](https://badge.fury.io/js/%40maplibre%2Fmaplibre-react-native) [![Android Build](https://github.com/maplibre/maplibre-react-native/actions/workflows/android-actions.yml/badge.svg)](https://github.com/maplibre/maplibre-react-native/actions/workflows/android-actions.yml) [![iOS Build](https://github.com/maplibre/maplibre-react-native/actions/workflows/ios-actions.yml/badge.svg)](https://github.com/maplibre/maplibre-react-native/actions/workflows/ios-actions.yml)
 
 ---
 
@@ -34,7 +28,12 @@ diverged, it has become necessary to separate the projects into specific wrapper
 
 ## Documentation
 
-[Getting Started (start here)](/docs/GettingStarted.md)
+- [Getting Started](/docs/GettingStarted.md)
+- Installation
+  - React Native  
+    - [Android](/android/install.md)
+    - [iOS](/ios/install.md)
+  - [Expo](/plugin/install.md)
 
 ### Components
 
@@ -79,8 +78,8 @@ diverged, it has become necessary to separate the projects into specific wrapper
 ## Contributing / local development
 
 Read the [CONTRIBUTING.md](CONTRIBUTING.md) guide in order to get familiar with how we do things around here and
-set up your local dev environment.
+set up your local development environment.
 
 ## Community
 
-Join the #maplibre-react-native or #maplibre Slack channels at OSMUS: get an invite at https://slack.openstreetmap.us/
+Join the `#maplibre-react-native` or `#maplibre` [Slack channels at OSMUS](https://slack.openstreetmap.us/).

package/android/install.md

@@ -2,10 +2,11 @@
 
 ## Access tokens
 
-Note that the Android SDK is slightly peculiar in that it
+> [!NOTE]
+> MapLibre Native for Android is slightly peculiar in that it
 _requires_ setting an access token, even though it will be `null` for
 most users (only Mapbox authenticates this way). Even if it feels odd,
-you have to have a line like this in your code before using the SDK.
+you have to have a line like this in your code before using the library.
 You can put this near the top of your `App.js` for convenience.
 
 ```javascript

package/android/rctmln/build.gradle

@@ -4,6 +4,10 @@ def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
 }
 
+def isNewArchitectureEnabled() {
+    return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
+}
+
 android {
     compileSdkVersion safeExtGet("compileSdkVersion", 33)
     buildToolsVersion safeExtGet("buildToolsVersion", '33.0.1')
@@ -13,6 +17,7 @@ android {
         targetSdkVersion safeExtGet('targetSdkVersion', 26)
         versionCode 1
         versionName "1.0"
+        buildConfigField("boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString())
     }
 
     compileOptions {

package/android/rctmln/src/main/java/com/maplibre/rctmln/components/AbstractEventEmitter.java

@@ -2,12 +2,16 @@ package com.maplibre.rctmln.components;
 
 import android.view.ViewGroup;
 
+import com.maplibre.rctmln.BuildConfig;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.common.MapBuilder;
 import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.uimanager.UIManagerHelper;
 import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.ViewGroupManager;
 import com.facebook.react.uimanager.events.EventDispatcher;
+import com.facebook.react.uimanager.common.UIManagerType;
+
 import com.maplibre.rctmln.events.IEvent;
 
 import java.util.HashMap;
@@ -45,7 +49,11 @@ abstract public class AbstractEventEmitter<T extends ViewGroup> extends ViewGrou
 
     @Override
     protected void addEventEmitters(ThemedReactContext context, @Nonnull T view) {
-        mEventDispatcher = context.getNativeModule(UIManagerModule.class).getEventDispatcher();
+        if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
+            mEventDispatcher = UIManagerHelper.getUIManager(context, UIManagerType.FABRIC).getEventDispatcher();
+        } else {
+            mEventDispatcher = context.getNativeModule(UIManagerModule.class).getEventDispatcher();
+        }
     }
 
     @Nullable

package/android/rctmln/src/main/java/com/maplibre/rctmln/modules/RCTMLNLocationModule.java

@@ -18,7 +18,7 @@ import com.maplibre.rctmln.location.LocationManager;
 
 @ReactModule(name = RCTMLNLocationModule.REACT_CLASS)
 public class RCTMLNLocationModule extends ReactContextBaseJavaModule {
-    public static final String REACT_CLASS = "RCTMLNLocationModule";
+    public static final String REACT_CLASS = "MLNLocationModule";
     public static final String LOCATION_UPDATE = "MapboxUserLocationUpdate";
 
     private boolean isEnabled;

package/android/rctmln/src/main/java/com/maplibre/rctmln/modules/RCTMLNLogging.java

@@ -13,7 +13,7 @@ import android.util.Log;
 
 @ReactModule(name = RCTMLNLogging.REACT_CLASS)
 public class RCTMLNLogging extends ReactContextBaseJavaModule {
-    public static final String REACT_CLASS = "RCTMLNLogging";
+    public static final String REACT_CLASS = "MLNLogging";
     private ReactApplicationContext mReactContext;
 
     public RCTMLNLogging(ReactApplicationContext reactApplicationContext) {

package/android/rctmln/src/main/java/com/maplibre/rctmln/modules/RCTMLNModule.java

@@ -36,7 +36,7 @@ import javax.annotation.Nullable;
 
 @ReactModule(name = RCTMLNModule.REACT_CLASS)
 public class RCTMLNModule extends ReactContextBaseJavaModule {
-    public static final String REACT_CLASS = "RCTMLNModule";
+    public static final String REACT_CLASS = "MLNModule";
 
     private static boolean customHeaderInterceptorAdded = false;
 

package/android/rctmln/src/main/java/com/maplibre/rctmln/modules/RCTMLNOfflineModule.java

@@ -38,7 +38,7 @@ import java.util.Locale;
 
 @ReactModule(name = RCTMLNOfflineModule.REACT_CLASS)
 public class RCTMLNOfflineModule extends ReactContextBaseJavaModule {
-    public static final String REACT_CLASS = "RCTMLNOfflineModule";
+    public static final String REACT_CLASS = "MLNOfflineModule";
 
     public static final int INACTIVE_REGION_DOWNLOAD_STATE = OfflineRegion.STATE_INACTIVE;
     public static final int ACTIVE_REGION_DOWNLOAD_STATE = OfflineRegion.STATE_ACTIVE;

package/android/rctmln/src/main/java/com/maplibre/rctmln/modules/RCTMLNSnapshotModule.java

@@ -40,7 +40,7 @@ import static android.content.Context.CONTEXT_IGNORE_SECURITY;
 
 @ReactModule(name = RCTMLNSnapshotModule.REACT_CLASS)
 public class RCTMLNSnapshotModule extends ReactContextBaseJavaModule {
-    public static final String REACT_CLASS = "RCTMLNSnapshotModule";
+    public static final String REACT_CLASS = "MLNSnapshotModule";
 
     private ReactApplicationContext mContext;
 

package/babel.config.js

@@ -1,5 +1,5 @@
 module.exports = {
-  presets: ["module:metro-react-native-babel-preset"],
+  presets: ["module:@react-native/babel-preset"],
   plugins: [
     ["@babel/plugin-proposal-class-properties", { loose: true }],
     ["@babel/plugin-transform-private-methods", { loose: true }],

package/docs/Camera.md

@@ -19,7 +19,7 @@
 | maxZoomLevel | `number` | `none` | `false` | The maximun zoom level of the map |
 | maxBounds | `CameraBounds` | `none` | `false` | Restrict map panning so that the center is within these bounds |
 | followUserLocation | `boolean` | `none` | `false` | Should the map orientation follow the user's. |
-| followUserMode | `UserTrackingMode` | `none` | `false` | The mode used to track the user location on the map. One of; "normal", "compass", "course". Each mode string is also available as a member on the `MapLibreGL.UserTrackingModes` object. `Follow` (normal), `FollowWithHeading` (compass), `FollowWithCourse` (course). NOTE: `followUserLocation` must be set to `true` for any of the modes to take effect. [Example](../example/src/examples/Camera/SetUserTrackingModes.js) |
+| followUserMode | `UserTrackingMode` | `none` | `false` | The mode used to track the user location on the map. One of; "normal", "compass", "course". Each mode string is also available as a member on the `MapLibreGL.UserTrackingModes` object. `Follow` (normal), `FollowWithHeading` (compass), `FollowWithCourse` (course). NOTE: `followUserLocation` must be set to `true` for any of the modes to take effect. [Example](/packages/examples/src/examples/Camera/SetUserTrackingModes.js) |
 | followZoomLevel | `number` | `none` | `false` | The zoomLevel on map while followUserLocation is set to `true` |
 | followPitch | `number` | `none` | `false` | The pitch on map while followUserLocation is set to `true` |
 | followHeading | `number` | `none` | `false` | The heading on map while followUserLocation is set to `true` |

package/docs/GettingStarted.md

@@ -1,8 +1,7 @@
 # Getting Started
 
-Congratulations, you successfully installed maplibre-react-native! 🎉
-This quickstart guide provides a zero-to-map intro, and from there you can check out the
-[examples](/example) folder if you want to jump in the deep end.
+This quickstart guide provides a zero-to-map intro using React Native. From there you can check out the
+[examples](/packages/examples) folder if you want to jump in the deep end.
 
 ## Prerequisites
 
@@ -41,7 +40,7 @@ yarn add @maplibre/maplibre-react-native
 npm install @maplibre/maplibre-react-native --save
 ```
 
-### Review platform specific info
+### Review platform specific Details
 
 Check out the installation guide(s) for additional information about platform-specific setup, quirks,
 and steps required before running.

package/docs/MapView.md

@@ -1,6 +1,6 @@
 <!-- This file was autogenerated from MapView.js do not modify -->
 ## <MapLibreGL.MapView />
-### MapView backed by MapLibre GL Native
+### MapView backed by MapLibre Native
 
 ### props
 | Prop | Type | Default | Required | Description |
@@ -16,16 +16,10 @@
 | pitchEnabled | `boolean` | `true` | `false` | Enable/Disable pitch on map |
 | rotateEnabled | `boolean` | `true` | `false` | Enable/Disable rotation on map |
 | attributionEnabled | `boolean` | `true` | `false` | Enable/Disable attribution on map.<br/><br/>This must be enabled for Mapbox-hosted tiles and styles. Please refer to the Mapbox Terms of Service.<br/>Other providers do not require this. |
-| attributionPosition | `\| { top?: number; left?: number }
-\| { top?: number; right?: number }
-\| { bottom?: number; left?: number }
-\| { bottom?: number; right?: number }` | `none` | `false` | Adds attribution offset, e.g. `{top: 8, left: 8}` will put attribution button in top-left corner of the map |
+| attributionPosition | `{ top?: number; left?: number } \| { top?: number; right?: number } \| { bottom?: number; left?: number } \| { bottom?: number; right?: number }` | `none` | `false` | Adds attribution offset, e.g. `{top: 8, left: 8}` will put attribution button in top-left corner of the map |
 | tintColor | `string \| unknown[]` | `none` | `false` | MapView's tintColor |
 | logoEnabled | `boolean` | `false` | `false` | Enable/Disable the logo on the map. |
-| logoPosition | `\| { top?: number; left?: number }
-\| { top?: number; right?: number }
-\| { bottom?: number; left?: number }
-\| { bottom?: number; right?: number }` | `none` | `false` | Adds logo offset, e.g. `{top: 8, left: 8}` will put the logo in top-left corner of the map |
+| logoPosition | `{ top?: number; left?: number } \| { top?: number; right?: number } \| { bottom?: number; left?: number } \| { bottom?: number; right?: number }` | `none` | `false` | Adds logo offset, e.g. `{top: 8, left: 8}` will put the logo in top-left corner of the map |
 | compassEnabled | `boolean` | `none` | `false` | Enable/Disable the compass from appearing on the map |
 | compassViewPosition | `number` | `none` | `false` | Change corner of map the compass starts at. 0: TopLeft, 1: TopRight, 2: BottomLeft, 3: BottomRight |
 | compassViewMargins | `object` | `none` | `false` | Add margins to the compass with x and y values |

package/docs/ShapeSource.md

@@ -7,10 +7,7 @@
 | ---- | :--: | :-----: | :------: | :----------: |
 | id | `string` | `MapLibreGL.StyleSource.DefaultSourceID` | `false` | A string that uniquely identifies the source. |
 | url | `string` | `none` | `false` | An HTTP(S) URL, absolute file URL, or local file URL relative to the current application’s resource bundle. |
-| shape | `\| GeoJSON.GeometryCollection
-\| GeoJSON.Feature
-\| GeoJSON.FeatureCollection
-\| GeoJSON.Geometry` | `none` | `false` | The contents of the source. A shape can represent a GeoJSON geometry, a feature, or a feature colllection. |
+| shape | `GeoJSON.GeometryCollection \| GeoJSON.Feature \| GeoJSON.FeatureCollection \| GeoJSON.Geometry` | `none` | `false` | The contents of the source. A shape can represent a GeoJSON geometry, a feature, or a feature colllection. |
 | cluster | `boolean` | `none` | `false` | Enables clustering on the source for point shapes. |
 | clusterRadius | `number` | `none` | `false` | Specifies the radius of each cluster if clustering is enabled.<br/>A value of 512 produces a radius equal to the width of a tile.<br/>The default value is 50. |
 | clusterMaxZoomLevel | `number` | `none` | `false` | Specifies the maximum zoom level at which to cluster points if clustering is enabled.<br/>Defaults to one zoom level less than the value of maxZoomLevel so that, at the maximum zoom level,<br/>the shapes are not clustered. |
@@ -50,7 +47,7 @@ Returns the zoom needed to expand the cluster.
 ##### arguments
 | Name | Type | Required | Description  |
 | ---- | :--: | :------: | :----------: |
-| `feature` | `Feature` | `Yes` | The feature cluster to expand. |
+| `feature` | `GeoJSON.Feature` | `Yes` | The feature cluster to expand. |
 
 
 
@@ -66,7 +63,7 @@ Returns the FeatureCollection from the cluster.
 ##### arguments
 | Name | Type | Required | Description  |
 | ---- | :--: | :------: | :----------: |
-| `feature` | `Feature` | `Yes` | The feature cluster to expand. |
+| `feature` | `GeoJSON.Feature` | `Yes` | The feature cluster to expand. |
 | `limit` | `number` | `Yes` | The number of points to return. |
 | `offset` | `number` | `Yes` | The amount of points to skip (for pagination). |
 
@@ -84,7 +81,7 @@ Returns the FeatureCollection from the cluster (on the next zoom level).
 ##### arguments
 | Name | Type | Required | Description  |
 | ---- | :--: | :------: | :----------: |
-| `feature` | `Feature` | `Yes` | The feature cluster to expand. |
+| `feature` | `GeoJSON.Feature` | `Yes` | The feature cluster to expand. |
 
 
 

package/docs/docs.json

@@ -528,7 +528,7 @@
         "required": false,
         "type": "UserTrackingMode",
         "default": "none",
-        "description": "The mode used to track the user location on the map. One of; \"normal\", \"compass\", \"course\". Each mode string is also available as a member on the `MapLibreGL.UserTrackingModes` object. `Follow` (normal), `FollowWithHeading` (compass), `FollowWithCourse` (course). NOTE: `followUserLocation` must be set to `true` for any of the modes to take effect. [Example](../example/src/examples/Camera/SetUserTrackingModes.js)"
+        "description": "The mode used to track the user location on the map. One of; \"normal\", \"compass\", \"course\". Each mode string is also available as a member on the `MapLibreGL.UserTrackingModes` object. `Follow` (normal), `FollowWithHeading` (compass), `FollowWithCourse` (course). NOTE: `followUserLocation` must be set to `true` for any of the modes to take effect. [Example](/packages/examples/src/examples/Camera/SetUserTrackingModes.js)"
       },
       {
         "name": "followZoomLevel",
@@ -2068,7 +2068,7 @@
     ]
   },
   "MapView": {
-    "description": "MapView backed by MapLibre GL Native",
+    "description": "MapView backed by MapLibre Native",
     "displayName": "MapView",
     "methods": [
       {
@@ -3078,7 +3078,7 @@
     "methods": [
       {
         "name": "features",
-        "docblock": "Returns all features from the source that match the query parameters regardless of whether or not the feature is\ncurrently rendered on the map.\n\n@example\nshapeSource.features()\n\n@param  {Array=} filter - an optional filter statement to filter the returned Features.\n@return {FeatureCollection}",
+        "docblock": "Returns all features from the source that match the query parameters regardless of whether or not the feature is\ncurrently rendered on the map.\n\n@example\nshapeSource.features()\n\n@param  {Array=} filter - an optional filter statement to filter the returned Features.\n@return {GeoJSON.FeatureCollection}",
         "modifiers": [
           "async"
         ],
@@ -3098,10 +3098,10 @@
             "name": "Promise",
             "elements": [
               {
-                "name": "FeatureCollection"
+                "name": "GeoJSON.FeatureCollection"
               }
             ],
-            "raw": "Promise<FeatureCollection>"
+            "raw": "Promise<GeoJSON.FeatureCollection>"
           }
         },
         "description": "Returns all features from the source that match the query parameters regardless of whether or not the feature is\ncurrently rendered on the map.",
@@ -3111,7 +3111,7 @@
       },
       {
         "name": "getClusterExpansionZoom",
-        "docblock": "Returns the zoom needed to expand the cluster.\n\n@example\nconst zoom = await shapeSource.getClusterExpansionZoom(clusterId);\n\n@param  {Feature} feature - The feature cluster to expand.\n@return {number}",
+        "docblock": "Returns the zoom needed to expand the cluster.\n\n@example\nconst zoom = await shapeSource.getClusterExpansionZoom(clusterId);\n\n@param  {GeoJSON.Feature} feature - The feature cluster to expand.\n@return {number}",
         "modifiers": [
           "async"
         ],
@@ -3120,7 +3120,7 @@
             "name": "feature",
             "description": "The feature cluster to expand.",
             "type": {
-              "name": "Feature"
+              "name": "GeoJSON.Feature"
             },
             "optional": false
           }
@@ -3144,7 +3144,7 @@
       },
       {
         "name": "getClusterLeaves",
-        "docblock": "Returns the FeatureCollection from the cluster.\n\n@example\nconst collection = await shapeSource.getClusterLeaves(clusterId, limit, offset);\n\n@param  {Feature} feature - The feature cluster to expand.\n@param  {number} limit - The number of points to return.\n@param  {number} offset - The amount of points to skip (for pagination).\n@return {FeatureCollection}",
+        "docblock": "Returns the FeatureCollection from the cluster.\n\n@example\nconst collection = await shapeSource.getClusterLeaves(clusterId, limit, offset);\n\n@param  {GeoJSON.Feature} feature - The feature cluster to expand.\n@param  {number} limit - The number of points to return.\n@param  {number} offset - The amount of points to skip (for pagination).\n@return {GeoJSON.FeatureCollection}",
         "modifiers": [
           "async"
         ],
@@ -3153,7 +3153,7 @@
             "name": "feature",
             "description": "The feature cluster to expand.",
             "type": {
-              "name": "Feature"
+              "name": "GeoJSON.Feature"
             },
             "optional": false
           },
@@ -3180,10 +3180,10 @@
             "name": "Promise",
             "elements": [
               {
-                "name": "FeatureCollection"
+                "name": "GeoJSON.FeatureCollection"
               }
             ],
-            "raw": "Promise<FeatureCollection>"
+            "raw": "Promise<GeoJSON.FeatureCollection>"
           }
         },
         "description": "Returns the FeatureCollection from the cluster.",
@@ -3193,7 +3193,7 @@
       },
       {
         "name": "getClusterChildren",
-        "docblock": "Returns the FeatureCollection from the cluster (on the next zoom level).\n\n@example\nconst collection = await shapeSource.getClusterChildren(clusterId);\n\n@param  {Feature} feature - The feature cluster to expand.\n@return {FeatureCollection}",
+        "docblock": "Returns the FeatureCollection from the cluster (on the next zoom level).\n\n@example\nconst collection = await shapeSource.getClusterChildren(clusterId);\n\n@param  {GeoJSON.Feature} feature - The feature cluster to expand.\n@return {GeoJSON.FeatureCollection}",
         "modifiers": [
           "async"
         ],
@@ -3202,7 +3202,7 @@
             "name": "feature",
             "description": "The feature cluster to expand.",
             "type": {
-              "name": "Feature"
+              "name": "GeoJSON.Feature"
             },
             "optional": false
           }
@@ -3213,10 +3213,10 @@
             "name": "Promise",
             "elements": [
               {
-                "name": "FeatureCollection"
+                "name": "GeoJSON.FeatureCollection"
               }
             ],
-            "raw": "Promise<FeatureCollection>"
+            "raw": "Promise<GeoJSON.FeatureCollection>"
           }
         },
         "description": "Returns the FeatureCollection from the cluster (on the next zoom level).",