react-native-maps 1.21.0-alpha.2 → 1.21.0-alpha.20

package/ios/AirMaps/AIRMap.m

@@ -20,6 +20,7 @@
 #import "AIRMapWMSTile.h"
 #import "AIRMapLocalTile.h"
 #import "AIRMapOverlay.h"
+#import "AIRMapSnapshot.h"
 
 const NSTimeInterval AIRMapRegionChangeObserveInterval = 0.1;
 const CGFloat AIRMapZoomBoundBuffer = 0.01;
@@ -38,8 +39,6 @@ const NSInteger AIRMapMaxZoomLevel = 20;
 @property (nonatomic, strong) UIActivityIndicatorView *activityIndicatorView;
 @property (nonatomic, assign) NSNumber *shouldZoomEnabled;
 @property (nonatomic, assign) NSNumber *shouldScrollEnabled;
-@property (nonatomic, strong) MKCompassButton *defaultCompassButton;
-@property (nonatomic, strong) MKCompassButton *overlayCompassButton;
 
 - (void)updateScrollEnabled;
 - (void)updateZoomEnabled;
@@ -51,7 +50,8 @@ const NSInteger AIRMapMaxZoomLevel = 20;
     UIView *_legalLabel;
     BOOL _initialRegionSet;
     BOOL _initialCameraSet;
-    
+    BOOL _initialized;
+
     // Array to manually track RN subviews
     //
     // AIRMap implicitly creates subviews that aren't regular RN children
@@ -69,7 +69,7 @@ const NSInteger AIRMapMaxZoomLevel = 20;
     if ((self = [super init])) {
         _hasStartedRendering = NO;
         _reactSubviews = [NSMutableArray new];
-        
+
         // Find Apple link label
         for (UIView *subview in self.subviews) {
             if ([NSStringFromClass(subview.class) isEqualToString:@"MKAttributionLabel"]) {
@@ -79,16 +79,17 @@ const NSInteger AIRMapMaxZoomLevel = 20;
                 break;
             }
         }
-        
+
         // 3rd-party callout view for MapKit that has more options than the built-in. It's painstakingly built to
         // be identical to the built-in callout view (which has a private API)
         self.calloutView = [SMCalloutView platformCalloutView];
         self.calloutView.delegate = self;
-        
-        self.minZoomLevel = 0;
-        self.maxZoomLevel = AIRMapMaxZoomLevel;
+
+        self.minZoom = 0;
+        self.maxZoom = AIRMapMaxZoomLevel;
         self.compassOffset = CGPointMake(0, 0);
         self.legacyZoomConstraintsEnabled = YES;
+        _initialized = YES;
     }
     return self;
 }
@@ -100,6 +101,9 @@ const NSInteger AIRMapMaxZoomLevel = 20;
         [super addSubview:view];
     }
 }
+- (void) didSetRegion {
+    _initialRegionSet = YES;
+}
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wobjc-missing-super-calls"
@@ -199,36 +203,25 @@ const NSInteger AIRMapMaxZoomLevel = 20;
     }
     return marker;
 }
+// Create Polyline with coordinates
+-(void) fitToCoordinates:(NSArray<AIRMapCoordinate*>*) coordinates edgePadding:(UIEdgeInsets) edgeInsets animated:(Boolean) animated {
+CLLocationCoordinate2D coords[coordinates.count];
+for(int i = 0; i < coordinates.count; i++)
+{
+    coords[i] = coordinates[i].coordinate;
+}
+MKPolyline *polyline = [MKPolyline polylineWithCoordinates:coords count:coordinates.count];
 
+// Set Map viewport
+
+[self setVisibleMapRect:[polyline boundingMapRect] edgePadding:edgeInsets animated:animated];
+}
 - (CGRect) frameForMarker:(AIRMapMarker*) mrkAnn {
     MKAnnotationView* mrkView = [self viewForAnnotation: mrkAnn];
     CGRect mrkFrame = mrkView.frame;
     return mrkFrame;
 }
 
