@rnmapbox/maps 10.0.0-beta.60 → 10.0.0-beta.61

package/android/rctmgl/build.gradle

@@ -130,7 +130,7 @@ dependencies {
             implementation 'com.mapbox.mapboxsdk:mapbox-sdk-turf:5.1.0'
         }
         else if (safeExtGet("RNMapboxMapsImpl", defaultMapboxMapsImpl) == "mapbox") {
-            implementation 'com.mapbox.maps:android:10.9.1'
+            implementation 'com.mapbox.maps:android:10.10.0'
             implementation 'com.mapbox.mapboxsdk:mapbox-sdk-turf:6.8.0'
             implementation 'androidx.asynclayoutinflater:asynclayoutinflater:1.0.0'
         }

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

@@ -29,6 +29,7 @@ import com.mapbox.maps.extension.style.layers.properties.generated.Visibility
 import com.mapbox.maps.extension.style.projection.generated.Projection
 import com.mapbox.maps.extension.style.projection.generated.setProjection
 import com.mapbox.maps.plugin.annotation.Annotation
+import com.mapbox.maps.plugin.annotation.AnnotationConfig
 import com.mapbox.maps.plugin.annotation.annotations
 import com.mapbox.maps.plugin.annotation.generated.*
 import com.mapbox.maps.plugin.attribution.attribution
@@ -125,7 +126,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
                 gesturesPlugin.removeOnMapClickListener(_this)
                 gesturesPlugin.removeOnMapLongClickListener(_this)
 
