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

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-mapboxgl/common/com/mapbox/rctmgl/components/styles/RCTMGLStyleFactory.java

@@ -80,9 +80,6 @@ public class RCTMGLStyleFactory {
                   }
               });
               break;
-            case "fillPatternTransition":
-              RCTMGLStyleFactory.setFillPatternTransition(layer, styleValue);
-              break;
         }
       }
     }
@@ -163,9 +160,6 @@ public class RCTMGLStyleFactory {
             case "lineDasharray":
               RCTMGLStyleFactory.setLineDasharray(layer, styleValue);
               break;
-            case "lineDasharrayTransition":
-              RCTMGLStyleFactory.setLineDasharrayTransition(layer, styleValue);
-              break;
             case "linePattern":
               style.addImage(styleValue, new DownloadMapImageTask.OnAllImagesLoaded() {
                   @Override
@@ -174,9 +168,6 @@ public class RCTMGLStyleFactory {
                   }
               });
               break;
-            case "linePatternTransition":
-              RCTMGLStyleFactory.setLinePatternTransition(layer, styleValue);
-              break;
             case "lineGradient":
               RCTMGLStyleFactory.setLineGradient(layer, styleValue);
               break;
@@ -564,9 +555,6 @@ public class RCTMGLStyleFactory {
                   }
               });
               break;
-            case "fillExtrusionPatternTransition":
-              RCTMGLStyleFactory.setFillExtrusionPatternTransition(layer, styleValue);
-              break;
             case "fillExtrusionHeight":
               RCTMGLStyleFactory.setFillExtrusionHeight(layer, styleValue);
               break;
@@ -719,9 +707,6 @@ public class RCTMGLStyleFactory {
                   }
               });
               break;
-            case "backgroundPatternTransition":
-              RCTMGLStyleFactory.setBackgroundPatternTransition(layer, styleValue);
-              break;
             case "backgroundOpacity":
               RCTMGLStyleFactory.setBackgroundOpacity(layer, styleValue);
               break;
@@ -871,14 +856,6 @@ public class RCTMGLStyleFactory {
       }
     }
 
