@rnmapbox/maps 10.0.0-beta.74 → 10.0.0-beta.76

package/README.md

@@ -147,15 +147,15 @@ npm run android
 ```js
 import React from 'react';
 import { StyleSheet, View } from 'react-native';
-import MapboxGL from '@rnmapbox/maps';
+import Mapbox from '@rnmapbox/maps';
 
-MapboxGL.setAccessToken('<YOUR_ACCESSTOKEN>');
+Mapbox.setAccessToken('<YOUR_ACCESSTOKEN>');
 
 const App = () => {
   return (
     <View style={styles.page}>
       <View style={styles.container}>
-        <MapboxGL.MapView style={styles.map} />
+        <Mapbox.MapView style={styles.map} />
       </View>
     </View>
   );

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

@@ -2,42 +2,31 @@ package com.mapbox.rctmgl.components.camera
 
 import android.animation.Animator
 import android.content.Context
-import com.mapbox.maps.MapView
-import com.mapbox.maps.MapboxMap
 import com.mapbox.rctmgl.utils.GeoJSONUtils.toPointGeometry
 import com.mapbox.rctmgl.utils.GeoJSONUtils.toLatLng
 import com.mapbox.rctmgl.utils.GeoJSONUtils.toLatLngBounds
 import com.mapbox.rctmgl.utils.LatLngBounds
 import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
-import com.mapbox.rctmgl.components.camera.CameraUpdateItem
-import com.mapbox.maps.CameraState
 import com.mapbox.maps.CameraOptions
-import com.mapbox.rctmgl.components.camera.CameraStop
 import com.facebook.react.bridge.ReadableMap
-import com.mapbox.rctmgl.utils.GeoJSONUtils
-import android.util.DisplayMetrics
 import com.mapbox.geojson.FeatureCollection
 import com.mapbox.maps.EdgeInsets
 import com.mapbox.rctmgl.components.camera.constants.CameraMode
 import com.mapbox.rctmgl.utils.LatLng
 
-/*
-import com.mapbox.mapboxsdk.camera.CameraPosition;
-import com.mapbox.mapboxsdk.camera.CameraUpdate;
-import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
-import com.mapbox.mapboxsdk.geometry.LatLng;
-import com.mapbox.mapboxsdk.geometry.LatLngBounds;
-import com.mapbox.mapboxsdk.maps.MapboxMap;
- */   class CameraStop {
+class CameraStop {
     private var mBearing: Double? = null
     private var mTilt: Double? = null
     private var mZoom: Double? = null
+
     private var mLatLng: LatLng? = null
     private var mBounds: LatLngBounds? = null
-    private var mBoundsPaddingLeft : Int? = null
-    private var mBoundsPaddingRight : Int? = null
-    private var mBoundsPaddingBottom : Int? = null
-    private var mBoundsPaddingTop : Int? = null
+
+    private var mPaddingLeft: Int? = null
+    private var mPaddingRight: Int? = null
+    private var mPaddingBottom: Int? = null
+    private var mPaddingTop: Int? = null
+
     private var mMode = CameraMode.EASE
     private var mDuration = 2000
     private var mCallback: Animator.AnimatorListener? = null
@@ -65,6 +54,18 @@ import com.mapbox.mapboxsdk.maps.MapboxMap;
         mCallback = callback
     }
 
+    fun setPadding(
+        paddingLeft: Int?,
+        paddingRight: Int?,
+        paddingTop: Int?,
+        paddingBottom: Int?
+    ) {
+        mPaddingLeft = paddingLeft
+        mPaddingRight = paddingRight
+        mPaddingTop = paddingTop
+        mPaddingBottom = paddingBottom
+    }
+
     fun setBounds(
         bounds: LatLngBounds?,
         paddingLeft: Int?,
@@ -73,21 +74,18 @@ import com.mapbox.mapboxsdk.maps.MapboxMap;
         paddingBottom: Int?
     ) {
         mBounds = bounds
-        mBoundsPaddingLeft = paddingLeft
-        mBoundsPaddingRight = paddingRight
-        mBoundsPaddingTop = paddingTop
-        mBoundsPaddingBottom = paddingBottom
+        this.setPadding(paddingLeft, paddingRight, paddingTop, paddingBottom)
     }
 
     fun setMode(@CameraMode.Mode mode: Int) {
         mMode = mode
     }
 
-    fun convert(value: IntArray): EdgeInsets {
-        val left = value[0].toDouble();
-        val top = value[1].toDouble();
-        val right = value[2].toDouble();
-        val bottom = value[3].toDouble();
+    private fun convert(value: IntArray): EdgeInsets {
+        val left = value[0].toDouble()
+        val top = value[1].toDouble()
+        val right = value[2].toDouble()
+        val bottom = value[3].toDouble()
         return EdgeInsets(
             top, left, bottom, right
         )
@@ -100,7 +98,7 @@ import com.mapbox.mapboxsdk.maps.MapboxMap;
         builder.center(currentCamera.center)
         builder.bearing(currentCamera.bearing)
 
-        val currentPadding = currentCamera.padding;
+        val currentPadding = currentCamera.padding
 
         builder.padding(currentCamera.padding)
         builder.zoom(currentCamera.zoom)
@@ -110,33 +108,39 @@ import com.mapbox.mapboxsdk.maps.MapboxMap;
         if (mTilt != null) {
             builder.pitch(mTilt)
         }
+
+        val paddingLeft: Int = mPaddingLeft ?: currentPadding.left.toInt()
+        val paddingTop: Int = mPaddingTop ?: currentPadding.top.toInt()
+        val paddingRight: Int = mPaddingRight ?: currentPadding.right.toInt()
+        val paddingBottom: Int = mPaddingBottom ?: currentPadding.bottom.toInt()
+        val cameraPadding = intArrayOf(paddingLeft, paddingTop, paddingRight, paddingBottom)
+        val cameraPaddingClipped = clippedPadding(cameraPadding, mapView)
+        val cameraPaddingEdgeInsets = convert(cameraPaddingClipped)
+
         if (mLatLng != null) {
             builder.center(mLatLng!!.point)
+            builder.padding(cameraPaddingEdgeInsets)
         } else if (mBounds != null) {
             val tilt = if (mTilt != null) mTilt!! else currentCamera.pitch
             val bearing = if (mBearing != null) mBearing!! else currentCamera.bearing
 
-            val paddingLeft: Int = mBoundsPaddingLeft ?: currentPadding.left.toInt()
-            val paddingTop: Int = mBoundsPaddingTop ?: currentPadding.top.toInt()
-            val paddingRight: Int = mBoundsPaddingRight ?: currentPadding.right.toInt()
-            val paddingBottom: Int = mBoundsPaddingBottom ?: currentPadding.bottom.toInt()
-
-            val cameraPadding = intArrayOf(paddingLeft, paddingTop, paddingRight, paddingBottom)
-            val cameraPaddingClipped = clippedPadding(cameraPadding, mapView)
             val boundsCamera = map.cameraForCoordinateBounds(
                 mBounds!!.toBounds(),
-                convert(cameraPaddingClipped),
+                cameraPaddingEdgeInsets,
                 bearing,
                 tilt
             )
+
             builder.center(boundsCamera.center)
             builder.anchor(boundsCamera.anchor)
             builder.zoom(boundsCamera.zoom)
             builder.padding(boundsCamera.padding)
         }
+
         if (mZoom != null) {
             builder.zoom(mZoom)
         }
+
         return CameraUpdateItem(map, builder.build(), mDuration, mCallback, mMode)
     }
 
@@ -148,35 +152,44 @@ import com.mapbox.mapboxsdk.maps.MapboxMap;
             callback: Animator.AnimatorListener?
         ): CameraStop {
             val stop = CameraStop()
+
             if (readableMap.hasKey("pitch")) {
                 stop.setTilt(readableMap.getDouble("pitch"))
             }
+
             if (readableMap.hasKey("heading")) {
                 stop.setBearing(readableMap.getDouble("heading"))
             }
+
             if (readableMap.hasKey("centerCoordinate")) {
                 val target = toPointGeometry(readableMap.getString("centerCoordinate"))
                 stop.setLatLng(toLatLng(target!!))
             }
+
             if (readableMap.hasKey("zoom")) {
                 stop.setZoom(readableMap.getDouble("zoom"))
             }
+
             if (readableMap.hasKey("duration")) {
                 stop.setDuration(readableMap.getInt("duration"))
             }
-            if (readableMap.hasKey("bounds")) {
-                val metrics = context.resources.displayMetrics
-                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 metrics = context.resources.displayMetrics
+            val paddingTop = getBoundsPaddingByKey(readableMap, metrics.density, "paddingTop")
+            val paddingRight = getBoundsPaddingByKey(readableMap, metrics.density, "paddingRight")
+            val paddingBottom = getBoundsPaddingByKey(readableMap, metrics.density, "paddingBottom")
+            val paddingLeft = getBoundsPaddingByKey(readableMap, metrics.density, "paddingLeft")
+
+            if (readableMap.hasKey("bounds")) {
                 val collection = FeatureCollection.fromJson(readableMap.getString("bounds")!!)
                 stop.setBounds(
                     toLatLngBounds(collection), paddingLeft, paddingRight,
                     paddingTop, paddingBottom
                 )
+            } else {
+                stop.setPadding(paddingLeft, paddingRight, paddingTop, paddingBottom)
             }
+
             if (readableMap.hasKey("mode")) {
                 when (readableMap.getInt("mode")) {
                     CameraMode.FLIGHT -> stop.setMode(CameraMode.FLIGHT)
@@ -185,7 +198,9 @@ import com.mapbox.mapboxsdk.maps.MapboxMap;
                     else -> stop.setMode(CameraMode.EASE)
                 }
             }
+
             stop.setCallback(callback)
+
             return stop
         }
 
@@ -218,10 +233,10 @@ import com.mapbox.mapboxsdk.maps.MapboxMap;
         }
 
         private fun getBoundsPaddingByKey(map: ReadableMap, density: Float, key: String): Int? {
-            if (map.hasKey(key)) {
-                return (map.getInt(key) * density).toInt()
+            return if (map.hasKey(key)) {
+                (map.getInt(key) * density).toInt()
             } else {
-                return null;
+                null
             }
         }
     }

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/images/RCTMGLImagesManager.kt

@@ -63,9 +63,9 @@ class RCTMGLImagesManager(private val mContext: ReactApplicationContext) :
                 val drawable =
                     ResourceUtils.getDrawableByName(mContext, resourceName) as BitmapDrawable
                 if (drawable != null) {
-                    return NativeImage(name, drawable)
+                    return NativeImage(resourceName, drawable)
                 } else {
-                    Logger.e("RCTMGLImages", "cound not get native drawable with name: $name")
+                    Logger.e("RCTMGLImages", "cound not get native drawable with name: $resourceName")
                     return null
                 }
             }
@@ -98,10 +98,10 @@ class RCTMGLImagesManager(private val mContext: ReactApplicationContext) :
                 }
                 val drawable =
                     ResourceUtils.getDrawableByName(mContext, resourceName) as BitmapDrawable
-                if (drawable != null) {
-                    return NativeImage(name, drawable, scale, sdf, stretchX, stretchY)
+                if (drawable != null && resourceName != null) {
+                    return NativeImage(resourceName, drawable, scale, sdf, stretchX, stretchY)
                 } else {
-                    Logger.e("RCTMGLImages", "cound not get native drawable with name: $name")
+                    Logger.e("RCTMGLImages", "cound not get native drawable with name: $resourceName")
                     return null
                 }
             }

package/ios/RCTMGL-v10/RCMTGLImage.swift

@@ -9,6 +9,7 @@ class RCTMGLImage : UIView {
   var sdf: Bool? = nil
   var stretchX: [[NSNumber]] = []
   var stretchY: [[NSNumber]] = []
+  var content: [NSNumber]? = nil
 
   weak var images: RCTMGLImageSetter? = nil {
     didSet {
@@ -42,7 +43,7 @@ class RCTMGLImage : UIView {
   
   func changeImage(_ image: UIImage, name: String) {
     if let images = images {
-      let _ = images.addImage(name: name, image: image, sdf: sdf, stretchX:stretchX, stretchY:stretchY, log: "RCTMGLImage.addImage")
+      let _ = images.addImage(name: name, image: image, sdf: sdf, stretchX:stretchX, stretchY:stretchY, content:content, log: "RCTMGLImage.addImage")
     }
   }
   

package/ios/RCTMGL-v10/RCTMGLImages.swift

@@ -1,7 +1,7 @@
 import MapboxMaps
 
 protocol RCTMGLImageSetter : AnyObject {
-  func addImage(name: String, image: UIImage, sdf: Bool?, stretchX: [[NSNumber]], stretchY: [[NSNumber]], log: String) -> Bool
+  func addImage(name: String, image: UIImage, sdf: Bool?, stretchX: [[NSNumber]], stretchY: [[NSNumber]], content: [NSNumber]?, log: String) -> Bool
 }
 
 class RCTMGLImages : UIView, RCTMGLMapComponent {
@@ -26,7 +26,7 @@ class RCTMGLImages : UIView, RCTMGLMapComponent {
     }
   };
 
-  typealias NativeImageInfo = (name:String, sdf: Bool, stretchX:[(from:Float, to:Float)], stretchY:[(from:Float, to:Float)]);
+  typealias NativeImageInfo = (name:String, sdf: Bool, stretchX:[(from:Float, to:Float)], stretchY:[(from:Float, to:Float)], content: (left:Float,top:Float,right:Float,bottom:Float)? );
   var nativeImageInfos: [NativeImageInfo] = []
   
   @objc open override func insertReactSubview(_ subview: UIView!, at atIndex: Int) {
@@ -80,14 +80,15 @@ class RCTMGLImages : UIView, RCTMGLMapComponent {
     
     for imageName in remoteImages.keys {
       if style.styleManager.getStyleImage(forImageId: imageName) == nil {
-        try! style.addImage(placeholderImage, id: imageName, stretchX: [], stretchY: [])
-        missingImages[imageName] = remoteImages[imageName]
+        logged("RCTMGLImages.addImagePlaceholder") {
+          try? style.addImage(placeholderImage, id: imageName, stretchX: [], stretchY: [])
+          missingImages[imageName] = remoteImages[imageName]
+        }
       }
     }
     
     if missingImages.count > 0 {
       RCTMGLUtils.fetchImages(bridge, style: style, objects: missingImages, forceUpdate: true, callback: { })
-      
     }
   }
   
@@ -118,19 +119,51 @@ class RCTMGLImages : UIView, RCTMGLMapComponent {
     }
   }
   
-  func convert(stretch: [[NSNumber]]) -> [(from: Float, to: Float)] {
+  static func convert(stretch: [[NSNumber]], scale: Float = 1.0) -> [(from: Float, to: Float)] {
     return stretch.map{ pair in
-      return (from: pair[0].floatValue, to: pair[1].floatValue)
+      return (from: pair[0].floatValue * scale, to: pair[1].floatValue * scale)
     }
   }
   
-  func convert(stretch: [(from: Float, to: Float)]) -> [ImageStretches] {
+  static func convert(stretch: [(from: Float, to: Float)]) -> [ImageStretches] {
     return stretch.map { v in ImageStretches(first: v.from, second: v.to) }
   }
   
+  static func convert(stretch: [[NSNumber]], scale: Float = 1.0) -> [ImageStretches] {
+    return convert(stretch: convert(stretch: stretch, scale: scale))
+  }
+
+  static func convert(content: (left:Float, top:Float, right:Float, bottom:Float)?) -> ImageContent? {
+    guard let content = content else {
+      return nil
+    }
+    
+    return ImageContent(left:content.left, top:content.top, right:content.right, bottom:content.bottom)
+  }
+
+  static func convert(content: [NSNumber]?, scale: Float = 1.0) -> (left:Float,top:Float,right:Float,bottom:Float)? {
+    guard let content = content else {
+      return nil
+    }
+    guard content.count == 4 else {
+      Logger.log(level: .error, message: "Image content should have 4 elements got \(content)")
+      return nil
+    }
+    return (
+      left: content[0].floatValue*scale,
+      top: content[1].floatValue*scale,
+      right: content[2].floatValue*scale,
+      bottom: content[3].floatValue*scale
+    )
+  }
+  
+  static func convert(content: [NSNumber]?, scale: Float = 1.0) -> ImageContent? {
+    return convert(content: convert(content: content, scale: scale))
+  }
+  
   func decodeImage(_ imageNameOrInfo: Any) -> NativeImageInfo? {
     if let imageName = imageNameOrInfo as? String {
-      return (name: imageName, sdf: false, stretchX:[],stretchY:[])
+      return (name: imageName, sdf: false, stretchX:[],stretchY:[],content:nil)
     } else if let imageInfo = imageNameOrInfo as? [String:Any] {
       guard let name = imageInfo["name"] as? String else {
         Logger.log(level: .warn, message: "NativeImage: \(imageInfo) has no name key")
@@ -144,14 +177,19 @@ class RCTMGLImages : UIView, RCTMGLMapComponent {
       }
       
       if let stretchXV = imageInfo["stretchX"] as? [[NSNumber]] {
-        stretchX = convert(stretch: stretchXV)
+        stretchX = RCTMGLImages.convert(stretch: stretchXV)
       }
       
       if let stretchYV = imageInfo["stretchY"] as? [[NSNumber]] {
-        stretchY = convert(stretch: stretchYV)
+        stretchY = RCTMGLImages.convert(stretch: stretchYV)
+      }
+      
+      var content : (left:Float, top:Float, right:Float, bottom:Float)? = nil
+      if let contentV = imageInfo["content"] as? [NSNumber] {
+        content = RCTMGLImages.convert(content: contentV)
       }
       
-      return (name: name, sdf: sdf, stretchX: stretchX, stretchY: stretchY)
+      return (name: name, sdf: sdf, stretchX: stretchX, stretchY: stretchY, content: content)
     } else {
       Logger.log(level: .warn, message: "RCTMGLImage.nativeImage, unexpected image: \(imageNameOrInfo)")
       return nil
@@ -165,8 +203,9 @@ class RCTMGLImages : UIView, RCTMGLMapComponent {
         if let image = UIImage(named: imageName) {
           logged("RCTMGLImage.addNativeImage: \(imageName)") {
             try style.addImage(image, id: imageName, sdf: imageInfo.sdf,
-                               stretchX: convert(stretch: imageInfo.stretchX),
-                               stretchY: convert(stretch: imageInfo.stretchY)
+                               stretchX: RCTMGLImages.convert(stretch: imageInfo.stretchX),
+                               stretchY: RCTMGLImages.convert(stretch: imageInfo.stretchY),
+                               content: RCTMGLImages.convert(content: imageInfo.content)
             )
           }
         } else {
@@ -185,15 +224,16 @@ class RCTMGLImages : UIView, RCTMGLMapComponent {
 }
 
 extension RCTMGLImages : RCTMGLImageSetter {
-  func addImage(name: String, image: UIImage, sdf: Bool?, stretchX: [[NSNumber]], stretchY: [[NSNumber]], log: String) -> Bool
+  func addImage(name: String, image: UIImage, sdf: Bool?, stretchX: [[NSNumber]], stretchY: [[NSNumber]], content: [NSNumber]?, log: String) -> Bool
   {
      return logged("\(log).addImage") {
        if let style = style {
          try style.addImage(image,
                             id:name,
                             sdf: sdf ?? false,
-                            stretchX: convert(stretch: convert(stretch: stretchX)),
-                            stretchY: convert(stretch: convert(stretch: stretchY))
+                            stretchX: RCTMGLImages.convert(stretch: stretchX),
+                            stretchY: RCTMGLImages.convert(stretch: stretchY),
+                            content: RCTMGLImages.convert(content: content)
          )
          return true
        } else {

package/ios/RCTMGL-v10/RCTMGLMapView.swift

@@ -645,7 +645,17 @@ extension RCTMGLMapView: GestureManagerDelegate {
   }
   
   func highestZIndex(sources: [RCTMGLInteractiveElement]) -> RCTMGLInteractiveElement? {
-    return sources.first
+    var layersToSource : [String:RCTMGLInteractiveElement] = [:]
+    
+    sources.forEach { source in
+      source.getLayerIDs().forEach { layerId in
+        if layersToSource[layerId] == nil {
+          layersToSource[layerId] = source
+        }
+      }
+    }
+    let orderedLayers = mapboxMap.style.allLayerIdentifiers
+    return orderedLayers.lazy.reversed().compactMap { layersToSource[$0.id] }.first ?? sources.first
   }
   
   @objc

package/ios/RCTMGL-v10/RCTMGLUtils.swift

@@ -30,9 +30,15 @@ class RCTMGLUtils {
       if (forceUpdate || foundImage == nil) {
         let image = objects[imageName]
         if let image = image as? [String:Any] {
-          let hasScale = image["scale"] != nil
-          let scale = hasScale ? (image["scale"] as! NSNumber).doubleValue : 1.0
-          RCTMGLImageQueue.sharedInstance.addImage(objects[imageName], scale: scale, bridge:bridge) {
+          let scale = (image["scale"] as? NSNumber)?.floatValue ?? 1.0
+          let sdf = (image["sdf"] as? NSNumber)?.boolValue ?? false
+          let imageStretchX = image["stretchX"] as? [[NSNumber]]
+          let stretchX: [ImageStretches] = imageStretchX != nil ? RCTMGLImages.convert(stretch: imageStretchX!, scale: scale) : []
+          let imageStretchY = image["stretchY"] as? [[NSNumber]]
+          let stretchY: [ImageStretches] = imageStretchY != nil ? RCTMGLImages.convert(stretch: imageStretchY!, scale: scale) : []
+          let content: ImageContent? = RCTMGLImages.convert(content: image["content"] as? [NSNumber], scale: scale)
+          
+          RCTMGLImageQueue.sharedInstance.addImage(objects[imageName], scale: Double(scale), bridge:bridge) {
             (error,image) in
             if image == nil {
               RCTMGLLogWarn("Failed to fetch image: \(imageName) error:\(error)")
@@ -40,8 +46,11 @@ class RCTMGLUtils {
             else {
               DispatchQueue.main.async {
                 if let image = image {
-                  try! style.addImage(image, id: imageName, stretchX: [], stretchY: [])
-                  imageLoadedBlock()
+                  logged("RCTMGLUtils.fetchImage-\(imageName)") {
+                    print("width=\(image.size.width) height=\(image.size.height) scale=\(image.scale) scale2=\(scale)")
+                    try style.addImage(image, id: imageName, sdf:sdf, stretchX: stretchX, stretchY: stretchY, content: content)
+                    imageLoadedBlock()
+                  }
                 }
               }
             }

package/javascript/MGLModule.ts

@@ -0,0 +1,54 @@
+import { NativeModules } from 'react-native';
+
+interface MGLModule {
+  StyleURL: {
+    Street: URL;
+    Outdoors: URL;
+    Light: URL;
+    Dark: URL;
+    Satellite: URL;
+    SatelliteStreet: URL;
+  };
+  OfflinePackDownloadState: {
+    Inactive: string | number;
+    Active: string | number;
+    Complete: string | number;
+    Unknown?: string | number;
+  };
+  LineJoin: {
+    Bevel: string | number;
+    Round: string | number;
+    Miter: string | number;
+  };
+  StyleSource: {
+    DefaultSourceID: string;
+  };
+  TileServers: {
+    Mapbox: string;
+  };
+
+  removeCustomHeader(headerName: string): void;
+  addCustomHeader(headerName: string, headerValue: string): void;
+  setAccessToken(accessToken: string | null): Promise<string | null>;
+  setWellKnownTileServer(tileServer: string): void;
+  getAccessToken(): Promise<string>;
+  setTelemetryEnabled(telemetryEnabled: boolean): void;
+  setConnected(connected: boolean): void;
+}
+
+const MGLModule: MGLModule = { ...NativeModules.MGLModule };
+
+export const {
+  StyleURL,
+  OfflinePackDownloadState,
+  LineJoin,
+  StyleSource,
+  TileServers,
+  removeCustomHeader,
+  addCustomHeader,
+  setAccessToken,
+  setWellKnownTileServer,
+  getAccessToken,
+  setTelemetryEnabled,
+  setConnected,
+} = MGLModule;

package/javascript/Mapbox.ts

@@ -0,0 +1,97 @@
+export * from './MGLModule';
+export {
+  Camera,
+  UserTrackingMode,
+  type CameraPadding,
+  type CameraAnimationMode,
+  type CameraBounds,
+} from './components/Camera';
+export { Atmosphere } from './components/Atmosphere';
+export { default as MapView, type MapState } from './components/MapView';
+export { default as Light } from './components/Light';
+export { default as PointAnnotation } from './components/PointAnnotation';
+export { default as Annotation } from './components/Annotation';
+export { default as Callout } from './components/Callout';
+export { default as UserLocation } from './components/UserLocation';
+export { default as VectorSource } from './components/VectorSource';
+export { ShapeSource } from './components/ShapeSource';
+export { default as RasterSource } from './components/RasterSource';
+export { default as RasterDemSource } from './components/RasterDemSource';
+export { default as ImageSource } from './components/ImageSource';
+export { default as Images, type ImageEntry } from './components/Images';
+export { default as Image } from './components/Image';
+export { default as FillLayer } from './components/FillLayer';
+export { default as FillExtrusionLayer } from './components/FillExtrusionLayer';
+export { default as HeatmapLayer } from './components/HeatmapLayer';
+export { default as LineLayer } from './components/LineLayer';
+export { default as CircleLayer } from './components/CircleLayer';
+export { default as SkyLayer } from './components/SkyLayer';
+export { SymbolLayer } from './components/SymbolLayer';
+export { default as RasterLayer } from './components/RasterLayer';
+export { default as BackgroundLayer } from './components/BackgroundLayer';
+export { Terrain } from './components/Terrain';
+export {
+  default as locationManager,
+  type Location,
+} from './modules/location/locationManager';
+export {
+  default as offlineManager,
+  OfflineCreatePackOptions,
+} from './modules/offline/offlineManager';
+export {
+  default as snapshotManager,
+  type SnapshotOptions,
+} from './modules/snapshot/snapshotManager';
+export { default as MarkerView } from './components/MarkerView';
+export { default as Animated } from './utils/animated/Animated';
+export {
+  AnimatedCoordinatesArray,
+  AnimatedExtractCoordinateFromArray,
+  AnimatedPoint,
+  AnimatedRouteCoordinatesArray,
+  AnimatedShape,
+} from './classes';
+export { default as Style } from './components/Style';
+export { default as Logger, type LogLevel } from './utils/Logger';
+export { requestAndroidLocationPermissions } from './requestAndroidLocationPermissions';
+export { getAnnotationsLayerID } from './utils/getAnnotationsLayerID';
+export type {
+  FillLayerStyleProps as FillLayerStyle,
+  LineLayerStyleProps as LineLayerStyle,
+  SymbolLayerStyleProps as SymbolLayerStyle,
+  CircleLayerStyleProps as CircleLayerStyle,
+  HeatmapLayerStyleProps as HeatmapLayerStyle,
+  FillExtrusionLayerStyleProps as FillExtrusionLayerStyle,
+  RasterLayerStyleProps as RasterLayerStyle,
+  HillshadeLayerStyleProps as HillshadeLayerStyle,
+  BackgroundLayerStyleProps as BackgroundLayerStyle,
+  SkyLayerStyleProps as SkyLayerStyle,
+  LightLayerStyleProps as LightLayerStyle,
+  AtmosphereLayerStyleProps as AtmosphereLayerStyle,
+  TerrainLayerStyleProps as TerrainLayerStyle,
+} from './utils/MapboxStyles';
+
+import { deprecatedClass } from './utils/deprecation';
+import { AnimatedPoint } from './classes';
+import { UserTrackingMode } from './components/Camera';
+
+/** @deprecated This will be removed in a future release. Use `AnimatedPoint` instead. */
+export const AnimatedMapPoint = deprecatedClass(
+  AnimatedPoint,
+  'AnimatedMapPoint is deprecated please use AnimatedPoint',
+);
+
+// types:
+export enum StyleURL {
+  Street = 'mapbox://styles/mapbox/streets-v11',
+  Dark = 'mapbox://styles/mapbox/dark-v10',
+  Light = 'mapbox://styles/mapbox/light-v10',
+  Outdoors = 'mapbox://styles/mapbox/outdoors-v11',
+  Satellite = 'mapbox://styles/mapbox/satellite-v9',
+  SatelliteStreet = 'mapbox://styles/mapbox/satellite-streets-v11',
+  TrafficDay = 'mapbox://styles/mapbox/navigation-preview-day-v4',
+  TrafficNight = 'mapbox://styles/mapbox/navigation-preview-night-v4',
+}
+
+/** @deprecated UserTrackingModes is deprecated use UserTrackingMode */
+export const UserTrackingModes = UserTrackingMode;

package/javascript/classes/index.d.ts

@@ -1,5 +1,24 @@
+import { Point } from 'geojson';
+import { Animated } from 'react-native';
+
+import WithAnimatedObject = Animated.WithAnimatedObject;
+
 export class AnimatedCoordinatesArray {}
 export class AnimatedExtractCoordinateFromArray {}
-export class AnimatedPoint {}
+export class AnimatedPoint implements WithAnimatedObject<Point> {
+  constructor(point: Point);
+
+  timing({
+    coordinates,
+    easing,
+    duration,
+  }: {
+    coordinates: number[];
+    easing?: (x: number) => number;
+    duration?: number;
+  });
+
+  stopAnimation();
+}
 export class AnimatedRouteCoordinatesArray {}
 export class AnimatedShape {}