-- (NSDictionary*) getMarkersFramesWithOnlyVisible:(BOOL)onlyVisible {
-    NSMutableDictionary* markersFrames = [NSMutableDictionary new];
-    for (AIRMapMarker* mrkAnn in self.markers) {
-        CGRect frame = [self frameForMarker:mrkAnn];
-        CGPoint point = [self convertCoordinate:mrkAnn.coordinate toPointToView:self];
-        NSDictionary* frameDict = @{
-            @"x": @(frame.origin.x),
-            @"y": @(frame.origin.y),
-            @"width": @(frame.size.width),
-            @"height": @(frame.size.height)
-        };
-        NSDictionary* pointDict = @{
-            @"x": @(point.x),
-            @"y": @(point.y)
-        };
-        NSString* k = mrkAnn.identifier;
-        BOOL isVisible = CGRectIntersectsRect(self.bounds, frame);
-        if (k != nil && (!onlyVisible || isVisible)) {
-            [markersFrames setObject:@{ @"frame": frameDict, @"point": pointDict } forKey:k];
-        }
-    }
-    return markersFrames;
-}
 
 - (AIRMapMarker*) markerAtPoint:(CGPoint)point {
     AIRMapMarker* mrk = nil;
@@ -257,16 +250,16 @@ const NSInteger AIRMapMaxZoomLevel = 20;
 // Allow touches to be sent to our calloutview.
 // See this for some discussion of why we need to override this: https://github.com/nfarina/calloutview/pull/9
 - (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event {
-    
+
     CGPoint touchPoint = [self.calloutView convertPoint:point fromView:self];
     UIView *touchedView = [self.calloutView hitTest:touchPoint withEvent:event];
-    
+
     if (touchedView) {
         UIWindow* win = [[[UIApplication sharedApplication] windows] firstObject];
         AIRMapCalloutSubview* calloutSubview = nil;
         AIRMapCallout* callout = nil;
         AIRMapMarker* marker = nil;
-        
+
         UIView* tmp = touchedView;
         while (tmp && tmp != win && tmp != self.calloutView) {
             if ([tmp respondsToSelector:@selector(onPress)]) {
@@ -278,7 +271,7 @@ const NSInteger AIRMapMaxZoomLevel = 20;
             }
             tmp = tmp.superview;
         }
-        
+
         if (callout) {
             marker = [self markerForCallout:callout];
             if (marker) {
@@ -288,49 +281,49 @@ const NSInteger AIRMapMaxZoomLevel = 20;
                 }
             }
         }
-        
+
         return calloutSubview ? calloutSubview : touchedView;
     }
-    
+
     return [super hitTest:point withEvent:event];
 }
 
 #pragma mark SMCalloutViewDelegate
 
 - (NSTimeInterval)calloutView:(SMCalloutView *)calloutView delayForRepositionWithSize:(CGSize)offset {
-    
+
     // When the callout is being asked to present in a way where it or its target will be partially offscreen, it asks us
     // if we'd like to reposition our surface first so the callout is completely visible. Here we scroll the map into view,
     // but it takes some math because we have to deal in lon/lat instead of the given offset in pixels.
-    
+
     CLLocationCoordinate2D coordinate = self.region.center;
-    
+
     // where's the center coordinate in terms of our view?
     CGPoint center = [self convertCoordinate:coordinate toPointToView:self];
-    
+
     // move it by the requested offset
     center.x -= offset.width;
     center.y -= offset.height;
-    
+
     // and translate it back into map coordinates
     coordinate = [self convertPoint:center toCoordinateFromView:self];
-    
+
     // move the map!
     [self setCenterCoordinate:coordinate animated:YES];
-    
+
     // tell the callout to wait for a while while we scroll (we assume the scroll delay for MKMapView matches UIScrollView)
     return kSMCalloutViewRepositionDelayForUIScrollView;
 }
 
-#pragma mark Accessors
+#pragma mark RNMapsAirModuleDelegate.h
 
 - (NSArray *)getMapBoundaries
 {
     MKMapRect mapRect = self.visibleMapRect;
-    
+
     CLLocationCoordinate2D northEast = MKCoordinateForMapPoint(MKMapPointMake(MKMapRectGetMaxX(mapRect), mapRect.origin.y));
     CLLocationCoordinate2D southWest = MKCoordinateForMapPoint(MKMapPointMake(mapRect.origin.x, MKMapRectGetMaxY(mapRect)));
-    
+
     return @[
         @[
             [NSNumber numberWithDouble:northEast.longitude],
@@ -342,6 +335,169 @@ const NSInteger AIRMapMaxZoomLevel = 20;
         ]
     ];
 }
+- (NSDictionary *) getPointForCoordinates:(CLLocationCoordinate2D) location
+{
+    CGPoint touchPoint = [self convertCoordinate:location toPointToView:self];
+
+    return @{
+              @"x": @(touchPoint.x),
+              @"y": @(touchPoint.y),
+    };
+}
+- (NSDictionary *) getCoordinatesForPoint:(CGPoint)point
+{
+    CLLocationCoordinate2D coordinate = [self convertPoint:point toCoordinateFromView:self];
+    return @{
+              @"latitude": @(coordinate.latitude),
+              @"longitude": @(coordinate.longitude),
+    };
+
+}
+
+- (NSDictionary*) getMarkersFramesWithOnlyVisible:(BOOL)onlyVisible {
+    NSMutableDictionary* markersFrames = [NSMutableDictionary new];
+    for (AIRMapMarker* mrkAnn in self.markers) {
+        CGRect frame = [self frameForMarker:mrkAnn];
+        CGPoint point = [self convertCoordinate:mrkAnn.coordinate toPointToView:self];
+        NSDictionary* frameDict = @{
+            @"x": @(frame.origin.x),
+            @"y": @(frame.origin.y),
+            @"width": @(frame.size.width),
+            @"height": @(frame.size.height)
+        };
+        NSDictionary* pointDict = @{
+            @"x": @(point.x),
+            @"y": @(point.y)
+        };
+        NSString* k = mrkAnn.identifier;
+        BOOL isVisible = CGRectIntersectsRect(self.bounds, frame);
+        if (k != nil && (!onlyVisible || isVisible)) {
+            [markersFrames setObject:@{ @"frame": frameDict, @"point": pointDict } forKey:k];
+        }
+    }
+    return markersFrames;
+}
+
+- (NSDictionary *) getCamera {
+    MKMapCamera *camera = [self camera];
+    return @{
+              @"center": @{
+                      @"latitude": @(camera.centerCoordinate.latitude),
+                      @"longitude": @(camera.centerCoordinate.longitude),
+              },
+              @"pitch": @(camera.pitch),
+              @"heading": @(camera.heading),
+              @"altitude": @(camera.altitude),
+    };
+}
+- (void)takeSnapshotWithConfig:(NSDictionary *)config
+                      callback:(RCTPromiseResolveBlock) callback
+{
+
+  MKMapSnapshotOptions *options = [[MKMapSnapshotOptions alloc] init];
+
+  options.mapType = self.mapType;
+  NSNumber *width = config[@"width"];
+  NSNumber *height = config[@"height"];
+  NSNumber *quality = config[@"quality"];
+  NSString*format =config[@"format"];
+  NSString*result =config[@"result"];
+  MKCoordinateRegion region = [RCTConvert MKCoordinateRegion:config[@"region"]];
+
+
+  options.region = (region.center.latitude && region.center.longitude) ? region : self.region;
+  options.size = CGSizeMake(
+    ([width floatValue] == 0) ? self.bounds.size.width : [width floatValue],
+    ([height floatValue] == 0) ? self.bounds.size.height : [height floatValue]
+  );
+
+  options.scale = [[UIScreen mainScreen] scale];
+
+
+  MKMapSnapshotter *snapshotter = [[MKMapSnapshotter alloc] initWithOptions:options];
+
+  [self takeMapSnapshot:snapshotter
+                 format:format
+                quality:[quality floatValue]
+                 result:result
+               callback:callback];
+}
+
+#pragma mark Take Snapshot
+- (void)takeMapSnapshot:(MKMapSnapshotter *) snapshotter
+        format:(NSString *)format
+        quality:(CGFloat) quality
+        result:(NSString *)result
+        callback:(RCTPromiseResolveBlock) callback {
+    NSTimeInterval timeStamp = [[NSDate date] timeIntervalSince1970];
+    NSString *pathComponent = [NSString stringWithFormat:@"Documents/snapshot-%.20lf.%@", timeStamp, format];
+    NSString *filePath = [NSHomeDirectory() stringByAppendingPathComponent: pathComponent];
+
+    [snapshotter startWithQueue:dispatch_get_main_queue()
+              completionHandler:^(MKMapSnapshot *snapshot, NSError *error) {
+                  if (error) {
+                      callback(@[error]);
+                      return;
+                  }
+                  MKAnnotationView *pin = [[MKPinAnnotationView alloc] initWithAnnotation:nil reuseIdentifier:nil];
+
+                  UIImage *image = snapshot.image;
+                  UIGraphicsBeginImageContextWithOptions(image.size, YES, image.scale);
+                  {
+                      [image drawAtPoint:CGPointMake(0.0f, 0.0f)];
+
+                      CGRect rect = CGRectMake(0.0f, 0.0f, image.size.width, image.size.height);
+
+                      for (id <AIRMapSnapshot> overlay in self.overlays) {
+                          if ([overlay respondsToSelector:@selector(drawToSnapshot:context:)]) {
+                                  [overlay drawToSnapshot:snapshot context:UIGraphicsGetCurrentContext()];
+                          }
+                      }
+
+                      for (id <MKAnnotation> annotation in self.annotations) {
+                          CGPoint point = [snapshot pointForCoordinate:annotation.coordinate];
+
+                          MKAnnotationView* anView = [self viewForAnnotation: annotation];
+
+                          if (anView){
+                              pin = anView;
+                          }
+
+                          if (CGRectContainsPoint(rect, point)) {
+                              point.x = point.x + pin.centerOffset.x - (pin.bounds.size.width / 2.0f);
+                              point.y = point.y + pin.centerOffset.y - (pin.bounds.size.height / 2.0f);
+                              if (pin.image) {
+                                  [pin.image drawAtPoint:point];
+                              } else {
+                                  CGRect pinRect = CGRectMake(point.x, point.y, pin.bounds.size.width, pin.bounds.size.height);
+                                  [pin drawViewHierarchyInRect:pinRect afterScreenUpdates:NO];
+                              }
+                          }
+                      }
+
+                      UIImage *compositeImage = UIGraphicsGetImageFromCurrentImageContext();
+
+                      NSData *data;
+                      if ([format isEqualToString:@"png"]) {
+                          data = UIImagePNGRepresentation(compositeImage);
+                      }
+                      else if([format isEqualToString:@"jpg"]) {
+                          data = UIImageJPEGRepresentation(compositeImage, quality);
+                      }
+
+                      if ([result isEqualToString:@"file"]) {
+                          [data writeToFile:filePath atomically:YES];
+                          callback(filePath);
+                      }
+                      else if ([result isEqualToString:@"base64"]) {
+                          callback([data base64EncodedStringWithOptions:NSDataBase64EncodingEndLineWithCarriageReturn]);
+                      }
+                  }
+                  UIGraphicsEndImageContext();
+              }];
+}
+
+
 
 - (void)setShowsUserLocation:(BOOL)showsUserLocation
 {
@@ -380,13 +536,14 @@ const NSInteger AIRMapMaxZoomLevel = 20;
     _userLocationCalloutEnabled = calloutEnabled;
 }
 
-- (void)setHandlePanDrag:(BOOL)handleMapDrag {
+- (void)setHandlePanDrag:(BOOL)handlePanDrag {
     for (UIGestureRecognizer *recognizer in [self gestureRecognizers]) {
         if ([recognizer isKindOfClass:[UIPanGestureRecognizer class]]) {
-            recognizer.enabled = handleMapDrag;
+            recognizer.enabled = handlePanDrag;
             break;
         }
     }
+    _handlePanDrag = handlePanDrag;
 }
 
 - (void)setRegion:(MKCoordinateRegion)region animated:(BOOL)animated
@@ -395,7 +552,7 @@ const NSInteger AIRMapMaxZoomLevel = 20;
     if (!CLLocationCoordinate2DIsValid(region.center)) {
         return;
     }
-    
+
     // If new span values are nil, use old values instead
     if (!region.span.latitudeDelta) {
         region.span.latitudeDelta = self.region.span.latitudeDelta;
@@ -403,12 +560,15 @@ const NSInteger AIRMapMaxZoomLevel = 20;
     if (!region.span.longitudeDelta) {
         region.span.longitudeDelta = self.region.span.longitudeDelta;
     }
-    
+
     // Animate/move to new position
     [super setRegion:region animated:animated];
 }
 
 - (void)setInitialRegion:(MKCoordinateRegion)initialRegion {
+    if (!CLLocationCoordinate2DIsValid(initialRegion.center)) {
+        return;
+    }
     if (!_initialRegionSet) {
         _initialRegionSet = YES;
         [self setRegion:initialRegion animated:NO];
@@ -471,25 +631,25 @@ const NSInteger AIRMapMaxZoomLevel = 20;
 
 - (void)setCameraZoomRange:(NSDictionary *)cameraZoomRange {
     if (@available(iOS 13.0, *)) {
-        
+
         if (cameraZoomRange == nil) {
             cameraZoomRange = @{};
         }
-        
+
         NSNumber *minValue = cameraZoomRange[@"minCenterCoordinateDistance"];
         NSNumber *maxValue = cameraZoomRange[@"maxCenterCoordinateDistance"];
-        
+
         if (minValue == nil && maxValue == nil) {
             self.legacyZoomConstraintsEnabled = YES;
-            
+
             MKMapCameraZoomRange *defaultZoomRange = [[MKMapCameraZoomRange alloc] initWithMinCenterCoordinateDistance:MKMapCameraZoomDefault maxCenterCoordinateDistance:MKMapCameraZoomDefault];
             [super setCameraZoomRange:defaultZoomRange animated:NO];
-            
+
             return;
         }
-        
+
         MKMapCameraZoomRange *zoomRange = nil;
-        
+
         if (minValue != nil && maxValue != nil) {
             zoomRange = [[MKMapCameraZoomRange alloc] initWithMinCenterCoordinateDistance:[minValue doubleValue] maxCenterCoordinateDistance:[maxValue doubleValue]];
         } else if (minValue != nil) {
@@ -497,61 +657,14 @@ const NSInteger AIRMapMaxZoomLevel = 20;
         } else if (maxValue != nil) {
             zoomRange = [[MKMapCameraZoomRange alloc] initWithMaxCenterCoordinateDistance:[maxValue doubleValue]];
         }
-        
+
         BOOL animated = [cameraZoomRange[@"animated"] boolValue];
-        
+
         self.legacyZoomConstraintsEnabled = NO;
         [super setCameraZoomRange:zoomRange animated:animated];
     }
 }
 
-// Include properties of MKMapView which are only available on iOS 9+
-// and check if their selector is available before calling super method.
-
-- (void)setShowsCompass:(BOOL)showsCompass {
-    if (self.overlayCompassButton != nil) {
-        self.overlayCompassButton.compassVisibility = showsCompass ? MKFeatureVisibilityAdaptive : MKFeatureVisibilityHidden;
-    }
-    if ([MKMapView instancesRespondToSelector:@selector(setShowsCompass:)]) {
-        [super setShowsCompass:showsCompass];
-    }
-}
-
-- (BOOL)showsCompass {
-    if ([MKMapView instancesRespondToSelector:@selector(showsCompass)]) {
-        return [super showsCompass];
-    } else {
-        return NO;
-    }
-}
-
-- (void)setShowsScale:(BOOL)showsScale {
-    if ([MKMapView instancesRespondToSelector:@selector(setShowsScale:)]) {
-        [super setShowsScale:showsScale];
-    }
-}
-
-- (BOOL)showsScale {
-    if ([MKMapView instancesRespondToSelector:@selector(showsScale)]) {
-        return [super showsScale];
-    } else {
-        return NO;
-    }
-}
-
-- (void)setShowsTraffic:(BOOL)showsTraffic {
-    if ([MKMapView instancesRespondToSelector:@selector(setShowsTraffic:)]) {
-        [super setShowsTraffic:showsTraffic];
-    }
-}
-
-- (BOOL)showsTraffic {
-    if ([MKMapView instancesRespondToSelector:@selector(showsTraffic)]) {
-        return [super showsTraffic];
-    } else {
-        return NO;
-    }
-}
 
 - (void)setScrollEnabled:(BOOL)scrollEnabled {
     self.shouldScrollEnabled = [NSNumber numberWithBool:scrollEnabled];
@@ -597,7 +710,7 @@ const NSInteger AIRMapMaxZoomLevel = 20;
         else {
             self.cacheImageView.image = nil;
             self.cacheImageView.hidden = YES;
-            
+
             dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.01 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
                 self.cacheImageView.image = nil;
                 self.cacheImageView.hidden = YES;
@@ -605,12 +718,12 @@ const NSInteger AIRMapMaxZoomLevel = 20;
                 [self.layer renderInContext:UIGraphicsGetCurrentContext()];
                 UIImage *image = UIGraphicsGetImageFromCurrentImageContext();
                 UIGraphicsEndImageContext();
-                
+
                 self.cacheImageView.image = image;
                 self.cacheImageView.hidden = NO;
             });
         }
-        
+
         [self updateScrollEnabled];
         [self updateZoomEnabled];
         [self updateLegalLabelInsets];
@@ -706,50 +819,27 @@ const NSInteger AIRMapMaxZoomLevel = 20;
 - (void)layoutSubviews {
     [super layoutSubviews];
     [self cacheViewIfNeeded];
-    
-    if (self.overlayCompassButton == nil) {
-        for (UIView *subview in self.subviews) {
-            if (![NSStringFromClass(subview.class) isEqualToString:@"MKPassThroughStackView"]) continue;
-            self.overlayCompassButton = [MKCompassButton compassButtonWithMapView:self];
-            [subview addSubview:self.overlayCompassButton];
-            self.overlayCompassButton.frame = CGRectMake(self.overlayCompassButton.frame.origin.x + _compassOffset.x, self.overlayCompassButton.frame.origin.y + _compassOffset.y, self.overlayCompassButton.frame.size.width, self.overlayCompassButton.frame.size.height);
-            break;
-        }
-    }
-    
-    if (self.defaultCompassButton == nil) {
-        for (UIView *subview in self.subviews) {
-            if (![NSStringFromClass(subview.class) isEqualToString:@"MKPassThroughStackView"]) continue;
-            for (UIView *subview2 in subview.subviews) {
-                if (![NSStringFromClass(subview2.class) isEqualToString:@"MKCompassView"]) continue;
-                self.defaultCompassButton = subview2;
-                self.defaultCompassButton.hidden = YES;
-            }
-            break;
-        }
-    }
-    
 }
 
 // based on https://medium.com/@dmytrobabych/getting-actual-rotation-and-zoom-level-for-mapkit-mkmapview-e7f03f430aa9
 - (CGFloat)getZoomLevel {
     CGFloat cameraAngle = self.camera.heading;
-    
+
     if (cameraAngle > 270) {
         cameraAngle = 360 - cameraAngle;
     } else if (cameraAngle > 90) {
         cameraAngle = fabs(cameraAngle - 180);
     }
-    
+
     CGFloat angleRad = M_PI * cameraAngle / 180; // map rotation in radians
     CGFloat width = self.frame.size.width;
     CGFloat height = self.frame.size.height;
     CGFloat heightOffset = 20; // the offset (status bar height) which is taken by MapKit into consideration to calculate visible area height
-    
+
     // calculating Longitude span corresponding to normal (non-rotated) width
     CGFloat spanStraight = width * self.region.span.longitudeDelta / (width * cos(angleRad) + (height - heightOffset) * sin(angleRad));
     int normalizingFactor = 512;
-    
+
     return log2(360 * ((width / normalizingFactor) / spanStraight));
 }
 

package/ios/AirMaps/AIRMapManager.m

@@ -350,23 +350,8 @@ RCT_EXPORT_METHOD(fitToCoordinates:(nonnull NSNumber *)reactTag
             RCTLogError(@"Invalid view returned from registry, expecting AIRMap, got: %@", view);
         } else {
             AIRMap *mapView = (AIRMap *)view;
-
-            // Create Polyline with coordinates
-            CLLocationCoordinate2D coords[coordinates.count];
-            for(int i = 0; i < coordinates.count; i++)
-            {
-                coords[i] = coordinates[i].coordinate;
-            }
-            MKPolyline *polyline = [MKPolyline polylineWithCoordinates:coords count:coordinates.count];
-
-            // Set Map viewport
-            CGFloat top = [RCTConvert CGFloat:edgePadding[@"top"]];
-            CGFloat right = [RCTConvert CGFloat:edgePadding[@"right"]];
-            CGFloat bottom = [RCTConvert CGFloat:edgePadding[@"bottom"]];
-            CGFloat left = [RCTConvert CGFloat:edgePadding[@"left"]];
-
-            [mapView setVisibleMapRect:[polyline boundingMapRect] edgePadding:UIEdgeInsetsMake(top, left, bottom, right) animated:animated];
-
+            UIEdgeInsets edgeInsets = [RCTConvert UIEdgeInsets:edgePadding];
+            [mapView fitToCoordinates: coordinates edgePadding:edgeInsets animated:animated];
         }
     }];
 }