-
-    public static void setFillPatternTransition(FillLayer layer, RCTMGLStyleValue styleValue) {
-      TransitionOptions transition = styleValue.getTransition();
-      if (transition != null) {
-        layer.setFillPatternTransition(transition);
-      }
-    }
-
     public static void setLineCap(LineLayer layer, RCTMGLStyleValue styleValue) {
       if (styleValue.isExpression()) {
         layer.setProperties(PropertyFactory.lineCap(styleValue.getExpression()));
@@ -1051,14 +1028,6 @@ public class RCTMGLStyleFactory {
       }
     }
 
-
-    public static void setLineDasharrayTransition(LineLayer layer, RCTMGLStyleValue styleValue) {
-      TransitionOptions transition = styleValue.getTransition();
-      if (transition != null) {
-        layer.setLineDasharrayTransition(transition);
-      }
-    }
-
     public static void setLinePattern(LineLayer layer, RCTMGLStyleValue styleValue) {
       if (styleValue.isExpression()) {
         if (styleValue.isImageStringValue()) {
@@ -1071,14 +1040,6 @@ public class RCTMGLStyleFactory {
       }
     }
 
-
-    public static void setLinePatternTransition(LineLayer layer, RCTMGLStyleValue styleValue) {
-      TransitionOptions transition = styleValue.getTransition();
-      if (transition != null) {
-        layer.setLinePatternTransition(transition);
-      }
-    }
-
     public static void setLineGradient(LineLayer layer, RCTMGLStyleValue styleValue) {
       if (styleValue.isExpression()) {
         layer.setProperties(PropertyFactory.lineGradient(styleValue.getExpression()));
@@ -1927,14 +1888,6 @@ public class RCTMGLStyleFactory {
       }
     }
 
-
-    public static void setFillExtrusionPatternTransition(FillExtrusionLayer layer, RCTMGLStyleValue styleValue) {
-      TransitionOptions transition = styleValue.getTransition();
-      if (transition != null) {
-        layer.setFillExtrusionPatternTransition(transition);
-      }
-    }
-
     public static void setFillExtrusionHeight(FillExtrusionLayer layer, RCTMGLStyleValue styleValue) {
       if (styleValue.isExpression()) {
         layer.setProperties(PropertyFactory.fillExtrusionHeight(styleValue.getExpression()));
@@ -2207,14 +2160,6 @@ public class RCTMGLStyleFactory {
       }
     }
 
-
-    public static void setBackgroundPatternTransition(BackgroundLayer layer, RCTMGLStyleValue styleValue) {
-      TransitionOptions transition = styleValue.getTransition();
-      if (transition != null) {
-        layer.setBackgroundPatternTransition(transition);
-      }
-    }
-
     public static void setBackgroundOpacity(BackgroundLayer layer, RCTMGLStyleValue styleValue) {
       if (styleValue.isExpression()) {
         layer.setProperties(PropertyFactory.backgroundOpacity(styleValue.getExpression()));

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/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/styles/RCTMGLStyleFactory.java

@@ -91,9 +91,6 @@ public class RCTMGLStyleFactory {
                   }
               });
               break;
-            case "fillPatternTransition":
-              RCTMGLStyleFactory.setFillPatternTransition(layer, styleValue);
-              break;
         }
       }
     }
@@ -174,9 +171,6 @@ public class RCTMGLStyleFactory {
             case "lineDasharray":
               RCTMGLStyleFactory.setLineDasharray(layer, styleValue);
               break;
-            case "lineDasharrayTransition":
-              RCTMGLStyleFactory.setLineDasharrayTransition(layer, styleValue);
-              break;
             case "linePattern":
               style.addImage(styleValue, new DownloadMapImageTask.OnAllImagesLoaded() {
                   @Override
@@ -189,9 +183,6 @@ public class RCTMGLStyleFactory {
                   }
               });
               break;
-            case "linePatternTransition":
-              RCTMGLStyleFactory.setLinePatternTransition(layer, styleValue);
-              break;
             case "lineGradient":
               RCTMGLStyleFactory.setLineGradient(layer, styleValue);
               break;
@@ -593,9 +584,6 @@ public class RCTMGLStyleFactory {
                   }
               });
               break;
-            case "fillExtrusionPatternTransition":
-              RCTMGLStyleFactory.setFillExtrusionPatternTransition(layer, styleValue);
-              break;
             case "fillExtrusionHeight":
               RCTMGLStyleFactory.setFillExtrusionHeight(layer, styleValue);
               break;
@@ -752,9 +740,6 @@ public class RCTMGLStyleFactory {
                   }
               });
               break;
-            case "backgroundPatternTransition":
-              RCTMGLStyleFactory.setBackgroundPatternTransition(layer, styleValue);
-              break;
             case "backgroundOpacity":
               RCTMGLStyleFactory.setBackgroundOpacity(layer, styleValue);
               break;
@@ -1018,14 +1003,6 @@ public class RCTMGLStyleFactory {
       }
     }
 
