@rnmapbox/maps 10.2.6 → 10.2.8

package/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/StyleFactory.kt

@@ -762,3 +762,48 @@ fun FillExtrusionLayer.fillExtrusionEmissiveStrengthTransition(
 ) {
     // V11 only
 }
+
+// RasterParticleLayer - v11 only
+internal fun setRasterParticleLayerStyle(layer: Any, style: Any) {
+    TODO("RasterParticleLayer is v11 only")
+}
+
+internal fun setVisibility(layer: Any, styleValue: Any) {
+    TODO("RasterParticleLayer is v11 only")
+}
+
+internal fun setRasterParticleArrayBand(layer: Any, styleValue: Any) {
+    TODO("RasterParticleLayer is v11 only")
+}
+
+internal fun setRasterParticleCount(layer: Any, styleValue: Any) {
+    TODO("RasterParticleLayer is v11 only")
+}
+
+internal fun setRasterParticleColor(layer: Any, styleValue: Any) {
+    TODO("RasterParticleLayer is v11 only")
+}
+
+internal fun setRasterParticleMaxSpeed(layer: Any, styleValue: Any) {
+    TODO("RasterParticleLayer is v11 only")
+}
+
+internal fun setRasterParticleSpeedFactor(layer: Any, styleValue: Any) {
+    TODO("RasterParticleLayer is v11 only")
+}
+
+internal fun setRasterParticleSpeedFactorTransition(layer: Any, styleValue: Any) {
+    TODO("RasterParticleLayer is v11 only")
+}
+
+internal fun setRasterParticleFadeOpacityFactor(layer: Any, styleValue: Any) {
+    TODO("RasterParticleLayer is v11 only")
+}
+
+internal fun setRasterParticleFadeOpacityFactorTransition(layer: Any, styleValue: Any) {
+    TODO("RasterParticleLayer is v11 only")
+}
+
+internal fun setRasterParticleResetRateFactor(layer: Any, styleValue: Any) {
+    TODO("RasterParticleLayer is v11 only")
+}

package/android/src/main/mapbox-v11-compat/v11/com/rnmapbox/rnmbx/components/styles/layers/RNMBXRasterParticleLayer.kt

@@ -0,0 +1,38 @@
+package com.rnmapbox.rnmbx.components.styles.layers
+
+import android.content.Context
+import com.mapbox.maps.MapboxExperimental
+import com.mapbox.maps.extension.style.layers.generated.RasterParticleLayer
+import com.rnmapbox.rnmbx.components.styles.RNMBXStyle
+import com.rnmapbox.rnmbx.components.styles.RNMBXStyleFactory
+import com.rnmapbox.rnmbx.utils.Logger
+
+class RNMBXRasterParticleLayer(context: Context?) : RNMBXLayer<RasterParticleLayer?>(
+    context!!
+) {
+    var mSourceLayerID: String? = null
+
+    override fun makeLayer(): RasterParticleLayer {
+        val result = RasterParticleLayer(iD!!, mSourceID!!)
+        mSourceLayerID?.let {
+            result.sourceLayer(it)
+        }
+        return result
+    }
+
+    override fun addStyles() {
+        mLayer?.also {
+            RNMBXStyleFactory.setRasterParticleLayerStyle(it, RNMBXStyle(context, mReactStyle, mMap!!))
+        } ?: run {
+            Logger.e("RNMBXRasterParticleLayer", "mLayer is null")
+        }
+    }
+
+    @OptIn(MapboxExperimental::class)
+    fun setSourceLayerID(sourceLayer: String?) {
+        mSourceLayerID = sourceLayer
+        mLayer?.let {
+            it.sourceLayer(sourceLayer!!)
+        }
+    }
+}

package/android/src/main/mapbox-v11-compat/v11/com/rnmapbox/rnmbx/components/styles/layers/RNMBXRasterParticleLayerManager.kt