@@ -966,6 +951,8 @@ static int kDragCenterContext;
 
     mapView.pendingCenter = mapView.region.center;
     mapView.pendingSpan = mapView.region.span;
+    // reset original state (checkout setCamera / region animated)
+    mapView.ignoreRegionChanges = NO;
 }
 
 - (void)mapViewWillStartRenderingMap:(AIRMap *)mapView
@@ -980,6 +967,7 @@ static int kDragCenterContext;
 - (void)mapViewDidFinishRenderingMap:(AIRMap *)mapView fullyRendered:(BOOL)fullyRendered
 {
     [mapView finishLoading];
+    mapView.ignoreRegionChanges = NO;
 }
 
 #pragma mark Private
@@ -1175,11 +1163,11 @@ static int kDragCenterContext;
 
     CGFloat zoomLevel = [mapView getZoomLevel];
 
-    if (zoomLevel < mapView.minZoomLevel) {
-      [self setCenterCoordinate:[mapView centerCoordinate] zoomLevel:mapView.minZoomLevel animated:TRUE mapView:mapView];
+    if (zoomLevel < mapView.minZoom) {
+      [self setCenterCoordinate:[mapView centerCoordinate] zoomLevel:mapView.minZoom animated:TRUE mapView:mapView];
     }
-    else if (zoomLevel > mapView.maxZoomLevel) {
-      [self setCenterCoordinate:[mapView centerCoordinate] zoomLevel:mapView.maxZoomLevel animated:TRUE mapView:mapView];
+    else if (zoomLevel > mapView.maxZoom) {
+      [self setCenterCoordinate:[mapView centerCoordinate] zoomLevel:mapView.maxZoom animated:TRUE mapView:mapView];
     }
 }
 

package/ios/AirMaps/AIRMapMarker.m

@@ -14,6 +14,8 @@
 #import <React/RCTImageLoaderProtocol.h>
 #import <React/RCTUtils.h>
 #import <React/UIView+React.h>
+#import <React/RCTImageLoader.h>
+#import <React/RCTBridge+Private.h>
 
 NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
 
@@ -68,6 +70,7 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
         self.calloutView = (AIRMapCallout *)subview;
     } else {
         [super insertReactSubview:(UIView *)subview atIndex:atIndex];
+        [self addSubview:subview];
     }
 }
 - (void) setFrame:(CGRect)frame {
@@ -84,6 +87,7 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
         self.calloutView = nil;
     } else {
         [super removeReactSubview:(UIView *)subview];
+        [(UIView *) subview removeFromSuperview];
     }
 }
 
@@ -344,7 +348,8 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
         _reloadImageCancellationBlock();
         _reloadImageCancellationBlock = nil;
     }
-    _reloadImageCancellationBlock = [[_bridge moduleForName:@"ImageLoader"] loadImageWithURLRequest:[RCTConvert NSURLRequest:_imageSrc]
+    
+    _reloadImageCancellationBlock = [[[RCTBridge currentBridge] moduleForName:@"ImageLoader"] loadImageWithURLRequest:[RCTConvert NSURLRequest:_imageSrc]
                                                                             size:self.bounds.size
                                                                            scale:RCTScreenScale()
                                                                          clipped:YES
@@ -352,9 +357,10 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
                                                                    progressBlock:nil
                                                                 partialLoadBlock:nil
                                                                  completionBlock:^(NSError *error, UIImage *image) {
+        NSLog(@"image load completed");
                                                                      if (error) {
                                                                          // TODO(lmr): do something with the error?
-                                                                         NSLog(@"%@", error);
+                                                                         NSLog(@"failed to load image: %@", error);
                                                                      }
                                                                      dispatch_async(dispatch_get_main_queue(), ^{
                                                                          self.image = image;