-
-    public static void setFillPatternTransition(FillLayer layer, RCTMGLStyleValue styleValue) {
-      StyleTransition transition = styleValue.getTransition();
-      if (transition != null) {
-        layer.fillPatternTransition(transition);
-      }
-    }
-
     public static void setLineCap(LineLayer layer, RCTMGLStyleValue styleValue) {
       if (styleValue.isExpression()) {
         layer.lineCap(styleValue.getExpression());
@@ -1198,14 +1175,6 @@ public class RCTMGLStyleFactory {
       }
     }
 
-
-    public static void setLineDasharrayTransition(LineLayer layer, RCTMGLStyleValue styleValue) {
-      StyleTransition transition = styleValue.getTransition();
-      if (transition != null) {
-        layer.lineDasharrayTransition(transition);
-      }
-    }
-
     public static void setLinePattern(LineLayer layer, RCTMGLStyleValue styleValue) {
       if (styleValue.isExpression()) {
         if (styleValue.isImageStringValue()) {
@@ -1218,14 +1187,6 @@ public class RCTMGLStyleFactory {
       }
     }
 
-
-    public static void setLinePatternTransition(LineLayer layer, RCTMGLStyleValue styleValue) {
-      StyleTransition transition = styleValue.getTransition();
-      if (transition != null) {
-        layer.linePatternTransition(transition);
-      }
-    }
-
     public static void setLineGradient(LineLayer layer, RCTMGLStyleValue styleValue) {
       if (styleValue.isExpression()) {
         layer.lineGradient(styleValue.getExpression());
@@ -2090,14 +2051,6 @@ public class RCTMGLStyleFactory {
       }
     }
 
-
-    public static void setFillExtrusionPatternTransition(FillExtrusionLayer layer, RCTMGLStyleValue styleValue) {
-      StyleTransition transition = styleValue.getTransition();
-      if (transition != null) {
-        layer.fillExtrusionPatternTransition(transition);
-      }
-    }
-
     public static void setFillExtrusionHeight(FillExtrusionLayer layer, RCTMGLStyleValue styleValue) {
       if (styleValue.isExpression()) {
         layer.fillExtrusionHeight(styleValue.getExpression());
@@ -2370,14 +2323,6 @@ public class RCTMGLStyleFactory {
       }
     }
 
-
-    public static void setBackgroundPatternTransition(BackgroundLayer layer, RCTMGLStyleValue styleValue) {
-      StyleTransition transition = styleValue.getTransition();
-      if (transition != null) {
-        layer.backgroundPatternTransition(transition);
-      }
-    }
-
     public static void setBackgroundOpacity(BackgroundLayer layer, RCTMGLStyleValue styleValue) {
       if (styleValue.isExpression()) {
         layer.backgroundOpacity(styleValue.getExpression());

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/RCTMGLStyle.h

@@ -38,7 +38,6 @@
 - (void)setFillTranslateTransition:(MGLFillStyleLayer *)layer withReactStyleValue:(RCTMGLStyleValue *)styleValue;
 - (void)setFillTranslateAnchor:(MGLFillStyleLayer *)layer withReactStyleValue:(RCTMGLStyleValue *)styleValue;
 - (void)setFillPattern:(MGLFillStyleLayer *)layer withReactStyleValue:(RCTMGLStyleValue *)styleValue;
-- (void)setFillPatternTransition:(MGLFillStyleLayer *)layer withReactStyleValue:(RCTMGLStyleValue *)styleValue;
 - (void)setLineCap:(MGLLineStyleLayer *)layer withReactStyleValue:(RCTMGLStyleValue *)styleValue;
 - (void)setLineJoin:(MGLLineStyleLayer *)layer withReactStyleValue:(RCTMGLStyleValue *)styleValue;
 - (void)setLineMiterLimit:(MGLLineStyleLayer *)layer withReactStyleValue:(RCTMGLStyleValue *)styleValue;
@@ -61,9 +60,7 @@
 - (void)setLineBlur:(MGLLineStyleLayer *)layer withReactStyleValue:(RCTMGLStyleValue *)styleValue;
 - (void)setLineBlurTransition:(MGLLineStyleLayer *)layer withReactStyleValue:(RCTMGLStyleValue *)styleValue;
 - (void)setLineDasharray:(MGLLineStyleLayer *)layer withReactStyleValue:(RCTMGLStyleValue *)styleValue;
-- (void)setLineDasharrayTransition:(MGLLineStyleLayer *)layer withReactStyleValue:(RCTMGLStyleValue *)styleValue;
 - (void)setLinePattern:(MGLLineStyleLayer *)layer withReactStyleValue:(RCTMGLStyleValue *)styleValue;
-- (void)setLinePatternTransition:(MGLLineStyleLayer *)layer withReactStyleValue:(RCTMGLStyleValue *)styleValue;
 - (void)setLineGradient:(MGLLineStyleLayer *)layer withReactStyleValue:(RCTMGLStyleValue *)styleValue;
 - (void)setSymbolPlacement:(MGLSymbolStyleLayer *)layer withReactStyleValue:(RCTMGLStyleValue *)styleValue;
 - (void)setSymbolSpacing:(MGLSymbolStyleLayer *)layer withReactStyleValue:(RCTMGLStyleValue *)styleValue;
@@ -171,7 +168,6 @@
 - (void)setFillExtrusionTranslateTransition:(MGLFillExtrusionStyleLayer *)layer withReactStyleValue:(RCTMGLStyleValue *)styleValue;
 - (void)setFillExtrusionTranslateAnchor:(MGLFillExtrusionStyleLayer *)layer withReactStyleValue:(RCTMGLStyleValue *)styleValue;
 - (void)setFillExtrusionPattern:(MGLFillExtrusionStyleLayer *)layer withReactStyleValue:(RCTMGLStyleValue *)styleValue;
-- (void)setFillExtrusionPatternTransition:(MGLFillExtrusionStyleLayer *)layer withReactStyleValue:(RCTMGLStyleValue *)styleValue;
 - (void)setFillExtrusionHeight:(MGLFillExtrusionStyleLayer *)layer withReactStyleValue:(RCTMGLStyleValue *)styleValue;
 - (void)setFillExtrusionHeightTransition:(MGLFillExtrusionStyleLayer *)layer withReactStyleValue:(RCTMGLStyleValue *)styleValue;
 - (void)setFillExtrusionBase:(MGLFillExtrusionStyleLayer *)layer withReactStyleValue:(RCTMGLStyleValue *)styleValue;
@@ -207,7 +203,6 @@
 - (void)setBackgroundColor:(MGLBackgroundStyleLayer *)layer withReactStyleValue:(RCTMGLStyleValue *)styleValue;
 - (void)setBackgroundColorTransition:(MGLBackgroundStyleLayer *)layer withReactStyleValue:(RCTMGLStyleValue *)styleValue;
 - (void)setBackgroundPattern:(MGLBackgroundStyleLayer *)layer withReactStyleValue:(RCTMGLStyleValue *)styleValue;
-- (void)setBackgroundPatternTransition:(MGLBackgroundStyleLayer *)layer withReactStyleValue:(RCTMGLStyleValue *)styleValue;
 - (void)setBackgroundOpacity:(MGLBackgroundStyleLayer *)layer withReactStyleValue:(RCTMGLStyleValue *)styleValue;
 - (void)setBackgroundOpacityTransition:(MGLBackgroundStyleLayer *)layer withReactStyleValue:(RCTMGLStyleValue *)styleValue;
 - (void)setAnchor:(MGLLight *)layer withReactStyleValue:(RCTMGLStyleValue *)styleValue;

package/ios/RCTMGL/RCTMGLStyle.m

@@ -71,8 +71,6 @@
           }
         }];
       }
-    } else if ([prop isEqualToString:@"fillPatternTransition"]) {
-      [self setFillPatternTransition:layer withReactStyleValue:styleValue];
     } else {
       // TODO throw exception
     }
@@ -138,8 +136,6 @@
       [self setLineBlurTransition:layer withReactStyleValue:styleValue];
     } else if ([prop isEqualToString:@"lineDasharray"]) {
       [self setLineDasharray:layer withReactStyleValue:styleValue];
-    } else if ([prop isEqualToString:@"lineDasharrayTransition"]) {
-      [self setLineDasharrayTransition:layer withReactStyleValue:styleValue];
     } else if ([prop isEqualToString:@"linePattern"]) {
       if (![styleValue shouldAddImage]) {
         [self setLinePattern:layer withReactStyleValue:styleValue];
@@ -157,8 +153,6 @@
           }
         }];
       }