@@ -0,0 +1,85 @@
+package com.rnmapbox.rnmbx.components.styles.layers
+
+import com.facebook.react.bridge.Dynamic
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.ViewGroupManager
+import com.facebook.react.uimanager.annotations.ReactProp
+import com.facebook.react.viewmanagers.RNMBXRasterParticleLayerManagerInterface
+
+class RNMBXRasterParticleLayerManager : ViewGroupManager<RNMBXRasterParticleLayer>(),
+    RNMBXRasterParticleLayerManagerInterface<RNMBXRasterParticleLayer> {
+    override fun getName(): String {
+        return REACT_CLASS
+    }
+
+    override fun createViewInstance(reactContext: ThemedReactContext): RNMBXRasterParticleLayer {
+        return RNMBXRasterParticleLayer(reactContext)
+    }
+
+    // @{codepart-replace-start(LayerManagerCommonProps.codepart-kt.ejs,{layerType:"RNMBXRasterParticleLayer"})}
+    @ReactProp(name = "id")
+    override fun setId(layer: RNMBXRasterParticleLayer, id: Dynamic) {
+        layer.iD = id.asString()
+    }
+
+    @ReactProp(name = "existing")
+    override fun setExisting(layer: RNMBXRasterParticleLayer, existing: Dynamic) {
+        layer.setExisting(existing.asBoolean())
+    }
+
+    @ReactProp(name = "sourceID")
+    override fun setSourceID(layer: RNMBXRasterParticleLayer, sourceID: Dynamic) {
+        layer.setSourceID(sourceID.asString())
+    }
+
+    @ReactProp(name = "aboveLayerID")
+    override fun setAboveLayerID(layer: RNMBXRasterParticleLayer, aboveLayerID: Dynamic) {
+        layer.setAboveLayerID(aboveLayerID.asString())
+    }
+
+    @ReactProp(name = "belowLayerID")
+    override fun setBelowLayerID(layer: RNMBXRasterParticleLayer, belowLayerID: Dynamic) {
+        layer.setBelowLayerID(belowLayerID.asString())
+    }
+
+    @ReactProp(name = "layerIndex")
+    override fun setLayerIndex(layer: RNMBXRasterParticleLayer, layerIndex: Dynamic) {
+        layer.setLayerIndex(layerIndex.asInt())
+    }
+
+    @ReactProp(name = "minZoomLevel")
+    override fun setMinZoomLevel(layer: RNMBXRasterParticleLayer, minZoomLevel: Dynamic) {
+        layer.setMinZoomLevel(minZoomLevel.asDouble())
+    }
+
+    @ReactProp(name = "maxZoomLevel")
+    override fun setMaxZoomLevel(layer: RNMBXRasterParticleLayer, maxZoomLevel: Dynamic) {
+        layer.setMaxZoomLevel(maxZoomLevel.asDouble())
+    }
+
+    @ReactProp(name = "reactStyle")
+    override fun setReactStyle(layer: RNMBXRasterParticleLayer, style: Dynamic) {
+        layer.setReactStyle(style.asMap())
+    }
+
+    @ReactProp(name = "sourceLayerID")
+    override fun setSourceLayerID(layer: RNMBXRasterParticleLayer, sourceLayerID: Dynamic) {
+        layer.setSourceLayerID(sourceLayerID.asString())
+    }
+
+    @ReactProp(name = "filter")
+    override fun setFilter(layer: RNMBXRasterParticleLayer, filterList: Dynamic) {
+        layer.setFilter(filterList.asArray())
+    }
+
+    @ReactProp(name = "slot")
+    override fun setSlot(layer: RNMBXRasterParticleLayer, slot: Dynamic) {
+        layer.setSlot(slot.asString())
+    }
+    // @{codepart-replace-end}
+
+    companion object {
+        const val REACT_CLASS = "RNMBXRasterParticleLayer"
+        const val isImplemented = true
+    }
+}

package/android/src/main/mapbox-v11-compat/v11/com/rnmapbox/rnmbx/components/styles/sources/RNMBXRasterArraySource.kt

@@ -0,0 +1,41 @@
+package com.rnmapbox.rnmbx.components.styles.sources
+
+import android.content.Context
+import com.mapbox.maps.extension.style.sources.generated.RasterArraySource
+
+class RNMBXRasterArraySource(context: Context?) : RNMBXTileSource<RasterArraySource?>(context) {
+    private var mTileSize: Int? = null
+    override fun makeSource(): RasterArraySource {
+        val id = iD!!
+        val configurationUrl = uRL
+        val tileSize = if (mTileSize == null) DEFAULT_TILE_SIZE else mTileSize!!
+        return if (configurationUrl != null) {
+            RasterArraySource.Builder(id).url(configurationUrl).tileSize(tileSize.toLong()).build()
+        } else RasterArraySource.Builder(id).tileSet(buildTileset())
+            .tileSize(tileSize.toLong()).build()
+    }
+
+    fun setTileSize(tileSize: Int) {
+        mTileSize = tileSize
+    }
+
+    override fun hasPressListener(): Boolean {
+        return false
+    }
+
+    override fun onPress(feature: OnPressEvent?) {
+        // ignore, cannot query raster array layers
+    }
+
+    override fun hasNoDataSoRefersToExisting(): Boolean {
+        return uRL == null
+    }
+
+    companion object {
+        const val DEFAULT_TILE_SIZE = 512
+    }
+
+    fun setSourceBounds(value: Array<Double>) {
+        bounds = value
+    }
+}