-                mPointAnnotationManager = annotations.createPointAnnotationManager()
+                mPointAnnotationManager = annotations.createPointAnnotationManager(AnnotationConfig(layerId = "rctmgl-mapview-annotations"))
                 mPointAnnotationManager?.addClickListener(OnPointAnnotationClickListener { pointAnnotation ->
                         onMarkerClick(pointAnnotation)
                         false

package/index.d.ts

@@ -26,6 +26,7 @@ import type {
   SymbolLayerStyleProps,
   LineLayerStyleProps,
 } from './javascript/utils/MapboxStyles';
+import { getAnnotationsLayerID as _getAnnotationsLayerID } from './javascript/utils/getAnnotationsLayerID';
 import {
   Camera as _Camera,
   CameraStop as _CameraStop,
@@ -144,6 +145,9 @@ declare namespace MapboxGL {
 
   const requestAndroidLocationPermissions = _requestAndroidLocationPermissions;
 
+  const getAnnotationsLayerID = _getAnnotationsLayerID;
+  type getAnnotationsLayerID = _getAnnotationsLayerID;
+
   const Camera = _Camera;
   type Camera = _Camera;
   type CameraStop = _CameraStop;
@@ -944,6 +948,7 @@ export import RasterLayer = MapboxGL.RasterLayer;
 export import BackgroundLayer = MapboxGL.BackgroundLayer;
 export import MarkerView = MapboxGL.MarkerView;
 export import PointAnnotation = MapboxGL.PointAnnotation;
+export import Callout = MapboxGL.Callout;
 
 export import MapboxGLEvent = MapboxGL.MapboxGLEvent;
 export import UserTrackingMode = MapboxGL.UserTrackingMode;
@@ -955,4 +960,6 @@ export import AnimatedShape = MapboxGL.AnimatedShape;
 
 export const { offlineManager } = MapboxGL;
 
+export const { getAnnotationsLayerID } = MapboxGL;
+
 export default MapboxGL;

package/ios/RCTMGL-v10/MGLModule.swift

@@ -52,6 +52,7 @@ class MGLModule : NSObject {
           "RegionDidChange" : RCTMGLEvent.EventType.regionDidChange.rawValue,
           "CameraChanged" : RCTMGLEvent.EventType.cameraChanged.rawValue,
           "MapIdle" : RCTMGLEvent.EventType.mapIdle.rawValue,
+          "WillStartLoadingMap": RCTMGLEvent.EventType.willStartLoadingMap.rawValue,
           "DidFinishLoadingStyle": RCTMGLEvent.EventType.didFinishLoadingStyle.rawValue,
           "DidFinishLoadingMap": RCTMGLEvent.EventType.didFinishLoadingMap.rawValue,
           "DidFinishRenderingFrameFully":  RCTMGLEvent.EventType.didFinishRenderingFully.rawValue,

package/ios/RCTMGL-v10/RCTMGLAtmosphere.swift

@@ -47,14 +47,15 @@ class RCTMGLAtmosphere : RCTMGLSingletonLayer, RCTMGLMapComponent, RCTMGLSourceC
   }
   
   override func addStyles() {
-    if let style : Style = self.style {
+    if let style : Style = self.style,
+       let reactStyle = self.reactStyle {
       let styler = RCTMGLStyle(style: style)
       styler.bridge = self.bridge
       
       if var atmosphere = atmosphere {
         styler.atmosphereLayer(
           layer: &atmosphere,
-          reactStyle: reactStyle ?? [:],
+          reactStyle: reactStyle,
           applyUpdater: { (updater) in fatalError("Atmosphere: TODO - implement apply updater")},
           isValid: { fatalError("Atmosphere: TODO - no isValid") }
         )

package/ios/RCTMGL-v10/RCTMGLCircleLayer.swift

@@ -26,11 +26,11 @@ class RCTMGLCircleLayer: RCTMGLVectorLayer {
   }
 
   override func addStyles() {
-    if let style : Style = self.style {
+    if let style : Style = self.style,
+       let reactStyle = self.reactStyle {
       let styler =  RCTMGLStyle(style: self.style!)
       styler.bridge = self.bridge
-      if var styleLayer = self.styleLayer as? LayerType,
-         let reactStyle = self.reactStyle {
+      if var styleLayer = self.styleLayer as? LayerType {
         styler.circleLayer(
           layer: &styleLayer,
           reactStyle: reactStyle,

package/ios/RCTMGL-v10/RCTMGLEvent.swift

@@ -31,6 +31,7 @@ class RCTMGLEvent : NSObject, RCTMGLEventProtocol {
       case didFinishRenderingFully
       case didFinishRendering
       case didFinishLoadingStyle
+      case willStartLoadingMap
       case offlineProgress
       case offlineError
       case offlineTileLimit

package/ios/RCTMGL-v10/RCTMGLFillExtrustionLayer.swift

@@ -5,7 +5,7 @@ class RCTMGLFillExtrusionLayer: RCTMGLVectorLayer {
   typealias LayerType = FillExtrusionLayer
 
   override func makeLayer(style: Style) throws -> Layer {
-    let vectorSource : VectorSource = try self.layerWithSourceID(in: style)
+    let _ : VectorSource = try self.layerWithSourceID(in: style)
     var layer = LayerType(id: self.id!)
     layer.sourceLayer = self.sourceLayerID
     layer.source = sourceID
@@ -25,11 +25,11 @@ class RCTMGLFillExtrusionLayer: RCTMGLVectorLayer {
   }
 
   override func addStyles() {
-    if let style : Style = self.style {
+    if let style : Style = self.style,
+       let reactStyle = self.reactStyle {
       let styler =  RCTMGLStyle(style: self.style!)
       styler.bridge = self.bridge
-      if var styleLayer = self.styleLayer as? LayerType,
-         let reactStyle = self.reactStyle  {
+      if var styleLayer = self.styleLayer as? LayerType {
         styler.fillExtrusionLayer(
           layer: &styleLayer,
           reactStyle: reactStyle,

package/ios/RCTMGL-v10/RCTMGLFillLayer.swift

@@ -5,7 +5,7 @@ class RCTMGLFillLayer: RCTMGLVectorLayer {
   typealias LayerType = FillLayer
 
   override func makeLayer(style: Style) throws -> Layer {
-    let vectorSource : VectorSource = try self.layerWithSourceID(in: style)
+    let _ : VectorSource = try self.layerWithSourceID(in: style)
     var layer: Layer = FillLayer(id: self.id!)
     
     setOptions(&layer)
@@ -26,14 +26,15 @@ class RCTMGLFillLayer: RCTMGLVectorLayer {
   }
 
   override func addStyles() {
-    if let style : Style = self.style {
+    if let style : Style = self.style,
+       let reactStyle = reactStyle {
       let styler = RCTMGLStyle(style: self.style!)
       styler.bridge = self.bridge
       
       if var styleLayer = self.styleLayer as? FillLayer {
         styler.fillLayer(
           layer: &styleLayer,
-          reactStyle: reactStyle ?? [:],
+          reactStyle: reactStyle,
           applyUpdater: { (updater) in logged("RCTMGLFillLayer.updateLayer") {
             try style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout FillLayer) in updater(&layer) }
           }},

package/ios/RCTMGL-v10/RCTMGLHeatmapLayer.swift

@@ -5,7 +5,7 @@ class RCTMGLHeatmapLayer: RCTMGLVectorLayer {
   typealias LayerType = HeatmapLayer
 
   override func makeLayer(style: Style) throws -> Layer {
-    let vectorSource : VectorSource = try self.layerWithSourceID(in: style)
+    let _ : VectorSource = try self.layerWithSourceID(in: style)
     var layer: Layer = LayerType(id: self.id!)
     
     setOptions(&layer)
@@ -26,14 +26,15 @@ class RCTMGLHeatmapLayer: RCTMGLVectorLayer {
   }
 
   override func addStyles() {
-    if let style : Style = self.style {
-      let styler =  RCTMGLStyle(style: self.style!)
+    if let style : Style = self.style,
+       let reactStyle = reactStyle {
+      let styler =  RCTMGLStyle(style: style)
       styler.bridge = self.bridge
       
       if var styleLayer = self.styleLayer as? HeatmapLayer {
         styler.heatmapLayer(
           layer: &styleLayer,
-          reactStyle: reactStyle!,
+          reactStyle: reactStyle,
           applyUpdater: { (updater) in logged("RCTMGLHeatmapLayer.updateLayer") {
             try style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout HeatmapLayer) in updater(&layer) }
           }},

package/ios/RCTMGL-v10/RCTMGLMapView.swift

@@ -17,6 +17,8 @@ open class RCTMGLMapView : MapView {
   var styleLoaded: Bool = false
   var styleLoadWaiters : [(MapboxMap)->Void] = []
   var onStyleLoadedComponents: [RCTMGLMapComponent] = []
+  
+  var componentsToRefreshOnStyleChange: [RCTMGLMapComponent] = []
 
   weak var reactCamera : RCTMGLCamera?
   var images : [RCTMGLImages] = []
@@ -35,7 +37,7 @@ open class RCTMGLMapView : MapView {
   }()
 
   lazy var calloutAnnotationManager : MapboxMaps.PointAnnotationManager = {
-    return annotations.makePointAnnotationManager(id: "rctmlg-callout")
+    return annotations.makePointAnnotationManager(id: "rctmgl-mapview-callouts")
   }()
   
   var mapView : MapView {
@@ -46,6 +48,7 @@ open class RCTMGLMapView : MapView {
     if let mapComponent = subview as? RCTMGLMapComponent {
       let style = mapView.mapboxMap.style
       if mapComponent.waitForStyleLoad() {
+        componentsToRefreshOnStyleChange.append(mapComponent)
         if (self.styleLoaded) {
           mapComponent.addToMap(self, style: style)
         } else {
@@ -66,6 +69,7 @@ open class RCTMGLMapView : MapView {
     if let mapComponent = subview as? RCTMGLMapComponent {
       if mapComponent.waitForStyleLoad() {
         onStyleLoadedComponents.removeAll { $0 === mapComponent }
+        componentsToRefreshOnStyleChange.removeAll { $0 === mapComponent }
       }
       mapComponent.removeFromMap(self)
     } else {
@@ -273,7 +277,21 @@ open class RCTMGLMapView : MapView {
     self.mapView.gestures.options.pitchEnabled = value
   }
   
+  func refreshComponentsBeforeStyleChange() {
+    componentsToRefreshOnStyleChange.forEach {
+      $0.removeFromMap(self)
+    }
+  }
+  
+  func refreshComponentsAfterStyleChange(style: Style) {
+    componentsToRefreshOnStyleChange.forEach {
+      $0.addToMap(self, style: style)
+    }
+  }
+  
   @objc func setReactStyleURL(_ value: String?) {
+    var initialLoad = !self.styleLoaded
+    if !initialLoad { refreshComponentsBeforeStyleChange() }
     self.styleLoaded = false
     if let value = value {
       if let _ = URL(string: value) {
@@ -283,7 +301,14 @@ open class RCTMGLMapView : MapView {
           mapView.mapboxMap.loadStyleJSON(value)
         }
       }
+      if !initialLoad {
+        self.onNext(event: .styleLoaded) {_,_ in
+          self.refreshComponentsAfterStyleChange(style: self.mapboxMap.style)
+        }
+      }
     }
+    let event = RCTMGLEvent(type:.willStartLoadingMap, payload: nil);
+    self.fireEvent(event: event, callback: self.reactOnMapChange)
   }
 
   private func getOrnamentOptionsFromPosition(_ position: [String: NSNumber]) -> (position: OrnamentPosition, margins: CGPoint)? {
@@ -872,7 +897,7 @@ class PointAnnotationManager : AnnotationInteractionDelegate {
   weak var mapView : MapView? = nil
   
   init(annotations: AnnotationOrchestrator, mapView: MapView) {
-    manager = annotations.makePointAnnotationManager()
+    manager = annotations.makePointAnnotationManager(id: "rctmgl-mapview-point-annotations")
     manager.delegate = self
     self.mapView = mapView
   }

package/ios/RCTMGL-v10/RCTMGLRasterLayer.swift

@@ -20,14 +20,15 @@ class RCTMGLRasterLayer: RCTMGLLayer {
   }
  
   override func addStyles() {
-    if let style : Style = self.style {
+    if let style : Style = self.style,
+       let reactStyle = reactStyle {
       let styler =  RCTMGLStyle(style: self.style!)
       styler.bridge = self.bridge
       
       if var styleLayer = self.styleLayer as? LayerType {
         styler.rasterLayer(
           layer: &styleLayer,
-          reactStyle: reactStyle!,
+          reactStyle: reactStyle,
           applyUpdater:{ (updater) in logged("RCTMGLRasterLayer.updateLayer") {
             try style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout LayerType) in updater(&layer) }
           }},

package/ios/RCTMGL-v10/RCTMGLSymbolLayer.swift

@@ -6,7 +6,7 @@ class RCTMGLSymbolLayer: RCTMGLVectorLayer {
   typealias LayerType = SymbolLayer
 
   override func makeLayer(style: Style) throws -> Layer {
-    let vectorSource : VectorSource = try self.layerWithSourceID(in: style)
+    let _ : VectorSource = try self.layerWithSourceID(in: style)
     var layer = LayerType(id: self.id!)
     layer.sourceLayer = self.sourceLayerID
     layer.source = sourceID

package/ios/RCTMGL-v10/RCTMGLTerrain.swift

@@ -64,14 +64,15 @@ class RCTMGLTerrain : RCTMGLSingletonLayer, RCTMGLMapComponent, RCTMGLSourceCons
   }
   
   override func addStyles() {
-    if let style : Style = self.style {
+    if let style : Style = self.style,
+       let reactStyle = reactStyle {
       let styler = RCTMGLStyle(style: style)
       styler.bridge = self.bridge
       
       if var terrain = terrain {
         styler.terrainLayer(
           layer: &terrain,
-          reactStyle: reactStyle ?? [:],
+          reactStyle: reactStyle,
           applyUpdater: { (updater) in fatalError("Terrain: TODO - implement apply updater")},
           isValid: { fatalError("Terrain: TODO - no isValid") }
         )

package/javascript/index.js

@@ -40,6 +40,7 @@ import Style from './components/Style';
 import Logger from './utils/Logger';
 import { deprecatedClass } from './utils/deprecation';
 import { requestAndroidLocationPermissions } from './requestAndroidLocationPermissions';
+import { getAnnotationsLayerID } from './utils/getAnnotationsLayerID';
 
 const MapboxGL = { ...NativeModules.MGLModule };
 
@@ -107,6 +108,7 @@ MapboxGL.Animated.ExtractCoordinateFromArray =
 
 // utils
 MapboxGL.Logger = Logger;
+MapboxGL.getAnnotationsLayerID = getAnnotationsLayerID;
 
 const { LineJoin } = MapboxGL;
 
@@ -150,6 +152,7 @@ export {
   Animated,
   LineJoin,
   Logger,
+  getAnnotationsLayerID,
   Style,
 };
 

package/javascript/utils/getAnnotationsLayerID.ts

@@ -0,0 +1,16 @@
+import { Platform } from 'react-native';
+
+/*
+ * Retrieve the layer ids used for PointAnnotations and Callouts
+ */
+export const getAnnotationsLayerID = (
+  type: 'PointAnnotations' | 'Callouts',
+) => {
+  return Platform.select({
+    android: 'rctmgl-mapview-annotations',
+    ios: {
+      PointAnnotations: 'rctmgl-mapview-point-annotations',
+      Callouts: 'rctmgl-mapview-callouts',
+    }[type],
+  });
+};

package/lib/commonjs/index.js

@@ -204,6 +204,12 @@ Object.defineProperty(exports, "VectorSource", {
   }
 });
 exports.default = void 0;
+Object.defineProperty(exports, "getAnnotationsLayerID", {
+  enumerable: true,
+  get: function () {
+    return _getAnnotationsLayerID.getAnnotationsLayerID;
+  }
+});
 Object.defineProperty(exports, "locationManager", {
   enumerable: true,
   get: function () {
@@ -257,6 +263,7 @@ var _Style = _interopRequireDefault(require("./components/Style"));
 var _Logger = _interopRequireDefault(require("./utils/Logger"));
 var _deprecation = require("./utils/deprecation");
 var _requestAndroidLocationPermissions = require("./requestAndroidLocationPermissions");
+var _getAnnotationsLayerID = require("./utils/getAnnotationsLayerID");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const MapboxGL = {
   ..._reactNative.NativeModules.MGLModule
@@ -320,6 +327,7 @@ MapboxGL.Animated.ExtractCoordinateFromArray = _classes.AnimatedExtractCoordinat
 
 // utils
 MapboxGL.Logger = _Logger.default;
+MapboxGL.getAnnotationsLayerID = _getAnnotationsLayerID.getAnnotationsLayerID;
 const {
   LineJoin
 } = MapboxGL;

package/lib/commonjs/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["MapboxGL","NativeModules","MGLModule","requestAndroidLocationPermissions","UserTrackingModes","UserTrackingMode","MapView","Light","PointAnnotation","Callout","UserLocation","Camera","Style","AnimatedPoint","AnimatedMapPoint","deprecatedClass","AnimatedShape","AnimatedCoordinatesArray","AnimatedExtractCoordinateFromArray","AnimatedRouteCoordinatesArray","Annotation","MarkerView","VectorSource","ShapeSource","RasterSource","ImageSource","Images","RasterDemSource","FillLayer","FillExtrusionLayer","HeatmapLayer","LineLayer","CircleLayer","SkyLayer","SymbolLayer","RasterLayer","BackgroundLayer","Terrain","Atmosphere","locationManager","offlineManager","snapshotManager","Animated","RouteCoordinatesArray","ExtractCoordinateFromArray","Logger","LineJoin"],"sourceRoot":"../../javascript","sources":["index.js"],"mappings":"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"}
+{"version":3,"names":["MapboxGL","NativeModules","MGLModule","requestAndroidLocationPermissions","UserTrackingModes","UserTrackingMode","MapView","Light","PointAnnotation","Callout","UserLocation","Camera","Style","AnimatedPoint","AnimatedMapPoint","deprecatedClass","AnimatedShape","AnimatedCoordinatesArray","AnimatedExtractCoordinateFromArray","AnimatedRouteCoordinatesArray","Annotation","MarkerView","VectorSource","ShapeSource","RasterSource","ImageSource","Images","RasterDemSource","FillLayer","FillExtrusionLayer","HeatmapLayer","LineLayer","CircleLayer","SkyLayer","SymbolLayer","RasterLayer","BackgroundLayer","Terrain","Atmosphere","locationManager","offlineManager","snapshotManager","Animated","RouteCoordinatesArray","ExtractCoordinateFromArray","Logger","getAnnotationsLayerID","LineJoin"],"sourceRoot":"../../javascript","sources":["index.js"],"mappings":"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"}

package/lib/commonjs/utils/filterUtils.js.map

@@ -1 +1 @@
-{"version":3,"names":["getFilter","filter","Array","isArray","length"],"sourceRoot":"../../javascript","sources":["filterUtils.tsx"],"mappings":";;;;;;AAAO,SAASA,SAAS,CAACC,MAA0B,EAAY;EAC9D,IAAI,CAACC,KAAK,CAACC,OAAO,CAACF,MAAM,CAAC,IAAIA,MAAM,CAACG,MAAM,KAAK,CAAC,EAAE;IACjD,OAAO,EAAE;EACX;EAEA,OAAOH,MAAM;AACf"}
+{"version":3,"names":["getFilter","filter","Array","isArray","length"],"sourceRoot":"../../javascript","sources":["filterUtils.ts"],"mappings":";;;;;;AAAO,SAASA,SAAS,CAACC,MAA0B,EAAY;EAC9D,IAAI,CAACC,KAAK,CAACC,OAAO,CAACF,MAAM,CAAC,IAAIA,MAAM,CAACG,MAAM,KAAK,CAAC,EAAE;IACjD,OAAO,EAAE;EACX;EAEA,OAAOH,MAAM;AACf"}

package/lib/commonjs/utils/getAnnotationsLayerID.js

@@ -0,0 +1,21 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getAnnotationsLayerID = void 0;
+var _reactNative = require("react-native");
+/*
+ * Retrieve the layer ids used for PointAnnotations and Callouts
+ */
+const getAnnotationsLayerID = type => {
+  return _reactNative.Platform.select({
+    android: 'rctmgl-mapview-annotations',
+    ios: {
+      PointAnnotations: 'rctmgl-mapview-point-annotations',
+      Callouts: 'rctmgl-mapview-callouts'
+    }[type]
+  });
+};
+exports.getAnnotationsLayerID = getAnnotationsLayerID;
+//# sourceMappingURL=getAnnotationsLayerID.js.map

package/lib/commonjs/utils/getAnnotationsLayerID.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["getAnnotationsLayerID","type","Platform","select","android","ios","PointAnnotations","Callouts"],"sourceRoot":"../../javascript","sources":["getAnnotationsLayerID.ts"],"mappings":";;;;;;AAAA;AAEA;AACA;AACA;AACO,MAAMA,qBAAqB,GAChCC,IAAqC,IAClC;EACH,OAAOC,qBAAQ,CAACC,MAAM,CAAC;IACrBC,OAAO,EAAE,4BAA4B;IACrCC,GAAG,EAAE;MACHC,gBAAgB,EAAE,kCAAkC;MACpDC,QAAQ,EAAE;IACZ,CAAC,CAACN,IAAI;EACR,CAAC,CAAC;AACJ,CAAC;AAAC"}

package/lib/module/index.js

@@ -33,6 +33,7 @@ import Style from './components/Style';
 import Logger from './utils/Logger';
 import { deprecatedClass } from './utils/deprecation';
 import { requestAndroidLocationPermissions } from './requestAndroidLocationPermissions';
+import { getAnnotationsLayerID } from './utils/getAnnotationsLayerID';
 const MapboxGL = {
   ...NativeModules.MGLModule
 };
@@ -95,11 +96,12 @@ MapboxGL.Animated.ExtractCoordinateFromArray = AnimatedExtractCoordinateFromArra
 
 // utils
 MapboxGL.Logger = Logger;
+MapboxGL.getAnnotationsLayerID = getAnnotationsLayerID;
 const {
   LineJoin
 } = MapboxGL;
 const AnimatedMapPoint = AnimatedPoint; // For backwards compatibiilty.
 
-export { MapView, Light, PointAnnotation, Callout, UserLocation, Camera, Annotation, MarkerView, VectorSource, ShapeSource, RasterSource, RasterDemSource, ImageSource, Images, FillLayer, FillExtrusionLayer, HeatmapLayer, LineLayer, CircleLayer, SkyLayer, SymbolLayer, RasterLayer, BackgroundLayer, Terrain, Atmosphere, AnimatedCoordinatesArray, AnimatedExtractCoordinateFromArray, AnimatedPoint, AnimatedMapPoint, AnimatedRouteCoordinatesArray, AnimatedShape, locationManager, offlineManager, snapshotManager, Animated, LineJoin, Logger, Style };
+export { MapView, Light, PointAnnotation, Callout, UserLocation, Camera, Annotation, MarkerView, VectorSource, ShapeSource, RasterSource, RasterDemSource, ImageSource, Images, FillLayer, FillExtrusionLayer, HeatmapLayer, LineLayer, CircleLayer, SkyLayer, SymbolLayer, RasterLayer, BackgroundLayer, Terrain, Atmosphere, AnimatedCoordinatesArray, AnimatedExtractCoordinateFromArray, AnimatedPoint, AnimatedMapPoint, AnimatedRouteCoordinatesArray, AnimatedShape, locationManager, offlineManager, snapshotManager, Animated, LineJoin, Logger, getAnnotationsLayerID, Style };
 export default MapboxGL;
 //# sourceMappingURL=index.js.map

package/lib/module/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["NativeModules","Camera","UserTrackingMode","Atmosphere","MapView","Light","PointAnnotation","Annotation","Callout","UserLocation","VectorSource","ShapeSource","RasterSource","RasterDemSource","ImageSource","Images","FillLayer","FillExtrusionLayer","HeatmapLayer","LineLayer","CircleLayer","SkyLayer","SymbolLayer","RasterLayer","BackgroundLayer","Terrain","locationManager","offlineManager","snapshotManager","MarkerView","Animated","AnimatedCoordinatesArray","AnimatedExtractCoordinateFromArray","AnimatedPoint","AnimatedRouteCoordinatesArray","AnimatedShape","Style","Logger","deprecatedClass","requestAndroidLocationPermissions","MapboxGL","MGLModule","UserTrackingModes","AnimatedMapPoint","RouteCoordinatesArray","ExtractCoordinateFromArray","LineJoin"],"sourceRoot":"../../javascript","sources":["index.js"],"mappings":"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"}
+{"version":3,"names":["NativeModules","Camera","UserTrackingMode","Atmosphere","MapView","Light","PointAnnotation","Annotation","Callout","UserLocation","VectorSource","ShapeSource","RasterSource","RasterDemSource","ImageSource","Images","FillLayer","FillExtrusionLayer","HeatmapLayer","LineLayer","CircleLayer","SkyLayer","SymbolLayer","RasterLayer","BackgroundLayer","Terrain","locationManager","offlineManager","snapshotManager","MarkerView","Animated","AnimatedCoordinatesArray","AnimatedExtractCoordinateFromArray","AnimatedPoint","AnimatedRouteCoordinatesArray","AnimatedShape","Style","Logger","deprecatedClass","requestAndroidLocationPermissions","getAnnotationsLayerID","MapboxGL","MGLModule","UserTrackingModes","AnimatedMapPoint","RouteCoordinatesArray","ExtractCoordinateFromArray","LineJoin"],"sourceRoot":"../../javascript","sources":["index.js"],"mappings":"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"}

package/lib/module/utils/filterUtils.js.map

@@ -1 +1 @@
-{"version":3,"names":["getFilter","filter","Array","isArray","length"],"sourceRoot":"../../javascript","sources":["filterUtils.tsx"],"mappings":"AAAA,OAAO,SAASA,SAAS,CAACC,MAA0B,EAAY;EAC9D,IAAI,CAACC,KAAK,CAACC,OAAO,CAACF,MAAM,CAAC,IAAIA,MAAM,CAACG,MAAM,KAAK,CAAC,EAAE;IACjD,OAAO,EAAE;EACX;EAEA,OAAOH,MAAM;AACf"}
+{"version":3,"names":["getFilter","filter","Array","isArray","length"],"sourceRoot":"../../javascript","sources":["filterUtils.ts"],"mappings":"AAAA,OAAO,SAASA,SAAS,CAACC,MAA0B,EAAY;EAC9D,IAAI,CAACC,KAAK,CAACC,OAAO,CAACF,MAAM,CAAC,IAAIA,MAAM,CAACG,MAAM,KAAK,CAAC,EAAE;IACjD,OAAO,EAAE;EACX;EAEA,OAAOH,MAAM;AACf"}

package/lib/module/utils/getAnnotationsLayerID.js

@@ -0,0 +1,15 @@
+import { Platform } from 'react-native';
+
+/*
+ * Retrieve the layer ids used for PointAnnotations and Callouts
+ */
+export const getAnnotationsLayerID = type => {
+  return Platform.select({
+    android: 'rctmgl-mapview-annotations',
+    ios: {
+      PointAnnotations: 'rctmgl-mapview-point-annotations',
+      Callouts: 'rctmgl-mapview-callouts'
+    }[type]
+  });
+};
+//# sourceMappingURL=getAnnotationsLayerID.js.map

package/lib/module/utils/getAnnotationsLayerID.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["Platform","getAnnotationsLayerID","type","select","android","ios","PointAnnotations","Callouts"],"sourceRoot":"../../javascript","sources":["getAnnotationsLayerID.ts"],"mappings":"AAAA,SAASA,QAAQ,QAAQ,cAAc;;AAEvC;AACA;AACA;AACA,OAAO,MAAMC,qBAAqB,GAChCC,IAAqC,IAClC;EACH,OAAOF,QAAQ,CAACG,MAAM,CAAC;IACrBC,OAAO,EAAE,4BAA4B;IACrCC,GAAG,EAAE;MACHC,gBAAgB,EAAE,kCAAkC;MACpDC,QAAQ,EAAE;IACZ,CAAC,CAACL,IAAI;EACR,CAAC,CAAC;AACJ,CAAC"}

package/lib/typescript/utils/filterUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filterUtils.d.ts","sourceRoot":"","sources":["../../../javascript/utils/filterUtils.tsx"],"names":[],"mappings":"AAAA,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,GAAG,MAAM,EAAE,CAM9D"}
+{"version":3,"file":"filterUtils.d.ts","sourceRoot":"","sources":["../../../javascript/utils/filterUtils.ts"],"names":[],"mappings":"AAAA,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,GAAG,MAAM,EAAE,CAM9D"}

package/lib/typescript/utils/getAnnotationsLayerID.d.ts

@@ -0,0 +1,2 @@
+export declare const getAnnotationsLayerID: (type: 'PointAnnotations' | 'Callouts') => string | undefined;
+//# sourceMappingURL=getAnnotationsLayerID.d.ts.map

package/lib/typescript/utils/getAnnotationsLayerID.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getAnnotationsLayerID.d.ts","sourceRoot":"","sources":["../../../javascript/utils/getAnnotationsLayerID.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,qBAAqB,SAC1B,kBAAkB,GAAG,UAAU,uBAStC,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rnmapbox/maps",
   "description": "A Mapbox react native module for creating custom maps",
-  "version": "10.0.0-beta.60",
+  "version": "10.0.0-beta.61",
   "publishConfig": {
     "access": "public"
   },
@@ -120,7 +120,7 @@
     "*.{js,jsx,ts,tsx}": "eslint --fix"
   },
   "module": "lib/module/index.js",
-  "types": "lib/typescript/javascript/index.d.ts",
+  "types": "index.d.ts",
   "files": [
     "javascript",
     "lib",

package/plugin/build/withMapbox.d.ts

@@ -13,7 +13,7 @@ export declare function addMapboxInstallerBlock(src: string, blockName: Installe
  * Without this, production builds targeting simulators will fail.
  */
 export declare function setExcludedArchitectures(project: XcodeProject): XcodeProject;
-declare const addMapboxMavenRepo: (projectBuildGradle: string) => string;
+export declare function addMapboxMavenRepo(src: string): string;
 declare const _default: ConfigPlugin<MapboxPlugProps>;
 export default _default;
 export { addMapboxMavenRepo as _addMapboxMavenRepo, };

package/plugin/build/withMapbox.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports._addMapboxMavenRepo = exports.setExcludedArchitectures = exports.addMapboxInstallerBlock = exports.addInstallerBlock = exports.addConstantBlock = exports.applyCocoaPodsModifications = void 0;
+exports._addMapboxMavenRepo = exports.addMapboxMavenRepo = exports.setExcludedArchitectures = exports.addMapboxInstallerBlock = exports.addInstallerBlock = exports.addConstantBlock = exports.applyCocoaPodsModifications = void 0;
 const fs_1 = require("fs");
 const path_1 = __importDefault(require("path"));
 const config_plugins_1 = require("expo/config-plugins");
@@ -208,67 +208,54 @@ const addLibCppFilter = (appBuildGradle) => {
         comment: '//',
     }).contents;
 };
-const addMapboxMavenRepo = (projectBuildGradle) => {
-    if (projectBuildGradle.includes('api.mapbox.com/downloads/v2/releases/maven'))
-        return projectBuildGradle;
-    /*
-    Should look like this:
-    
-    allprojects {
-      configurations.all {
-          resolutionStrategy {
-              force \\"com.facebook.react:react-native:\\" + REACT_NATIVE_VERSION
-          }
+// Because we need the package to be added AFTER the React and Google maven packages, we create a new allprojects.
+// It's ok to have multiple allprojects.repositories, so we create a new one since it's cheaper than tokenizing
+// the existing block to find the correct place to insert our mapbox maven.
+const gradleMaven = `
+allprojects {
+  repositories {
+    maven {
+      url 'https://api.mapbox.com/downloads/v2/releases/maven'
+      authentication { basic(BasicAuthentication) }
+      credentials {
+        username = 'mapbox'
+        password = project.properties['MAPBOX_DOWNLOADS_TOKEN'] ?: ""
       }
-  
-      repositories {
-          maven {
-            url 'https://api.mapbox.com/downloads/v2/releases/maven'
-            authentication { basic(BasicAuthentication) }
-            credentials {
-              username = 'mapbox'
-              password = project.properties['MAPBOX_DOWNLOADS_TOKEN'] ?: ""
-            }
-          }
-          mavenLocal()
-          maven {
-              // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-              url(new File(['node', '--print', \\"require.resolve('react-native/package.json')\\"].execute(null, rootDir).text.trim(), '../android'))
-          }
-          // ...
-    */
-    /*
-      Since mergeContents checks the anchor for each line, we can't do a "correct"
-      RegExp for allprojects...repositories.
-      Instead, we check for the first `allprojects`, and then count the # of lines to the next `repositories` block.
-    */
-    let offset = 0;
-    const anchor = new RegExp(`^\\s*allprojects\\s*{`, 'gm');
-    // hack to count offset
-    const allProjectSplit = projectBuildGradle.split(anchor);
-    if (allProjectSplit.length <= 1)
-        throw new Error('Could not find `allprojects` block');
-    const allProjectLines = allProjectSplit[allProjectSplit.length - 1].split('\n');
-    const allProjectReposOffset = allProjectLines.findIndex((line) => line.includes('repositories'));
-    anchor.lastIndex = 0;
-    offset = allProjectReposOffset + 1;
-    return (0, generateCode_1.mergeContents)({
-        tag: `@rnmapbox/maps-v2-maven`,
-        src: projectBuildGradle,
-        newSrc: `
-        maven {
-          url 'https://api.mapbox.com/downloads/v2/releases/maven'
-          authentication { basic(BasicAuthentication) }
-          credentials {
-            username = 'mapbox'
-            password = project.properties['MAPBOX_DOWNLOADS_TOKEN'] ?: ""
-          }
-        }\n`,
-        anchor,
-        offset,
+    }
+  }
+}
+`;
+// Fork of config-plugins mergeContents, but appends the contents to the end of the file.
+function appendContents({ src, newSrc, tag, comment, }) {
+    const header = (0, generateCode_1.createGeneratedHeaderComment)(newSrc, tag, comment);
+    if (!src.includes(header)) {
+        // Ensure the old generated contents are removed.
+        const sanitizedTarget = (0, generateCode_1.removeGeneratedContents)(src, tag);
+        const contentsToAdd = [
+            // @something
+            header,
+            // contents
+            newSrc,
+            // @end
+            `${comment} @generated end ${tag}`,
+        ].join('\n');
+        return {
+            contents: sanitizedTarget ?? src + contentsToAdd,
+            didMerge: true,
+            didClear: !!sanitizedTarget,
+        };
+    }
+    return { contents: src, didClear: false, didMerge: false };
+}
+function addMapboxMavenRepo(src) {
+    return appendContents({
+        tag: '@rnmapbox/maps-v2-maven',
+        src,
+        newSrc: gradleMaven,
         comment: '//',
     }).contents;
-};
+}
+exports.addMapboxMavenRepo = addMapboxMavenRepo;
 exports._addMapboxMavenRepo = addMapboxMavenRepo;
 const withAndroidAppGradle = (config) => {
     return (0, config_plugins_1.withAppBuildGradle)(config, ({ modResults, ...config }) => {

package/plugin/src/withMapbox.ts

@@ -13,7 +13,12 @@ import {
   withAppBuildGradle,
 } from 'expo/config-plugins';
 
-import { mergeContents, removeGeneratedContents } from './generateCode';
+import {
+  mergeContents,
+  createGeneratedHeaderComment,
+  removeGeneratedContents,
+  MergeResults,
+} from './generateCode';
 
 let pkg: { name: string; version?: string } = {
   name: '@rnmapbox/maps',
@@ -266,74 +271,66 @@ const addLibCppFilter = (appBuildGradle: string): string => {
   }).contents;
 };
 
-const addMapboxMavenRepo = (projectBuildGradle: string): string => {
-  if (projectBuildGradle.includes('api.mapbox.com/downloads/v2/releases/maven'))
-    return projectBuildGradle;
-
-  /*
-  Should look like this:
-  
-  allprojects {
-    configurations.all {
-        resolutionStrategy {
-            force \\"com.facebook.react:react-native:\\" + REACT_NATIVE_VERSION
-        }
+// Because we need the package to be added AFTER the React and Google maven packages, we create a new allprojects.
+// It's ok to have multiple allprojects.repositories, so we create a new one since it's cheaper than tokenizing
+// the existing block to find the correct place to insert our mapbox maven.
+const gradleMaven = `
+allprojects {
+  repositories {
+    maven {
+      url 'https://api.mapbox.com/downloads/v2/releases/maven'
+      authentication { basic(BasicAuthentication) }
+      credentials {
+        username = 'mapbox'
+        password = project.properties['MAPBOX_DOWNLOADS_TOKEN'] ?: ""
+      }
     }
+  }
+}
+`;
+
+// Fork of config-plugins mergeContents, but appends the contents to the end of the file.
+function appendContents({
+  src,
+  newSrc,
+  tag,
+  comment,
+}: {
+  src: string;
+  newSrc: string;
+  tag: string;
+  comment: string;
+}): MergeResults {
+  const header = createGeneratedHeaderComment(newSrc, tag, comment);
+  if (!src.includes(header)) {
+    // Ensure the old generated contents are removed.
+    const sanitizedTarget = removeGeneratedContents(src, tag);
+    const contentsToAdd = [
+      // @something
+      header,
+      // contents
+      newSrc,
+      // @end
+      `${comment} @generated end ${tag}`,
+    ].join('\n');
+
+    return {
+      contents: sanitizedTarget ?? src + contentsToAdd,
+      didMerge: true,
+      didClear: !!sanitizedTarget,
+    };
+  }
+  return { contents: src, didClear: false, didMerge: false };
+}
 
-    repositories {
-        maven {
-          url 'https://api.mapbox.com/downloads/v2/releases/maven'
-          authentication { basic(BasicAuthentication) }
-          credentials {
-            username = 'mapbox'
-            password = project.properties['MAPBOX_DOWNLOADS_TOKEN'] ?: ""
-          }
-        }
-        mavenLocal()
-        maven {
-            // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-            url(new File(['node', '--print', \\"require.resolve('react-native/package.json')\\"].execute(null, rootDir).text.trim(), '../android'))
-        }
-        // ...
-  */
-
-  /*
-    Since mergeContents checks the anchor for each line, we can't do a "correct"
-    RegExp for allprojects...repositories.
-    Instead, we check for the first `allprojects`, and then count the # of lines to the next `repositories` block.
-  */
-  let offset = 0;
-  const anchor = new RegExp(`^\\s*allprojects\\s*{`, 'gm');
-  // hack to count offset
-  const allProjectSplit = projectBuildGradle.split(anchor);
-  if (allProjectSplit.length <= 1)
-    throw new Error('Could not find `allprojects` block');
-
-  const allProjectLines =
-    allProjectSplit[allProjectSplit.length - 1].split('\n');
-  const allProjectReposOffset = allProjectLines.findIndex((line) =>
-    line.includes('repositories'),
-  );
-  anchor.lastIndex = 0;
-  offset = allProjectReposOffset + 1;
-
-  return mergeContents({
-    tag: `@rnmapbox/maps-v2-maven`,
-    src: projectBuildGradle,
-    newSrc: `
-        maven {
-          url 'https://api.mapbox.com/downloads/v2/releases/maven'
-          authentication { basic(BasicAuthentication) }
-          credentials {
-            username = 'mapbox'
-            password = project.properties['MAPBOX_DOWNLOADS_TOKEN'] ?: ""
-          }
-        }\n`,
-    anchor,
-    offset,
+export function addMapboxMavenRepo(src: string): string {
+  return appendContents({
+    tag: '@rnmapbox/maps-v2-maven',
+    src,
+    newSrc: gradleMaven,
     comment: '//',
   }).contents;
-};
+}
 
 const withAndroidAppGradle: ConfigPlugin<MapboxPlugProps> = (config) => {
   return withAppBuildGradle(config, ({ modResults, ...config }) => {

package/rnmapbox-maps.podspec

@@ -20,7 +20,7 @@ require 'json'
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
 
 ## Warning: these lines are scanned by autogenerate.js
-rnMapboxMapsDefaultMapboxVersion = '~> 10.9.1'
+rnMapboxMapsDefaultMapboxVersion = '~> 10.10.0'
 rnMapboxMapsDefaultMapboxGLVersion = '~> 5.9.0'
 rnMapboxMapsDefaultMapLibreVersion = 'exactVersion 5.12.1'