-    } else if ([prop isEqualToString:@"linePatternTransition"]) {
-      [self setLinePatternTransition:layer withReactStyleValue:styleValue];
     } else if ([prop isEqualToString:@"lineGradient"]) {
       [self setLineGradient:layer withReactStyleValue:styleValue];
     } else {
@@ -487,8 +481,6 @@
           }
         }];
       }
-    } else if ([prop isEqualToString:@"fillExtrusionPatternTransition"]) {
-      [self setFillExtrusionPatternTransition:layer withReactStyleValue:styleValue];
     } else if ([prop isEqualToString:@"fillExtrusionHeight"]) {
       [self setFillExtrusionHeight:layer withReactStyleValue:styleValue];
     } else if ([prop isEqualToString:@"fillExtrusionHeightTransition"]) {
@@ -637,8 +629,6 @@
           }
         }];
       }
-    } else if ([prop isEqualToString:@"backgroundPatternTransition"]) {
-      [self setBackgroundPatternTransition:layer withReactStyleValue:styleValue];
     } else if ([prop isEqualToString:@"backgroundOpacity"]) {
       [self setBackgroundOpacity:layer withReactStyleValue:styleValue];
     } else if ([prop isEqualToString:@"backgroundOpacityTransition"]) {
@@ -752,11 +742,6 @@
     layer.fillPattern = styleValue.mglStyleValue;
 }
 