package/android/src/main/mapbox-v11-compat/v11/com/rnmapbox/rnmbx/components/styles/sources/RNMBXRasterArraySourceManager.kt

@@ -0,0 +1,76 @@
+package com.rnmapbox.rnmbx.components.styles.sources
+
+import com.facebook.react.bridge.Dynamic
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.annotations.ReactProp
+import com.facebook.react.viewmanagers.RNMBXRasterArraySourceManagerInterface
+import com.rnmapbox.rnmbx.events.constants.EventKeys
+import com.rnmapbox.rnmbx.events.constants.eventMapOf
+import javax.annotation.Nonnull
+import com.facebook.react.bridge.ReadableType
+import com.rnmapbox.rnmbx.utils.Logger
+
+class RNMBXRasterArraySourceManager(reactApplicationContext: ReactApplicationContext) :
+    RNMBXTileSourceManager<RNMBXRasterArraySource>(reactApplicationContext),
+    RNMBXRasterArraySourceManagerInterface<RNMBXRasterArraySource> {
+    @Nonnull
+    override fun getName(): String {
+        return REACT_CLASS
+    }
+
+    @Nonnull
+    override fun createViewInstance(@Nonnull reactContext: ThemedReactContext): RNMBXRasterArraySource {
+        return RNMBXRasterArraySource(reactContext)
+    }
+
+    @ReactProp(name = "tileSize")
+    override fun setTileSize(source: RNMBXRasterArraySource, tileSize: Dynamic) {
+        source.setTileSize(tileSize.asInt())
+    }
+
+    override fun customEvents(): Map<String, String>? {
+        return eventMapOf(
+            EventKeys.MAP_ANDROID_CALLBACK to "onAndroidCallback"
+        )
+    }
+
+    companion object {
+        const val REACT_CLASS = "RNMBXRasterArraySource"
+        const val isImplemented = true
+    }
+
+    @ReactProp(name = "existing")
+    override fun setExisting(source: RNMBXRasterArraySource, value: Dynamic) {
+        source.mExisting = value.asBoolean()
+    }
+
+    @ReactProp(name = "sourceBounds")
+    override fun setSourceBounds(source: RNMBXRasterArraySource, value: Dynamic) {
+        val array = value.asArray()
+        if (value.type != ReadableType.Array || array == null || array.size() != 4) {
+           Logger.e(REACT_CLASS, "source bounds must be an array with left, bottom, top, and right values")
+           return
+        }
+        val bboxArray = Array(4) { i -> array.getDouble(i) }
+
+        if(!this.validateBbox(bboxArray)){
+            Logger.e(REACT_CLASS, "source bounds contain invalid bbox")
+            return
+        }
+
+        source.setSourceBounds(bboxArray)
+    }
+
+    private fun validateBbox(bbox: Array<Double>): Boolean {
+        if (bbox.size != 4) return false
+
+        val (swLng, swLat, neLng, neLat) = bbox
+
+        val isLngValid = swLng in -180.0..180.0 && neLng in -180.0..180.0
+        val isLatValid = swLat in -90.0..90.0 && neLat in -90.0..90.0
+        val isSouthWestOfNorthEast = swLng < neLng && swLat < neLat
+
+        return isLngValid && isLatValid && isSouthWestOfNorthEast
+    }
+}

package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXRasterArraySourceManagerDelegate.java

@@ -0,0 +1,54 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaDelegate.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import androidx.annotation.Nullable;
+import com.facebook.react.bridge.DynamicFromObject;
+import com.facebook.react.uimanager.BaseViewManager;
+import com.facebook.react.uimanager.BaseViewManagerDelegate;
+import com.facebook.react.uimanager.LayoutShadowNode;
+
+public class RNMBXRasterArraySourceManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & RNMBXRasterArraySourceManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+  public RNMBXRasterArraySourceManagerDelegate(U viewManager) {
+    super(viewManager);
+  }
+  @Override
+  public void setProperty(T view, String propName, @Nullable Object value) {
+    switch (propName) {
+      case "id":
+        mViewManager.setId(view, new DynamicFromObject(value));
+        break;
+      case "existing":
+        mViewManager.setExisting(view, new DynamicFromObject(value));
+        break;
+      case "url":
+        mViewManager.setUrl(view, new DynamicFromObject(value));
+        break;
+      case "tileUrlTemplates":
+        mViewManager.setTileUrlTemplates(view, new DynamicFromObject(value));
+        break;
+      case "minZoomLevel":
+        mViewManager.setMinZoomLevel(view, new DynamicFromObject(value));
+        break;
+      case "maxZoomLevel":
+        mViewManager.setMaxZoomLevel(view, new DynamicFromObject(value));
+        break;
+      case "tileSize":
+        mViewManager.setTileSize(view, new DynamicFromObject(value));
+        break;
+      case "sourceBounds":
+        mViewManager.setSourceBounds(view, new DynamicFromObject(value));
+        break;
+      default:
+        super.setProperty(view, propName, value);
+    }
+  }
+}

package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXRasterArraySourceManagerInterface.java

@@ -0,0 +1,23 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaInterface.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import com.facebook.react.bridge.Dynamic;
+public interface RNMBXRasterArraySourceManagerInterface<T extends View> {
+  void setId(T view, Dynamic value);
+  void setExisting(T view, Dynamic value);
+  void setUrl(T view, Dynamic value);
+  void setTileUrlTemplates(T view, Dynamic value);
+  void setMinZoomLevel(T view, Dynamic value);
+  void setMaxZoomLevel(T view, Dynamic value);
+  void setTileSize(T view, Dynamic value);
+  void setSourceBounds(T view, Dynamic value);
+}

package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXRasterParticleLayerManagerDelegate.java

@@ -0,0 +1,66 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaDelegate.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import androidx.annotation.Nullable;
+import com.facebook.react.bridge.DynamicFromObject;
+import com.facebook.react.uimanager.BaseViewManager;
+import com.facebook.react.uimanager.BaseViewManagerDelegate;
+import com.facebook.react.uimanager.LayoutShadowNode;
+
+public class RNMBXRasterParticleLayerManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & RNMBXRasterParticleLayerManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+  public RNMBXRasterParticleLayerManagerDelegate(U viewManager) {
+    super(viewManager);
+  }
+  @Override
+  public void setProperty(T view, String propName, @Nullable Object value) {
+    switch (propName) {
+      case "sourceID":
+        mViewManager.setSourceID(view, new DynamicFromObject(value));
+        break;
+      case "existing":
+        mViewManager.setExisting(view, new DynamicFromObject(value));
+        break;
+      case "filter":
+        mViewManager.setFilter(view, new DynamicFromObject(value));
+        break;
+      case "aboveLayerID":
+        mViewManager.setAboveLayerID(view, new DynamicFromObject(value));
+        break;
+      case "belowLayerID":
+        mViewManager.setBelowLayerID(view, new DynamicFromObject(value));
+        break;
+      case "layerIndex":
+        mViewManager.setLayerIndex(view, new DynamicFromObject(value));
+        break;
+      case "maxZoomLevel":
+        mViewManager.setMaxZoomLevel(view, new DynamicFromObject(value));
+        break;
+      case "minZoomLevel":
+        mViewManager.setMinZoomLevel(view, new DynamicFromObject(value));
+        break;
+      case "sourceLayerID":
+        mViewManager.setSourceLayerID(view, new DynamicFromObject(value));
+        break;
+      case "slot":
+        mViewManager.setSlot(view, new DynamicFromObject(value));
+        break;
+      case "id":
+        mViewManager.setId(view, new DynamicFromObject(value));
+        break;
+      case "reactStyle":
+        mViewManager.setReactStyle(view, new DynamicFromObject(value));
+        break;
+      default:
+        super.setProperty(view, propName, value);
+    }
+  }
+}

package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXRasterParticleLayerManagerInterface.java

@@ -0,0 +1,27 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaInterface.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import com.facebook.react.bridge.Dynamic;
+public interface RNMBXRasterParticleLayerManagerInterface<T extends View> {
+  void setSourceID(T view, Dynamic value);
+  void setExisting(T view, Dynamic value);
+  void setFilter(T view, Dynamic value);
+  void setAboveLayerID(T view, Dynamic value);
+  void setBelowLayerID(T view, Dynamic value);
+  void setLayerIndex(T view, Dynamic value);
+  void setMaxZoomLevel(T view, Dynamic value);
+  void setMinZoomLevel(T view, Dynamic value);
+  void setSourceLayerID(T view, Dynamic value);
+  void setSlot(T view, Dynamic value);
+  void setId(T view, Dynamic value);
+  void setReactStyle(T view, Dynamic value);
+}

package/ios/RNMBX/CustomHttpHeaders.swift

@@ -1,5 +1,14 @@
 import MapboxMaps
 
+struct CustomHttpHeadersOptions {
+  var urlRegexp: NSRegularExpression?
+}
+
+struct CustomHttpHeadersMapValue {
+  var headerValue: String
+  var options: CustomHttpHeadersOptions
+}
+
 class CustomHttpHeaders : HttpServiceInterceptorInterface {
   #if RNMBX_11
   func onRequest(for request: HttpRequest, continuation: @escaping HttpServiceInterceptorRequestContinuation) {
@@ -18,7 +27,7 @@ class CustomHttpHeaders : HttpServiceInterceptorInterface {
     return headers
   }()
 
-  var customHeaders : [String:String] = [:]
+  var customHeaders : [String:CustomHttpHeadersMapValue] = [:]
 
   func install() {
     #if RNMBX_11
@@ -38,19 +47,39 @@ class CustomHttpHeaders : HttpServiceInterceptorInterface {
   }
 
   // MARK: - HttpServiceInterceptorInterface
+  
+  func getCustomRequestHeaders(for request: HttpRequest, with customHeaders: [String: CustomHttpHeadersMapValue]) -> [String: String] {
+    var headers: [String: String] = [:]
+    let urlString = request.url
 
-  func onRequest(for request: HttpRequest) -> HttpRequest {
-    customHeaders.forEach {(key, value) in
-      request.headers[key] = value
+    for (key, entry) in customHeaders {
+      let options = entry.options
+
+      if let pattern = options.urlRegexp {
+        do {
+          let range = NSRange(location: 0, length: urlString.utf16.count)
+          if pattern.firstMatch(in: urlString, options: [], range: range) != nil {
+            headers[key] = entry.headerValue
+          }
+        }
+      } else {
+        headers[key] = entry.headerValue
+      }
     }
+    return headers
+  }
+
+
+  func onRequest(for request: HttpRequest) -> HttpRequest {
+    let customHeaders = getCustomRequestHeaders(for: request, with: customHeaders)
+    request.headers.merge(customHeaders) { (_, new) in new }
     return request
   }
 
   #if !RNMBX_11
   func onDownload(forDownload download: DownloadOptions) -> DownloadOptions {
-    customHeaders.forEach {(key,value) in
-      download.request.headers[key] = value
-    }
+    let customHeaders = getCustomRequestHeaders(for: download.request, with: customHeaders)
+    download.request.headers.merge(customHeaders) { (_, new) in new }
     return download
   }
   #endif

package/ios/RNMBX/Offline/RNMBXOfflineModuleLegacy.m

@@ -14,6 +14,8 @@ RCT_EXTERN_METHOD(pausePackDownload:(NSString *)name
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 
+RCT_EXTERN_METHOD(setTileCountLimit:(nonnull NSNumber *)limit)
+
 RCT_EXTERN_METHOD(getPackStatus:(NSString *)name
                  resolver:(RCTPromiseResolveBlock)resolve
                  rejecter:(RCTPromiseRejectBlock)reject)

package/ios/RNMBX/Offline/RNMBXOfflineModuleLegacy.swift

@@ -363,6 +363,11 @@ func getRegionByName(name: String, offlineRegions: [OfflineRegion]) -> OfflineRe
     }
   }
 
+  @objc
+  func setTileCountLimit(_ limit: NSNumber) {
+    self.offlineRegionManager.setOfflineMapboxTileCountLimitForLimit(limit.uint64Value)
+  }
+
   @objc
   func resetDatabase(_ resolver: @escaping RCTPromiseResolveBlock,
     rejecter: @escaping RCTPromiseRejectBlock)