@rnmapbox/maps 10.0.0-beta.42 → 10.0.0-beta.44

package/android/install.md

@@ -10,9 +10,9 @@
 
 Add `RNMapboxMapsImpl = "mapbox"` to your gradle file - see bellow for details.
 
-### Custom versions
+### Setting RNMapboxMapsImpl to v10
 
-*Warning*: If you set a custome version make sure you revisit, any time you update @rnmapbox/maps. Setting it to earlier version to what we exepect will likely result in a build error.
+*Warning*: If you set a custom version, make sure you revisit, any time you update @rnmapbox/maps. Setting it to earlier version than what we exepect will likely result in a build error.
 
 Overwrite mapbox dependencies within your `android/build.gradle > buildscript > ext` section
 
@@ -22,6 +22,53 @@ buildscript {
     ext {
         // ...
         RNMapboxMapsImpl = "mapbox" // required for v10
+    }
+}
+```
+
+### Adding mapbox maven repo
+
+You will need to authorize your download of the Maps SDK via a secret access token with the `DOWNLOADS:READ` scope.  
+This [guide](https://docs.mapbox.com/android/maps/guides/install/#configure-credentials) explains how to `Configure credentials` and `Configure your secret token`.
+
+Then under section `allprojects/repositories` add your data:
+
+```groovy
+// android/build.gradle
+
+allprojects {
+    repositories {
+        // ...other repos
+        maven {
+            url 'https://api.mapbox.com/downloads/v2/releases/maven'
+            authentication {
+                basic(BasicAuthentication)
+            }
+            credentials {
+                // Do not change the username below.
+                // This should always be `mapbox` (not your username).
+                username = 'mapbox'
+                // Use the secret token you stored in gradle.properties as the password
+                password = project.properties['MAPBOX_DOWNLOADS_TOKEN'] ?: ""
+            }
+        }
+        // ...even more repos?
+    }
+}
+```
+
+### Using non default mapbox version
+
+*Warning*: If you set a custom version, make sure you revisit, any time you update @rnmapbox/maps. Setting it to earlier version than what we exepect will likely result in a build error.
+
+Set `RNMapboxMapsLibs` in `android/build.gradle > buildscript > ext` section
+
+
+```groovy
+buildscript {
+    ext {
+        // ...
+        RNMapboxMapsImpl = "mapbox"
 
         RNMapboxMapsLibs = { // optional - only required if you want to customize it
             implementation 'com.mapbox.maps:android:10.6.0'
@@ -33,6 +80,8 @@ buildscript {
 
 
 
+If you see `2 files found with path 'lib/arm64-v8a/libc++_shared.so' from inputs` issue see [possible workaround](#workaround-for-2-files-found-with-path-libarm64-v8alibc_sharedso-from-inputs).
+
 ## Using MapLibre
 
 [MapLibre](https://github.com/maplibre/maplibre-gl-native) is an OSS fork of MapboxGL.
@@ -138,4 +187,22 @@ Feel free to check out the `/example` projects [`android/build.gradle`](https://
 <br>
 
 
+### Workaround for 2 files found with path 'lib/arm64-v8a/libc++_shared.so' from inputs
+
+```sh
+code android/app/build.gradle
+```
+
+add the following
+```gradle
+android {
+    packagingOptions {
+        pickFirst 'lib/x86/libc++_shared.so'
+        pickFirst 'lib/x86_64/libc++_shared.so'
+        pickFirst 'lib/arm64-v8a/libc++_shared.so'
+        pickFirst 'lib/armeabi-v7a/libc++_shared.so'
+    }
+}
+```
+
 

package/android/rctmgl/src/main/java-mapboxgl/common/com/mapbox/rctmgl/components/camera/CameraStop.java

@@ -162,10 +162,10 @@ public class CameraStop {
 
         // scale padding by pixel ratio
         DisplayMetrics metrics = context.getResources().getDisplayMetrics();
-        paddingTop = Float.valueOf(paddingTop * metrics.scaledDensity).intValue();
-        paddingRight = Float.valueOf(paddingRight * metrics.scaledDensity).intValue();
-        paddingBottom = Float.valueOf(paddingBottom * metrics.scaledDensity).intValue();
-        paddingLeft = Float.valueOf(paddingLeft * metrics.scaledDensity).intValue();
+        paddingTop = Float.valueOf(paddingTop * metrics.density).intValue();
+        paddingRight = Float.valueOf(paddingRight * metrics.density).intValue();
+        paddingBottom = Float.valueOf(paddingBottom * metrics.density).intValue();
+        paddingLeft = Float.valueOf(paddingLeft * metrics.density).intValue();
 
         stop.setPadding(
                 paddingLeft,

package/android/rctmgl/src/main/java-mapboxgl/common/com/mapbox/rctmgl/components/mapview/RCTMGLMapView.java

@@ -326,9 +326,9 @@ public class RCTMGLMapView extends MapView implements OnMapReadyCallback, Mapbox
         int[] contentPadding = mMap.getPadding();
 
         int mapWidth = (int) ((mMap.getWidth() * 0.75 - (contentPadding[0] + contentPadding[2]))
-                / metrics.scaledDensity);
+                / metrics.density);
         int mapHeight = (int) ((mMap.getHeight() * 0.75 - (contentPadding[1] + contentPadding[3]))
-                / metrics.scaledDensity);
+                / metrics.density);
         VisibleRegion region = GeoViewport.getRegion(center, (int) zoomLevel, mapWidth, mapHeight);
         return region;
     }
@@ -1246,7 +1246,7 @@ public class RCTMGLMapView extends MapView implements OnMapReadyCallback, Mapbox
 
         final DisplayMetrics metrics = mContext.getResources().getDisplayMetrics();
 
-        double[] result = {left * metrics.scaledDensity, top * metrics.scaledDensity, right * metrics.scaledDensity, bottom * metrics.scaledDensity};
+        double[] result = {left * metrics.density, top * metrics.density, right * metrics.density, bottom * metrics.density};
         return result;
     }
 

package/android/rctmgl/src/main/java-mapboxgl/common/com/mapbox/rctmgl/modules/RCTMGLSnapshotModule.java

@@ -107,7 +107,7 @@ public class RCTMGLSnapshotModule extends ReactContextBaseJavaModule {
 
         options.withLogo(jsOptions.getBoolean("withLogo"));
         options.withStyle(jsOptions.getString("styleURL"));
-        options.withPixelRatio(Float.valueOf(mContext.getResources().getDisplayMetrics().scaledDensity).intValue());
+        options.withPixelRatio(Float.valueOf(mContext.getResources().getDisplayMetrics().density).intValue());
 
         if (jsOptions.hasKey("bounds")) {
             FeatureCollection bounds = FeatureCollection.fromJson(jsOptions.getString("bounds"));

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/camera/CameraStop.kt

@@ -162,10 +162,10 @@ import com.mapbox.mapboxsdk.maps.MapboxMap;
             }
             if (readableMap.hasKey("bounds")) {
                 val metrics = context.resources.displayMetrics
-                var paddingTop = getBoundsPaddingByKey(readableMap, metrics.scaledDensity, "paddingTop")
-                var paddingRight = getBoundsPaddingByKey(readableMap, metrics.scaledDensity, "paddingRight")
-                var paddingBottom = getBoundsPaddingByKey(readableMap, metrics.scaledDensity, "paddingBottom")
-                var paddingLeft = getBoundsPaddingByKey(readableMap, metrics.scaledDensity, "paddingLeft")
+                var paddingTop = getBoundsPaddingByKey(readableMap, metrics.density, "paddingTop")
+                var paddingRight = getBoundsPaddingByKey(readableMap, metrics.density, "paddingRight")
+                var paddingBottom = getBoundsPaddingByKey(readableMap, metrics.density, "paddingBottom")
+                var paddingLeft = getBoundsPaddingByKey(readableMap, metrics.density, "paddingLeft")
 
                 val collection = FeatureCollection.fromJson(readableMap.getString("bounds")!!)
                 stop.setBounds(
@@ -213,9 +213,9 @@ import com.mapbox.mapboxsdk.maps.MapboxMap;
             return intArrayOf(resultLeft, resultTop, resultRight, resultBottom)
         }
 
-        private fun getBoundsPaddingByKey(map: ReadableMap, scaledDensity: Float, key: String): Int? {
+        private fun getBoundsPaddingByKey(map: ReadableMap, density: Float, key: String): Int? {
             if (map.hasKey(key)) {
-                return (map.getInt(key) * scaledDensity).toInt()
+                return (map.getInt(key) * density).toInt()
             } else {
                 return null;
             }

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/mapview/RCTMGLMapView.kt

@@ -317,6 +317,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
             }
             queuedFeatures.clear()
         }
+        mQueuedFeatures = null;
     }
 
     private fun addAllFeaturesToMap() {

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/modules/RCTMGLSnapshotModule.java

@@ -132,7 +132,7 @@ public class RCTMGLSnapshotModule extends ReactContextBaseJavaModule {
                         (int) jsOptions.getDouble("height")
                 )
         );
-        builder.pixelRatio(Float.valueOf(mContext.getResources().getDisplayMetrics().scaledDensity).intValue());
+        builder.pixelRatio(Float.valueOf(mContext.getResources().getDisplayMetrics().density).intValue());
 
         builder.resourceOptions(new ResourceOptions.Builder().accessToken(RCTMGLModule.getAccessToken(mContext)).build());
         return builder.build();

package/docs/HeadingIndicator.md

@@ -1,4 +1,4 @@
-<!-- This file was autogenerated from HeadingIndicator.js do not modify -->
+<!-- This file was autogenerated from HeadingIndicator.tsx do not modify -->
 # <MapboxGL.HeadingIndicator />
 
 

package/docs/ShapeSource.md

@@ -1,4 +1,4 @@
-<!-- This file was autogenerated from ShapeSource.js do not modify -->
+<!-- This file was autogenerated from ShapeSource.tsx do not modify -->
 # <MapboxGL.ShapeSource />
 ShapeSource is a map content source that supplies vector shapes to be shown on the map.
 The shape may be an url or a GeoJSON object
@@ -8,19 +8,23 @@ The shape may be an url or a GeoJSON object
 | ---- | :-- | :----- | :------ | :---------- |
 | id | `string` | `MapboxGL.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 | `object` | `none` | `false` | The contents of the source. A shape can represent a GeoJSON geometry, a feature, or a feature collection. |
-| cluster | `bool` | `none` | `false` | Enables clustering on the source for point shapes. |
+| 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 collection. |
+| 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. |
 | clusterProperties | `object` | `none` | `false` | [`mapbox-gl` (v8) implementation only]<br/>Specifies custom properties on the generated clusters if clustering<br/>is enabled, aggregating values from clustered points.<br/><br/>Has the form `{ "property_name": [operator, map_expression]}`, where<br/> `operator` is a custom reduce expression that references a special `["accumulated"]` value -<br/>  it accumulates the property value from clusters/points the cluster contains<br/> `map_expression` produces the value of a single point<br/><br/>Example: `{ "resultingSum": [["+", ["accumulated"], ["get", "resultingSum"]], ["get", "scalerank"]] }` |
 | maxZoomLevel | `number` | `none` | `false` | Specifies the maximum zoom level at which to create vector tiles.<br/>A greater value produces greater detail at high zoom levels.<br/>The default value is 18. |
 | buffer | `number` | `none` | `false` | Specifies the size of the tile buffer on each side.<br/>A value of 0 produces no buffer. A value of 512 produces a buffer as wide as the tile itself.<br/>Larger values produce fewer rendering artifacts near tile edges and slower performance.<br/>The default value is 128. |
 | tolerance | `number` | `none` | `false` | Specifies the Douglas-Peucker simplification tolerance.<br/>A greater value produces simpler geometries and improves performance.<br/>The default value is 0.375. |
-| lineMetrics | `bool` | `none` | `false` | Whether to calculate line distance metrics.<br/>This is required for line layers that specify lineGradient values.<br/>The default value is false. |
-| onPress | `func` | `none` | `false` | Source press listener, gets called when a user presses one of the children layers only<br/>if that layer has a higher z-index than another source layers |
+| lineMetrics | `boolean` | `none` | `false` | Whether to calculate line distance metrics.<br/>This is required for line layers that specify lineGradient values.<br/>The default value is false. |
+| onPress | `func` | `none` | `false` | Source press listener, gets called when a user presses one of the children layers only<br/>if that layer has a higher z-index than another source layers<br/><br/>@param {Object} event<br/>@param {Object[]} event.features - the geojson features that have hit by the press (might be multiple)<br/>@param {Object} event.coordinates - the coordinates of the click<br/>@param {Object} event.point - the point of the click<br/>@return void<br/>*signature:*`(event:{features: Array, coordinates: {latitude: number, longitude: number}, point: {x: number, y: number}}) => void` |
 | hitbox | `shape` | `none` | `false` | Overrides the default touch hitbox(44x44 pixels) for the source layers |
 | &nbsp;&nbsp;width | `number` | `none` | `true` | `width` of hitbox |
 | &nbsp;&nbsp;height | `number` | `none` | `true` | `height` of hitbox |
+| children | `React.ReactElement \| React.ReactElement[]` | `none` | `true` | FIX ME NO DESCRIPTION |
 
 ## methods
 ### features([filter])
@@ -46,7 +50,7 @@ Returns the zoom needed to expand the cluster.
 #### arguments
 | Name | Type | Required | Description  |
 | ---- | :--: | :------: | :----------: |
-| `feature` | `Feature` | `Yes` | The feature cluster to expand. |
+| `feature` | `string \| GeoJSON.Feature` | `Yes` | The feature cluster to expand. |
 
 
 
@@ -62,7 +66,7 @@ Returns the FeatureCollection from the cluster.
 #### arguments
 | Name | Type | Required | Description  |
 | ---- | :--: | :------: | :----------: |
-| `feature` | `Feature` | `Yes` | The feature cluster to expand. |
+| `feature` | `number \| 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). |
 
@@ -80,7 +84,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` | `number \| GeoJSON.Feature` | `Yes` | The feature cluster to expand. |
 
 
 
@@ -96,7 +100,7 @@ const collection = await shapeSource.getClusterChildren(clusterId);
 #### arguments
 | Name | Type | Required | Description  |
 | ---- | :--: | :------: | :----------: |
-| `event` | `n/a` | `Yes` | undefined |
+| `event` | `NativeSyntheticEvent` | `Yes` | undefined |
 
 
 

package/docs/SymbolLayer.md

@@ -1,4 +1,4 @@
-<!-- This file was autogenerated from SymbolLayer.js do not modify -->
+<!-- This file was autogenerated from SymbolLayer.tsx do not modify -->
 # <MapboxGL.SymbolLayer />
 SymbolLayer is a style layer that renders icon and text labels at points or along lines on the map.
 
@@ -11,10 +11,11 @@ SymbolLayer is a style layer that renders icon and text labels at points or alon
 | aboveLayerID | `string` | `none` | `false` | Inserts a layer above aboveLayerID. |
 | belowLayerID | `string` | `none` | `false` | Inserts a layer below belowLayerID |
 | layerIndex | `number` | `none` | `false` | Inserts a layer at a specified index |
-| filter | `array` | `none` | `false` | Filter only the features in the source layer that satisfy a condition that you define |
+| filter | `Array` | `none` | `false` | Filter only the features in the source layer that satisfy a condition that you define |
 | minZoomLevel | `number` | `none` | `false` | The minimum zoom level at which the layer gets parsed and appears. |
 | maxZoomLevel | `number` | `none` | `false` | The maximum zoom level at which the layer gets parsed and appears. |
-| style | `union` | `none` | `false` | Customizable style attributes |
+| style | `SymbolLayerStyleProps` | `none` | `true` | FIX ME NO DESCRIPTION |
+| children | `JSX.Element \| JSX.Element[]` | `none` | `false` | FIX ME NO DESCRIPTION |
 
 
 ## styles

package/docs/docs.json

@@ -1646,7 +1646,7 @@
         "description": "FIX ME NO DESCRIPTION"
       }
     ],
-    "fileNameWithExt": "HeadingIndicator.js",
+    "fileNameWithExt": "HeadingIndicator.tsx",
     "name": "HeadingIndicator"
   },
   "HeatmapLayer": {
@@ -3820,7 +3820,7 @@
             "name": "feature",
             "description": "The feature cluster to expand.",
             "type": {
-              "name": "Feature"
+              "name": "string \\| GeoJSON.Feature"
             },
             "optional": false
           }
@@ -3828,7 +3828,13 @@
         "returns": {
           "description": null,
           "type": {
-            "name": "number"
+            "name": "Promise",
+            "elements": [
+              {
+                "name": "string"
+              }
+            ],
+            "raw": "Promise<string>"
           }
         },
         "description": "Returns the zoom needed to expand the cluster.",
@@ -3838,7 +3844,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 {FeatureCollection}",
         "modifiers": [
           "async"
         ],
@@ -3847,7 +3853,7 @@
             "name": "feature",
             "description": "The feature cluster to expand.",
             "type": {
-              "name": "Feature"
+              "name": "number \\| GeoJSON.Feature"
             },
             "optional": false
           },
@@ -3881,7 +3887,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 {FeatureCollection}",
         "modifiers": [
           "async"
         ],
@@ -3890,7 +3896,7 @@
             "name": "feature",
             "description": "The feature cluster to expand.",
             "type": {
-              "name": "Feature"
+              "name": "number \\| GeoJSON.Feature"
             },
             "optional": false
           }
@@ -3915,7 +3921,7 @@
             "name": "event",
             "optional": false,
             "type": {
-              "name": null
+              "name": "NativeSyntheticEvent"
             }
           }
         ],
@@ -3940,14 +3946,14 @@
       {
         "name": "shape",
         "required": false,
-        "type": "object",
+        "type": "\\| GeoJSON.GeometryCollection\n\\| GeoJSON.Feature\n\\| GeoJSON.FeatureCollection\n\\| GeoJSON.Geometry",
         "default": "none",
         "description": "The contents of the source. A shape can represent a GeoJSON geometry, a feature, or a feature collection."
       },
       {
         "name": "cluster",
         "required": false,
-        "type": "bool",
+        "type": "boolean",
         "default": "none",
         "description": "Enables clustering on the source for point shapes."
       },
@@ -3996,59 +4002,19 @@
       {
         "name": "lineMetrics",
         "required": false,
-        "type": "bool",
+        "type": "boolean",
         "default": "none",
         "description": "Whether to calculate line distance metrics.\nThis is required for line layers that specify lineGradient values.\nThe default value is false."
       },
       {
         "name": "onPress",
         "required": false,
-        "type": "func",
+        "type": {
+          "name": "func",
+          "funcSignature": "(event:{features: Array, coordinates: {latitude: number, longitude: number}, point: {x: number, y: number}}) => void"
+        },
         "default": "none",
-        "description": "Source press listener, gets called when a user presses one of the children layers only\nif that layer has a higher z-index than another source layers",
-        "params": [
-          {
-            "name": "event",
-            "description": null,
-            "type": {
-              "name": "Object"
-            },
-            "optional": false
-          },
-          {
-            "name": "event.features",
-            "description": "the geojson features that have hit by the press (might be multiple)",
-            "type": {
-              "name": "Array",
-              "elements": [
-                {
-                  "name": "Object"
-                }
-              ]
-            },
-            "optional": false
-          },
-          {
-            "name": "event.coordinates",
-            "description": "the coordinates of the click",
-            "type": {
-              "name": "Object"
-            },
-            "optional": false
-          },
-          {
-            "name": "event.point",
-            "description": "the point of the click",
-            "type": {
-              "name": "Object"
-            },
-            "optional": false
-          }
-        ],
-        "returns": {
-          "description": "void",
-          "type": null
-        }
+        "description": "Source press listener, gets called when a user presses one of the children layers only\nif that layer has a higher z-index than another source layers\n\n@param {Object} event\n@param {Object[]} event.features - the geojson features that have hit by the press (might be multiple)\n@param {Object} event.coordinates - the coordinates of the click\n@param {Object} event.point - the point of the click\n@return void\n*signature:*`(event:{features: Array, coordinates: {latitude: number, longitude: number}, point: {x: number, y: number}}) => void`"
       },
       {
         "name": "hitbox",
@@ -4074,12 +4040,16 @@
         },
         "default": "none",
         "description": "Overrides the default touch hitbox(44x44 pixels) for the source layers"
+      },
+      {
+        "name": "children",
+        "required": true,
+        "type": "React.ReactElement \\| React.ReactElement[]",
+        "default": "none",
+        "description": "FIX ME NO DESCRIPTION"
       }
     ],
-    "composes": [
-      "../utils"
-    ],
-    "fileNameWithExt": "ShapeSource.js",
+    "fileNameWithExt": "ShapeSource.tsx",
     "name": "ShapeSource"
   },
   "SkyLayer": {
@@ -4411,7 +4381,7 @@
       {
         "name": "filter",
         "required": false,
-        "type": "array",
+        "type": "Array",
         "default": "none",
         "description": "Filter only the features in the source layer that satisfy a condition that you define"
       },
@@ -4431,16 +4401,20 @@
       },
       {
         "name": "style",
+        "required": true,
+        "type": "SymbolLayerStyleProps",
+        "default": "none",
+        "description": "FIX ME NO DESCRIPTION"
+      },
+      {
+        "name": "children",
         "required": false,
-        "type": "union",
+        "type": "JSX.Element \\| JSX.Element[]",
         "default": "none",
-        "description": "Customizable style attributes"
+        "description": "FIX ME NO DESCRIPTION"
       }
     ],
-    "composes": [
-      "../utils"
-    ],
-    "fileNameWithExt": "SymbolLayer.js",
+    "fileNameWithExt": "SymbolLayer.tsx",
     "name": "SymbolLayer",
     "styles": [
       {