@rnmapbox/maps 10.1.10 → 10.1.12

package/android/src/main/java/com/rnmapbox/rnmbx/components/camera/RNMBXCamera.kt

@@ -113,7 +113,7 @@ class RNMBXCamera(private val mContext: Context, private val mManager: RNMBXCame
         }
     }
     fun setStop(stop: CameraStop) {
-        if (stop.ts != mCameraStop?.ts) {
+        if ((stop.ts != mCameraStop?.ts) || (mCameraStop == null)) {
             mCameraStop = stop
             stop.setCallback(mCameraCallback)
             if (mMapView != null) {
@@ -136,17 +136,17 @@ class RNMBXCamera(private val mContext: Context, private val mManager: RNMBXCame
         _updateViewportState()
     }
 
-    fun setFollowZoomLevel(zoomLevel: Double) {
+    fun setFollowZoomLevel(zoomLevel: Double?) {
         mFollowZoomLevel = zoomLevel
         _updateViewportState();
     }
 
-    fun setFollowPitch(pitch: Double) {
+    fun setFollowPitch(pitch: Double?) {
         mFollowPitch = pitch
         _updateViewportState();
     }
 
-    fun setFollowHeading(heading: Double) {
+    fun setFollowHeading(heading: Double?) {
         mFollowHeading = heading
         _updateViewportState();
     }

package/android/src/main/java/com/rnmapbox/rnmbx/components/camera/RNMBXCameraManager.kt

@@ -10,6 +10,8 @@ import com.rnmapbox.rnmbx.components.AbstractEventEmitter
 import com.rnmapbox.rnmbx.components.camera.CameraStop.Companion.fromReadableMap
 import com.rnmapbox.rnmbx.utils.GeoJSONUtils.toLatLngBounds
 import com.rnmapbox.rnmbx.utils.extensions.asBooleanOrNull
+import com.rnmapbox.rnmbx.utils.extensions.asDoubleOrNull
+import com.rnmapbox.rnmbx.utils.extensions.asStringOrNull
 
 class RNMBXCameraManager(private val mContext: ReactApplicationContext) :
     AbstractEventEmitter<RNMBXCamera?>(
@@ -71,22 +73,22 @@ class RNMBXCameraManager(private val mContext: ReactApplicationContext) :
 
     @ReactProp(name = "followUserMode")
     override fun setFollowUserMode(camera: RNMBXCamera, value: Dynamic) {
-        camera.setFollowUserMode(value.asString())
+        camera.setFollowUserMode(value.asStringOrNull())
     }
 
     @ReactProp(name = "followZoomLevel")
     override fun setFollowZoomLevel(camera: RNMBXCamera, value: Dynamic) {
-        camera.setFollowZoomLevel(value.asDouble())
+        camera.setFollowZoomLevel(value.asDoubleOrNull())
     }
 
     @ReactProp(name = "followPitch")
     override fun setFollowPitch(camera: RNMBXCamera, value: Dynamic) {
-        camera.setFollowPitch(value.asDouble())
+        camera.setFollowPitch(value.asDoubleOrNull())
     }
 
     @ReactProp(name = "followHeading")
     override fun setFollowHeading(camera: RNMBXCamera, value: Dynamic) {
-        camera.setFollowHeading(value.asDouble())
+        camera.setFollowHeading(value.asDoubleOrNull())
     }
 
     @ReactProp(name = "followPadding")

package/android/src/main/java/com/rnmapbox/rnmbx/components/location/RNMBXNativeUserLocation.kt

@@ -46,6 +46,7 @@ enum class RenderMode {
 class RNMBXNativeUserLocation(context: Context) : AbstractMapFeature(context), OnMapReadyCallback, Style.OnStyleLoaded {
     private var mEnabled = true
     private var mMap: MapboxMap? = null
+    private var mMBXMapView: RNMBXMapView? = null
     private var mRenderMode : RenderMode = RenderMode.NORMAL;
     private var mContext : Context = context
 
@@ -63,7 +64,7 @@ class RNMBXNativeUserLocation(context: Context) : AbstractMapFeature(context), O
         SHADOW
     }
 
-    private var imageNames = mutableMapOf<PuckImagePart, String>()
+    private var imageNames = mutableMapOf<PuckImagePart, String?>()
     private var subscriptions = mutableMapOf<PuckImagePart, Subscription>()
     private var images = mutableMapOf<PuckImagePart, ImageHolder>()
 
@@ -98,23 +99,10 @@ class RNMBXNativeUserLocation(context: Context) : AbstractMapFeature(context), O
         }
 
     private fun imageNameUpdated(image: PuckImagePart, name: String?) {
-        if (name != null) {
-            imageNames[image] = name
-        } else {
-            imageNames.remove(image)
-        }
-        subscriptions[image]?.let {
-            it.cancel()
-        }
-        subscriptions.remove(image)
-
-        if (name == null) {
-            imageUpdated(image, null)
-            return
+        imageNames[image] = name
+        mMBXMapView?.let {
+            _fetchImages(it)
         }
-
-        imageManager?.let { subscribe(it, image, name) }
-
     }
 
     private fun imageUpdated(image: PuckImagePart, imageHolder: ImageHolder?) {
@@ -208,6 +196,7 @@ class RNMBXNativeUserLocation(context: Context) : AbstractMapFeature(context), O
         mapView.getMapboxMap()
         mapView.getMapAsync(this)
         mMapView?.locationComponentManager?.showNativeUserLocation(true)
+        mMBXMapView = mapView
         _fetchImages(mapView)
         _apply()
     }
@@ -216,6 +205,7 @@ class RNMBXNativeUserLocation(context: Context) : AbstractMapFeature(context), O
         mEnabled = false
         mMapView?.locationComponentManager?.showNativeUserLocation(false)
         mMap?.getStyle(this)
+        mMBXMapView = null
         return super.removeFromMap(mapView, reason)
     }
 
@@ -244,7 +234,6 @@ class RNMBXNativeUserLocation(context: Context) : AbstractMapFeature(context), O
             subscriptions.remove(image)
             Logger.e("RNMBXNativeUserLocation", "subscribe: there is alread a subscription for image: $image")
         }
-
         subscriptions[image] = imageManager.subscribe(name, Resolver { _, imageData  ->
             imageUpdated(image, imageData.toImageHolder())
         })
@@ -260,19 +249,27 @@ class RNMBXNativeUserLocation(context: Context) : AbstractMapFeature(context), O
     private fun _fetchImages(map: RNMBXMapView) {
         map.mapView?.getMapboxMap()?.getStyle()?.let { style ->
             imageNames.forEach { (part,name) ->
-                if (style.hasStyleImage(name)) {
-                    style.getStyleImage(name)?.let { image ->
-                        images[part] = image.toImageHolder()
+                if (name != null) {
+                    if (style.hasStyleImage(name)) {
+                        style.getStyleImage(name)?.let { image ->
+                            images[part] = image.toImageHolder()
+                        }
+                    } else {
+                        images.remove(part)
                     }
+                } else {
+                    images.remove(part)
                 }
             }
         }
-
         removeSubscriptions()
         val imageManager = map.imageManager
         this.imageManager = imageManager
+        _apply()
         imageNames.forEach { (part,name) ->
-            subscribe(imageManager, part, name)
+            if (name != null) {
+                subscribe(imageManager, part, name)
+            }
         }
     }
     // endregion

package/android/src/main/java/com/rnmapbox/rnmbx/modules/RNMBXOfflineModule.kt

@@ -154,10 +154,9 @@ class RNMBXOfflineModule(private val mReactContext: ReactApplicationContext) :
                 metadata = metadata
             )
             tileRegionPacks[id] = actPack
-            startLoading(pack = actPack)
-            promise.resolve(
+            startLoading(pack = actPack).map {
                 writableMapOf("bounds" to boundsStr, "metadata" to metadataStr)
-            )
+            }.toPromise(promise, "createPack")
         } catch (e: Throwable) {
             promise.reject("createPack", e)
         }
@@ -196,8 +195,7 @@ class RNMBXOfflineModule(private val mReactContext: ReactApplicationContext) :
     fun resumePackDownload(name: String, promise: Promise) {
         val pack = tileRegionPacks[name]
         if (pack != null) {
-            startLoading(pack)
-            promise.resolve(null)
+            startLoading(pack).map { null }.toPromise(promise,"resumePackDownload")
         } else {
             promise.reject("resumePackDownload", "Unknown offline pack: $name")
         }
@@ -271,74 +269,83 @@ class RNMBXOfflineModule(private val mReactContext: ReactApplicationContext) :
     }
     // endregion
 
-    fun startLoading(pack: TileRegionPack) {
-        val id = pack.name
-        val bounds = pack.bounds
-        if (bounds == null) {
-            throw IllegalArgumentException("startLoading failed as there are no bounds in pack")
-        }
-        val zoomRange = pack.zoomRange
-        if (zoomRange == null) {
-            throw IllegalArgumentException("startLoading failed as there is no zoomRange in pack")
-        }
-        val styleURI = pack.styleURI
-        if (styleURI == null) {
-            throw IllegalArgumentException("startLoading failed as there is no styleURI in pack")
-        }
-        val metadata = pack.metadata
-        if (metadata == null) {
-            throw IllegalArgumentException("startLoading failed as there is no metadata in pack")
-        }
-        val stylePackOptions = StylePackLoadOptions.Builder()
-            .glyphsRasterizationMode(GlyphsRasterizationMode.IDEOGRAPHS_RASTERIZED_LOCALLY)
-            .metadata(metadata.toMapboxValue())
-            .build()
-
-        val descriptorOptions = TilesetDescriptorOptions.Builder()
-            .styleURI(styleURI)
-            .minZoom(zoomRange.minZoom)
-            .maxZoom(zoomRange.maxZoom)
-            .stylePackOptions(stylePackOptions)
-            .pixelRatio(2.0f)
-            .build()
-        val tilesetDescriptor = offlineManager.createTilesetDescriptor(descriptorOptions)
-
-        val loadOptions = TileRegionLoadOptions.Builder()
-            .geometry(bounds)
-            .descriptors(arrayListOf(tilesetDescriptor))
-            .metadata(metadata.toMapboxValue())
-            .acceptExpired(true)
-            .networkRestriction(NetworkRestriction.NONE)
-            .averageBytesPerSecond(null)
-            .build()
-
-        var lastProgress: TileRegionLoadProgress? = null
-        val task = this.tileStore.loadTileRegion(
-            id, loadOptions,
-            { progress ->
-                lastProgress = progress
-                tileRegionPacks[id]!!.progress = progress
-                tileRegionPacks[id]!!.state = TileRegionPackState.ACTIVE
-
-                offlinePackProgressDidChange(progress, metadata, TileRegionPackState.ACTIVE)
-            }, { expected ->
-                expected.value?.also {
-                    val progress = lastProgress
-                    if (progress != null) {
-                        offlinePackProgressDidChange(progress, metadata, TileRegionPackState.COMPLETE)
-                    } else {
-                        Logger.w(LOG_TAG, "startLoading: tile region completed, but got no progress information")
-                    }
-                    tileRegionPacks[id]!!.state = TileRegionPackState.COMPLETE
-                } ?: run {
-                    val error = expected.error ?: TileRegionError(TileRegionErrorType.OTHER, "$LOG_TAG neither value nor error in expected")
+    fun startLoading(pack: TileRegionPack): Result<Unit> {
+        try {
+            val id = pack.name
+            val bounds = pack.bounds
+                ?: return Result.failure(IllegalArgumentException("startLoading failed as there are no bounds in pack"))
+            val zoomRange = pack.zoomRange
+                ?: return Result.failure(IllegalArgumentException("startLoading failed as there is no zoomRange in pack"))
+            val styleURI = pack.styleURI
+                ?: return Result.failure(IllegalArgumentException("startLoading failed as there is no styleURI in pack"))
+            val metadata = pack.metadata
+                ?: return Result.failure(IllegalArgumentException("startLoading failed as there is no metadata in pack"))
+
+            val stylePackOptions = StylePackLoadOptions.Builder()
+                .glyphsRasterizationMode(GlyphsRasterizationMode.IDEOGRAPHS_RASTERIZED_LOCALLY)
+                .metadata(metadata.toMapboxValue())
+                .build()
+
+            val descriptorOptions = TilesetDescriptorOptions.Builder()
+                .styleURI(styleURI)
+                .minZoom(zoomRange.minZoom)
+                .maxZoom(zoomRange.maxZoom)
+                .stylePackOptions(stylePackOptions)
+                .pixelRatio(2.0f)
+                .build()
+            val tilesetDescriptor = offlineManager.createTilesetDescriptor(descriptorOptions)
+
+            val loadOptions = TileRegionLoadOptions.Builder()
+                .geometry(bounds)
+                .descriptors(arrayListOf(tilesetDescriptor))
+                .metadata(metadata.toMapboxValue())
+                .acceptExpired(true)
+                .networkRestriction(NetworkRestriction.NONE)
+                .averageBytesPerSecond(null)
+                .build()
+
+            var lastProgress: TileRegionLoadProgress? = null
+            val task = this.tileStore.loadTileRegion(
+                id, loadOptions,
+                { progress ->
+                    lastProgress = progress
+                    tileRegionPacks[id]!!.progress = progress
+                    tileRegionPacks[id]!!.state = TileRegionPackState.ACTIVE
+
+                    offlinePackProgressDidChange(progress, metadata, TileRegionPackState.ACTIVE)
+                },
+                { expected ->
+                    expected.value?.also {
+                        val progress = lastProgress
+                        if (progress != null) {
+                            offlinePackProgressDidChange(
+                                progress,
+                                metadata,
+                                TileRegionPackState.COMPLETE
+                            )
+                        } else {
+                            Logger.w(
+                                LOG_TAG,
+                                "startLoading: tile region completed, but got no progress information"
+                            )
+                        }
+                        tileRegionPacks[id]!!.state = TileRegionPackState.COMPLETE
+                    } ?: run {
+                        val error = expected.error ?: TileRegionError(
+                            TileRegionErrorType.OTHER,
+                            "$LOG_TAG neither value nor error in expected"
+                        )
 
-                    tileRegionPacks[id]!!.state = TileRegionPackState.INACTIVE
-                    offlinePackDidReceiveError(name=id, error=error)
-                }
-            },
-        )
-        tileRegionPacks[id]!!.cancelable = task
+                        tileRegionPacks[id]!!.state = TileRegionPackState.INACTIVE
+                        offlinePackDidReceiveError(name = id, error = error)
+                    }
+                },
+            )
+            tileRegionPacks[id]!!.cancelable = task
+            return Result.success(Unit)
+        } catch (e: Exception) {
+            return Result.failure(e)
+        }
     }
 
     private fun convertRegionsToJSON(tileRegions: List<TileRegion>, promise: Promise) {
@@ -641,6 +648,14 @@ class RNMBXOfflineModule(private val mReactContext: ReactApplicationContext) :
     }
 }
 
+private fun <T> Result<T>.toPromise(promise: Promise, error: String) {
+    val ok = getOrElse {
+        promise.reject(error, exceptionOrNull() ?: Exception("Unknown error"))
+        return@toPromise
+    }
+    promise.resolve(ok)
+}
+
 fun TileRegionLoadProgress.toPercentage(): Double {
     return (completedResourceCount.toDouble() * 100.0) / (requiredResourceCount.toDouble())
 }

package/android/src/main/java/com/rnmapbox/rnmbx/utils/ExpressionParser.java

@@ -6,12 +6,14 @@ import com.facebook.react.bridge.ReadableMap;
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.mapbox.maps.extension.style.expressions.generated.Expression;
+import com.rnmapbox.rnmbx.utils.Logger;
 
 import java.util.Locale;
 
 import javax.annotation.Nullable;
 
 public class ExpressionParser {
+  static final String LOG_TAG = "RNMBXMapView";
   static final String TYPE_STRING = "string";
   static final String TYPE_ARRAY = "array";
   static final String TYPE_NUMBER = "number";
@@ -22,10 +24,14 @@ public class ExpressionParser {
     if (rawExpressions == null || rawExpressions.size() == 0) {
       return null;
     }
-
-    JsonArray array = ConvertUtils.toJsonArray(rawExpressions);
-    String jsonString = new Gson().toJson(array);
-    return Expression.fromRaw(jsonString);
+    try {
+      JsonArray array = ConvertUtils.toJsonArray(rawExpressions);
+      String jsonString = new Gson().toJson(array);
+      return Expression.fromRaw(jsonString);
+    } catch (Exception e) {
+      Logger.e(LOG_TAG, "An error occurred while attempting to parse the expression", e);
+      return null;
+    }
   }
 
   public static @Nullable Expression fromTyped(ReadableMap rawExpressions) {

package/android/src/main/java/com/rnmapbox/rnmbx/utils/Logger.kt

@@ -91,7 +91,7 @@ object Logger {
         }
     }
 
-    fun e(tag: String, msg: String, tr: Throwable) {
+    @JvmStatic fun e(tag: String, msg: String, tr: Throwable) {
         if (logLevel <= Log.ERROR) {
             logger.e(tag, msg, tr)
         }

package/android/src/main/java/com/rnmapbox/rnmbx/utils/extensions/Dynamic.kt

@@ -62,4 +62,20 @@ fun Dynamic.asBooleanOrNull(): Boolean? {
     } else {
         asBoolean()
     }
+}
+
+fun Dynamic.asDoubleOrNull(): Double? {
+    return if (isNull) {
+        null
+    } else {
+        asDouble()
+    }
+}
+
+fun Dynamic.asStringOrNull(): String? {
+    return if (isNull) {
+        null
+    } else {
+        asString()
+    }
 }

package/ios/RNMBX/RNMBXNativeUserLocation.swift

@@ -20,7 +20,7 @@ public class RNMBXNativeUserLocation: UIView, RNMBXMapComponent {
     case shadow
   }
   
-  var imageNames: [PuckImagePart: String] = [:]
+  var imageNames: [PuckImagePart: String?] = [:]
   var subscriptions: [PuckImagePart: ImageManager.Subscription] = [:]
   var images: [PuckImagePart: UIImage] = [:]
   
@@ -63,12 +63,12 @@ public class RNMBXNativeUserLocation: UIView, RNMBXMapComponent {
       switch(value) {
       case "heading":
         _puckBearing = .heading
-      case "coures":
+      case "course":
         _puckBearing = .course
       case nil:
         _puckBearing = nil
       default:
-        Logger.error("RNMBXNativeUserLocation puckBearing is uncrecognized: \(value)")
+        Logger.error("RNMBXNativeUserLocation puckBearing is unrecognized: \(optional: value)")
         _puckBearing = nil
       }
     }
@@ -87,18 +87,8 @@ public class RNMBXNativeUserLocation: UIView, RNMBXMapComponent {
 
   func imageNameUpdated(_ image: PuckImagePart, _ name: String?) {
     imageNames[image] = name
-    if let subscription = subscriptions[image] {
-      subscription.cancel()
-      subscriptions.removeValue(forKey: image)
-    }
-    
-    guard let name = name else {
-      imageUpdated(image, nil)
-      return
-    }
-    
-    if let imageManager = imageManager {
-      subscribe(imageManager, image, name)
+    if let map = self.map {
+      _fetchImages(map)
     }
   }
   
@@ -132,11 +122,11 @@ public class RNMBXNativeUserLocation: UIView, RNMBXMapComponent {
         return Value.constant(0.0)
       }
     default:
-      Logger.error("toDoubleValue: \(name): has unknown type: \(type(of:value)) \(value) ")
+      Logger.error("toDoubleValue: \(name): has unknown type: \(type(of:value)) \(optional: value) ")
       return .constant(1.0)
     }
   }
-  
+
   func _apply() {
     guard let map = self.map else {
       return
@@ -145,10 +135,6 @@ public class RNMBXNativeUserLocation: UIView, RNMBXMapComponent {
       Logger.error("RNMBXNativeUserLocation mapView was nil")
       return
     }
-    _apply(mapView)
-  }
-
-  func _apply(_ mapView: MapView) {
     guard let location = mapView.location else {
       Logger.error("RNMBXNativeUserLocation location was nil")
       return
@@ -195,7 +181,7 @@ public class RNMBXNativeUserLocation: UIView, RNMBXMapComponent {
             pulsingConfig.radius = .constant(radius.doubleValue)
           }
           
-          if let color = pulsing["color"] as? Any {
+          if let color = pulsing["color"] {
             if let uicolor = RCTConvert.uiColor(color) {
               pulsingConfig.color = uicolor
             } else {
@@ -264,8 +250,14 @@ extension RNMBXNativeUserLocation {
   func _fetchImages(_ map: RNMBXMapView) {
     if let style = map.mapView?.mapboxMap?.style {
       imageNames.forEach { (part, name) in
-        if style.imageExists(withId: name), let image = style.image(withId: name) {
-          images[part] = image
+        if let name = name {
+          if style.imageExists(withId: name), let image = style.image(withId: name) {
+            images[part] = image
+          } else {
+            images.removeValue(forKey: part)
+          }
+        } else {
+          images.removeValue(forKey: part)
         }
       }
     }
@@ -274,7 +266,9 @@ extension RNMBXNativeUserLocation {
     removeSubscriptions()
     self.imageManager = imageManager
     imageNames.forEach { (part,name) in
-      subscribe(imageManager, part, name)
+      if let name = name {
+        subscribe(imageManager, part, name)
+      }
     }
   }
 

package/lib/typescript/src/components/AbstractLayer.d.ts

@@ -3,7 +3,7 @@ import { NativeMethods, processColor } from 'react-native';
 import { AllLayerStyleProps, FilterExpression } from '../utils/MapboxStyles';
 import { StyleValue } from '../utils/StyleValue';
 import type { BaseProps } from '../types/BaseProps';
-declare type PropsBase = BaseProps & {
+type PropsBase = BaseProps & {
     id: string;
     existing?: boolean;
     sourceID?: string;

package/lib/typescript/src/components/AbstractLayer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AbstractLayer.d.ts","sourceRoot":"","sources":["../../../../src/components/AbstractLayer.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAG3D,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC7E,OAAO,EAAE,UAAU,EAAkB,MAAM,qBAAqB,CAAC;AACjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,aAAK,SAAS,GAAG,SAAS,GAAG;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,KAAK,CAAC,EAAE,kBAAkB,CAAC;CAC5B,CAAC;AAEF,cAAM,aAAa,CACjB,SAAS,SAAS,SAAS,EAC3B,eAAe,CACf,SAAQ,KAAK,CAAC,aAAa,CAAC,SAAS,CAAC;IACtC,IAAI,SAAS,IAAI,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG;QAC1C,UAAU,CAAC,EAAE;YAAE,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAAA;SAAE,CAAC;KAC5C,CAeA;IAED,WAAW,EACP,CAAC,KAAK,CAAC,SAAS,CAAC,eAAe,CAAC,GAAG,QAAQ,CAAC,aAAa,CAAC,CAAC,GAC5D,IAAI,CAAQ;IAEhB,cAAc,aAER,CAAC,MAAM,SAAS,CAAC,eAAe,CAAC,GAAG,SAAS,aAAa,CAAC,CAAC,GAC5D,IAAI,UAGR;IAEF,qBAAqB,CAAC,SAAS,EAAE,MAAM;IAOvC,QAAQ,CACN,KAAK,EAAE,kBAAkB,GAAG,SAAS,GACpC;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAAA;KAAE,GAAG,SAAS;IAI5C,cAAc,CAAC,KAAK,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE;CAYjD;AAED,eAAe,aAAa,CAAC"}
+{"version":3,"file":"AbstractLayer.d.ts","sourceRoot":"","sources":["../../../../src/components/AbstractLayer.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAG3D,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC7E,OAAO,EAAE,UAAU,EAAkB,MAAM,qBAAqB,CAAC;AACjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,KAAK,SAAS,GAAG,SAAS,GAAG;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,KAAK,CAAC,EAAE,kBAAkB,CAAC;CAC5B,CAAC;AAEF,cAAM,aAAa,CACjB,SAAS,SAAS,SAAS,EAC3B,eAAe,CACf,SAAQ,KAAK,CAAC,aAAa,CAAC,SAAS,CAAC;IACtC,IAAI,SAAS,IAAI,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG;QAC1C,UAAU,CAAC,EAAE;YAAE,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAAA;SAAE,CAAC;KAC5C,CAeA;IAED,WAAW,EACP,CAAC,KAAK,CAAC,SAAS,CAAC,eAAe,CAAC,GAAG,QAAQ,CAAC,aAAa,CAAC,CAAC,GAC5D,IAAI,CAAQ;IAEhB,cAAc,aAER,CAAC,MAAM,SAAS,CAAC,eAAe,CAAC,GAAG,SAAS,aAAa,CAAC,CAAC,GAC5D,IAAI,UAGR;IAEF,qBAAqB,CAAC,SAAS,EAAE,MAAM;IAOvC,QAAQ,CACN,KAAK,EAAE,kBAAkB,GAAG,SAAS,GACpC;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAAA;KAAE,GAAG,SAAS;IAI5C,cAAc,CAAC,KAAK,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE;CAYjD;AAED,eAAe,aAAa,CAAC"}

package/lib/typescript/src/components/Annotation.d.ts

@@ -3,7 +3,7 @@ import { Point } from 'geojson';
 import { AnimatedPoint } from '../classes';
 import { OnPressEvent } from '../types/OnPressEvent';
 import { SymbolLayerStyle } from '../Mapbox';
-declare type Props = {
+type Props = {
     id: string;
     animated?: boolean;
     animationDuration?: number;
@@ -14,7 +14,7 @@ declare type Props = {
     style?: object;
     icon?: string | number | object;
 };
-declare type AnnotationState = {
+type AnnotationState = {
     shape: Point | AnimatedPoint | null;
 };
 declare class Annotation extends React.Component<Props, AnnotationState> {

package/lib/typescript/src/components/Annotation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Annotation.d.ts","sourceRoot":"","sources":["../../../../src/components/Annotation.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAE5C,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAGhC,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAI7C,aAAK,KAAK,GAAG;IACX,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,uBAAuB,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC;IAChD,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAC;IACxC,QAAQ,EAAE,YAAY,GAAG,YAAY,EAAE,CAAC;IACxC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;CACjC,CAAC;AAEF,aAAK,eAAe,GAAG;IACrB,KAAK,EAAE,KAAK,GAAG,aAAa,GAAG,IAAI,CAAC;CACrC,CAAC;AAEF,cAAM,UAAW,SAAQ,KAAK,CAAC,SAAS,CAAC,KAAK,EAAE,eAAe,CAAC;IAC9D,MAAM,CAAC,YAAY;;;;MAIjB;gBAEU,KAAK,EAAE,KAAK;IAYxB,kBAAkB,CAAC,SAAS,EAAE,KAAK;IAqCnC,OAAO,CAAC,KAAK,EAAE,YAAY;IAM3B,kBAAkB,CAAC,KAAK,GAAE,OAAO,CAAC,KAAK,CAAM,GAAG,KAAK;IAMrD,IAAI,WAAW,IAAI,gBAAgB,GAAG,SAAS,CAO9C;IAED,MAAM;CAkCP;AAED,eAAe,UAAU,CAAC"}
+{"version":3,"file":"Annotation.d.ts","sourceRoot":"","sources":["../../../../src/components/Annotation.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAE5C,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAGhC,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAI7C,KAAK,KAAK,GAAG;IACX,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,uBAAuB,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC;IAChD,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAC;IACxC,QAAQ,EAAE,YAAY,GAAG,YAAY,EAAE,CAAC;IACxC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;CACjC,CAAC;AAEF,KAAK,eAAe,GAAG;IACrB,KAAK,EAAE,KAAK,GAAG,aAAa,GAAG,IAAI,CAAC;CACrC,CAAC;AAEF,cAAM,UAAW,SAAQ,KAAK,CAAC,SAAS,CAAC,KAAK,EAAE,eAAe,CAAC;IAC9D,MAAM,CAAC,YAAY;;;;MAIjB;gBAEU,KAAK,EAAE,KAAK;IAYxB,kBAAkB,CAAC,SAAS,EAAE,KAAK;IAqCnC,OAAO,CAAC,KAAK,EAAE,YAAY;IAM3B,kBAAkB,CAAC,KAAK,GAAE,OAAO,CAAC,KAAK,CAAM,GAAG,KAAK;IAMrD,IAAI,WAAW,IAAI,gBAAgB,GAAG,SAAS,CAO9C;IAED,MAAM;CAkCP;AAED,eAAe,UAAU,CAAC"}

package/lib/typescript/src/components/Atmosphere.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import type { AtmosphereLayerStyleProps } from '../utils/MapboxStyles';
 import type { BaseProps } from '../types/BaseProps';
-declare type Props = BaseProps & {
+type Props = BaseProps & {
     style: AtmosphereLayerStyleProps;
 };
 export declare const Atmosphere: React.MemoExoticComponent<(props: Props) => React.JSX.Element>;

package/lib/typescript/src/components/Atmosphere.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Atmosphere.d.ts","sourceRoot":"","sources":["../../../../src/components/Atmosphere.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAwB,MAAM,OAAO,CAAC;AAE7C,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAEvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAGpD,aAAK,KAAK,GAAG,SAAS,GAAG;IACvB,KAAK,EAAE,yBAAyB,CAAC;CAClC,CAAC;AAEF,eAAO,MAAM,UAAU,oCAAgB,KAAK,uBAU1C,CAAC"}
+{"version":3,"file":"Atmosphere.d.ts","sourceRoot":"","sources":["../../../../src/components/Atmosphere.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAwB,MAAM,OAAO,CAAC;AAE7C,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAEvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAGpD,KAAK,KAAK,GAAG,SAAS,GAAG;IACvB,KAAK,EAAE,yBAAyB,CAAC;CAClC,CAAC;AAEF,eAAO,MAAM,UAAU,oCAAgB,KAAK,uBAU1C,CAAC"}

package/lib/typescript/src/components/BackgroundLayer.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 import { FilterExpression, BackgroundLayerStyleProps } from '../utils/MapboxStyles';
 import { StyleValue } from '../utils/StyleValue';
 import AbstractLayer from './AbstractLayer';
-export declare type Props = {
+export type Props = {
     /**
      * A string that uniquely identifies the layer in the style to which it is added.
      */
@@ -50,7 +50,7 @@ export declare type Props = {
      */
     style?: BackgroundLayerStyleProps;
 } & React.ComponentProps<typeof AbstractLayer>;
-declare type NativeTypeProps = Omit<Props, 'style'> & {
+type NativeTypeProps = Omit<Props, 'style'> & {
     reactStyle?: {
         [key: string]: StyleValue;
     };

package/lib/typescript/src/components/BackgroundLayer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BackgroundLayer.d.ts","sourceRoot":"","sources":["../../../../src/components/BackgroundLayer.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,EACL,gBAAgB,EAChB,yBAAyB,EAC1B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAGjD,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAI5C,oBAAY,KAAK,GAAG;IAClB;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;OAEG;IACH,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAE1B;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,KAAK,CAAC,EAAE,yBAAyB,CAAC;CACnC,GAAG,KAAK,CAAC,cAAc,CAAC,OAAO,aAAa,CAAC,CAAC;AAE/C,aAAK,eAAe,GAAG,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,GAAG;IAC5C,UAAU,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAAA;KAAE,CAAC;CAC5C,CAAC;AAEF,cAAM,eAAgB,SAAQ,aAAa,CAAC,KAAK,EAAE,eAAe,CAAC;IACjE,MAAM,CAAC,YAAY;;MAEjB;IAEF,MAAM;CAaP;AAED,eAAe,eAAe,CAAC"}
+{"version":3,"file":"BackgroundLayer.d.ts","sourceRoot":"","sources":["../../../../src/components/BackgroundLayer.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,EACL,gBAAgB,EAChB,yBAAyB,EAC1B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAGjD,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAI5C,MAAM,MAAM,KAAK,GAAG;IAClB;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;OAEG;IACH,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAE1B;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,KAAK,CAAC,EAAE,yBAAyB,CAAC;CACnC,GAAG,KAAK,CAAC,cAAc,CAAC,OAAO,aAAa,CAAC,CAAC;AAE/C,KAAK,eAAe,GAAG,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,GAAG;IAC5C,UAAU,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAAA;KAAE,CAAC;CAC5C,CAAC;AAEF,cAAM,eAAgB,SAAQ,aAAa,CAAC,KAAK,EAAE,eAAe,CAAC;IACjE,MAAM,CAAC,YAAY;;MAEjB;IAEF,MAAM;CAaP;AAED,eAAe,eAAe,CAAC"}

package/lib/typescript/src/components/Callout.d.ts

@@ -1,6 +1,6 @@
 import React, { ReactNode } from 'react';
 import { ViewStyle, ViewProps } from 'react-native';
-declare type Props = Omit<ViewProps, 'style'> & {
+type Props = Omit<ViewProps, 'style'> & {
     /**
      * String that gets displayed in the default callout.
      */

package/lib/typescript/src/components/Callout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Callout.d.ts","sourceRoot":"","sources":["../../../../src/components/Callout.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACzC,OAAO,EAKL,SAAS,EACT,SAAS,EACV,MAAM,cAAc,CAAC;AAwCtB,aAAK,KAAK,GAAG,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG;IACtC;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,KAAK,CAAC,EAAE,SAAS,CAAC;IAElB;;OAEG;IACH,cAAc,CAAC,EAAE,SAAS,CAAC;IAE3B;;OAEG;IACH,YAAY,CAAC,EAAE,SAAS,CAAC;IAEzB;;OAEG;IACH,QAAQ,CAAC,EAAE,SAAS,CAAC;IAErB;;OAEG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB,CAAC;AAEF;;GAEG;AACH,cAAM,OAAQ,SAAQ,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC;IAC9C,IAAI,eAAe,gBAclB;IAED,IAAI,YAAY,YAEf;IAED,qBAAqB,IAAI,SAAS;IAalC,oBAAoB,IAAI,SAAS;IAQjC,MAAM;CAUP;AAED,eAAe,OAAO,CAAC"}
+{"version":3,"file":"Callout.d.ts","sourceRoot":"","sources":["../../../../src/components/Callout.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACzC,OAAO,EAKL,SAAS,EACT,SAAS,EACV,MAAM,cAAc,CAAC;AAwCtB,KAAK,KAAK,GAAG,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG;IACtC;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,KAAK,CAAC,EAAE,SAAS,CAAC;IAElB;;OAEG;IACH,cAAc,CAAC,EAAE,SAAS,CAAC;IAE3B;;OAEG;IACH,YAAY,CAAC,EAAE,SAAS,CAAC;IAEzB;;OAEG;IACH,QAAQ,CAAC,EAAE,SAAS,CAAC;IAErB;;OAEG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB,CAAC;AAEF;;GAEG;AACH,cAAM,OAAQ,SAAQ,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC;IAC9C,IAAI,eAAe,gBAclB;IAED,IAAI,YAAY,YAEf;IAED,qBAAqB,IAAI,SAAS;IAalC,oBAAoB,IAAI,SAAS;IAQjC,MAAM;CAUP;AAED,eAAe,OAAO,CAAC"}