-- (void)setFillPatternTransition:(MGLFillStyleLayer *)layer withReactStyleValue:(RCTMGLStyleValue *)styleValue
-{
-    layer.fillPatternTransition = [styleValue getTransition];
-}
-
 
 
 - (void)setLineCap:(MGLLineStyleLayer *)layer withReactStyleValue:(RCTMGLStyleValue *)styleValue
@@ -869,21 +854,11 @@
     layer.lineDashPattern = styleValue.mglStyleValue;
 }
 
-- (void)setLineDasharrayTransition:(MGLLineStyleLayer *)layer withReactStyleValue:(RCTMGLStyleValue *)styleValue
-{
-    layer.lineDashPatternTransition = [styleValue getTransition];
-}
-
 - (void)setLinePattern:(MGLLineStyleLayer *)layer withReactStyleValue:(RCTMGLStyleValue *)styleValue
 {
     layer.linePattern = styleValue.mglStyleValue;
 }
 
-- (void)setLinePatternTransition:(MGLLineStyleLayer *)layer withReactStyleValue:(RCTMGLStyleValue *)styleValue
-{
-    layer.linePatternTransition = [styleValue getTransition];
-}
-
 - (void)setLineGradient:(MGLLineStyleLayer *)layer withReactStyleValue:(RCTMGLStyleValue *)styleValue
 {
     layer.lineGradient = styleValue.mglStyleValue;
@@ -1427,11 +1402,6 @@
     layer.fillExtrusionPattern = styleValue.mglStyleValue;
 }
 
-- (void)setFillExtrusionPatternTransition:(MGLFillExtrusionStyleLayer *)layer withReactStyleValue:(RCTMGLStyleValue *)styleValue
-{
-    layer.fillExtrusionPatternTransition = [styleValue getTransition];
-}
-
 - (void)setFillExtrusionHeight:(MGLFillExtrusionStyleLayer *)layer withReactStyleValue:(RCTMGLStyleValue *)styleValue
 {
     layer.fillExtrusionHeight = styleValue.mglStyleValue;
@@ -1613,11 +1583,6 @@
     layer.backgroundPattern = styleValue.mglStyleValue;
 }
 
-- (void)setBackgroundPatternTransition:(MGLBackgroundStyleLayer *)layer withReactStyleValue:(RCTMGLStyleValue *)styleValue
-{
-    layer.backgroundPatternTransition = [styleValue getTransition];
-}
-
 - (void)setBackgroundOpacity:(MGLBackgroundStyleLayer *)layer withReactStyleValue:(RCTMGLStyleValue *)styleValue
 {
     layer.backgroundOpacity = styleValue.mglStyleValue;

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/RCTMGLLocationModule.swift

@@ -57,7 +57,9 @@ class RCTMGLLocationManager : LocationProviderDelegate {
   }
   
   func setDistanceFilter(_ distanceFilter: CLLocationDistance) {
-    provider.locationProviderOptions.distanceFilter = distanceFilter
+    var options = provider.locationProviderOptions
+    options.distanceFilter = distanceFilter
+    provider.locationProviderOptions = options
   }
   
   func start() {
@@ -242,8 +244,8 @@ class RCTMGLLocationModule: RCTEventEmitter, RCTMGLLocationManagerDelegate {
   }
   
   @objc func start(_ minDisplacement: CLLocationDistance) {
+    if minDisplacement >= 0.0 { locationManager.setDistanceFilter(minDisplacement) }
     locationManager.start()
-    locationManager.setDistanceFilter(minDisplacement)
   }
   
   @objc func stop() {

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
   }